报告签章代码

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -214,12 +214,13 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     private void startApprovalAudit(ProjectApprovalSignature projectApprovalSignature, String processInstanceId) throws Exception {
         try{
             RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectApprovalSignature.getProjectId());
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
             Map<String, Object> variables = new HashMap<String, Object>();
             Office office = projectApprovalSignature.getOffice();
             office = officeService.get(office.getId());
             projectApprovalSignature.setOffice(office);
-            String contentStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单申请待审批，项目编号："+ruralProjectRecords.getProjectId();
-            String titleStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单申请待审批";
+            String contentStr = "报告号【"+ projectReportData.getNumber()+"】审定单申请待审批，项目编号："+ruralProjectRecords.getProjectId();
+            String titleStr = "报告号【"+ projectReportData.getNumber()+"】审定单申请待审批";
 
             String businessKey = projectApprovalSignature.getId();
 
@@ -342,6 +343,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     @Transactional(readOnly = false)
     public String approvalSaveAudit(ProjectApprovalSignature projectApprovalSignature, List<User> auditUsers) throws Exception {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectApprovalSignature.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
         int projectStatus = projectApprovalSignature.getStatus();
         String taskDefKey = projectApprovalSignature.getAct().getTaskDefKey();
         if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") ) {
@@ -386,7 +388,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         Office office = projectApprovalSignature.getOffice();
         office = officeService.get(office.getId());
         projectApprovalSignature.setOffice(office);
-        String notifyStr = "项目编号："+ruralProjectRecords.getProjectId()+"，项目名称："+ ruralProjectRecords.getProjectName();
+        String notifyStr = "报告号："+projectReportData.getNumber()+"，项目名称："+ ruralProjectRecords.getProjectName();
         String str = notifyStr+"，创建人："+ruralProjectRecords.getCreateBy().getName()+"，所属部门："+ruralProjectRecords.getOffice().getName();
         String titleStr = "项目名称："+ ruralProjectRecords.getProjectName();
         int key = 0;
@@ -464,7 +466,6 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                         try {
                             //进行签章调用
                             //根据项目id查询是否已经提交过了审定单签章
-                            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
                             if(null == projectReportData){
                                 return "查询不到该项目的质量复核信息";
                             }
@@ -618,8 +619,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         if(!state) {
             users.add(projectApprovalSignature.getCreateBy());
             //审核完成提示框
-            String title = "项目【"+ruralProjectRecords.getProjectName()+"】审定单审批登记完成";
-            String content = "项目【"+ruralProjectRecords.getProjectName()+"】审定单审批登记完成，项目编号："+ruralProjectRecords.getProjectId();
+            String title = "报告号【"+projectReportData.getNumber()+"】审定单审批登记完成";
+            String content = "报告号【"+projectReportData.getNumber()+"】审定单审批登记完成，项目编号："+ruralProjectRecords.getProjectId();
             if ("yes".equals(projectApprovalSignature.getAct().getFlag())) {
                 projectApprovalSignature.setStatus(ProjectStatusEnum.SIGNED.getValue());
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -692,8 +693,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                 }
             }else {
                 if (!"yes".equals(projectApprovalSignature.getAct().getFlag())) {//驳回待办提醒
-                    str = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批登记被驳回，请选择重新申请或作废";
-                    titleStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批登记被驳回";
+                    str = "报告号【"+projectReportData.getNumber()+"】审定单审批登记被驳回，请选择重新申请或作废";
+                    titleStr = "报告号【"+projectReportData.getNumber()+"】审定单审批登记被驳回";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectApprovalSignature.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -711,8 +712,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                     workProjectNotifyService.save(workProjectNotify);
                 } else {
                     if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
-                        str = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批重新登记，待审批，项目编号："+ruralProjectRecords.getProjectId();
-                        titleStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批重新登记，待审批";
+                        str = "报告号【"+projectReportData.getNumber()+"】审定单审批重新登记，待审批，项目编号："+ruralProjectRecords.getProjectId();
+                        titleStr = "报告号【"+projectReportData.getNumber()+"】审定单审批重新登记，待审批";
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectApprovalSignature.getId());
                         userList = workProjectNotifyService.readByNotifyId(notify);
@@ -778,6 +779,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     @Transactional(readOnly = false)
     public void cancelApprovalProcess(ProjectApprovalSignature projectApprovalSignature) throws Exception {
         RuralProjectRecords projectRecords = projectRecordsService.get(projectApprovalSignature.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         WorkActivityProcess process = new WorkActivityProcess();
         process.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
         process.setIsApproval("0");
@@ -790,7 +792,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         if (userList!=null && userList.size()!=0) {
             for (User u : userList) {
                 User user = UserUtils.get(u.getId());
-                UserUtils.pushIm(u.getId(),"申请人:"+ user.getName()+",项目名称:"+projectRecords.getProjectName() +" 审定单签章申请强制撤销!");
+                UserUtils.pushIm(u.getId(),"申请人:"+ user.getName()+",报告号:"+projectReportData.getNumber() +" 审定单签章申请强制撤销!");
             }
         }
         if(processList!=null && processList.size()>0){
@@ -875,12 +877,13 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     private void startReportSignatureAudit(ProjectReportSignature projectApprovalSignature, String processInstanceId) throws Exception {
         try{
             RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectApprovalSignature.getProjectId());
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
             Map<String, Object> variables = new HashMap<String, Object>();
             Office office = projectApprovalSignature.getOffice();
             office = officeService.get(office.getId());
             projectApprovalSignature.setOffice(office);
-            String contentStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单申请待审批，项目编号："+ruralProjectRecords.getProjectId();
-            String titleStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单申请待审批";
+            String contentStr = "报告号【"+ projectReportData.getNumber()+"】报告签章申请待审批，项目编号："+ruralProjectRecords.getProjectId();
+            String titleStr = "报告号【"+ projectReportData.getNumber()+"】报告签章申请待审批";
 
             String businessKey = projectApprovalSignature.getId();
 
@@ -1003,6 +1006,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     @Transactional(readOnly = false)
     public String reportSignatureSaveAudit(ProjectReportSignature projectApprovalSignature, List<User> auditUsers) throws Exception {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectApprovalSignature.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
         int projectStatus = projectApprovalSignature.getStatus();
         String taskDefKey = projectApprovalSignature.getAct().getTaskDefKey();
         if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") ) {
@@ -1047,7 +1051,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         Office office = projectApprovalSignature.getOffice();
         office = officeService.get(office.getId());
         projectApprovalSignature.setOffice(office);
-        String notifyStr = "项目编号："+ruralProjectRecords.getProjectId()+"，项目名称："+ ruralProjectRecords.getProjectName();
+        String notifyStr = "报告号："+projectReportData.getNumber()+"，项目名称："+ ruralProjectRecords.getProjectName();
         String str = notifyStr+"，创建人："+ruralProjectRecords.getCreateBy().getName()+"，所属部门："+ruralProjectRecords.getOffice().getName();
         String titleStr = "项目名称："+ ruralProjectRecords.getProjectName();
         int key = 0;
@@ -1143,7 +1147,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                             if(fileList.size()>0){
                                 Workattachment workattachment = fileList.get(0);
                                 if(StringUtils.isBlank(workattachment.getUrl())){
-                                    return "审定单文件存储路径为空，无法进行签章操作，请驳回后重新上传审定单";
+                                    return "报告签章文件存储路径为空，无法进行签章操作，请驳回后重新上传审定单";
                                 }
                                 //下载审定单文件
                                 String path = null;
@@ -1265,8 +1269,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         if(!state) {
             users.add(projectApprovalSignature.getCreateBy());
             //审核完成提示框
-            String title = "项目【"+ruralProjectRecords.getProjectName()+"】审定单审批登记完成";
-            String content = "项目【"+ruralProjectRecords.getProjectName()+"】审定单审批登记完成，项目编号："+ruralProjectRecords.getProjectId();
+            String title = "报告号【"+projectReportData.getNumber()+"】报告签章审批登记完成";
+            String content = "报告号【"+projectReportData.getNumber()+"】报告签章审批登记完成，项目编号："+ruralProjectRecords.getProjectId();
             if ("yes".equals(projectApprovalSignature.getAct().getFlag())) {
                 projectApprovalSignature.setStatus(ProjectStatusEnum.SIGNED.getValue());
                 WorkProjectNotify notify = new WorkProjectNotify();
@@ -1339,8 +1343,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                 }
             }else {
                 if (!"yes".equals(projectApprovalSignature.getAct().getFlag())) {//驳回待办提醒
-                    str = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批登记被驳回，请选择重新申请或作废";
-                    titleStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批登记被驳回";
+                    str = "报告号【"+projectReportData.getNumber()+"】报告签章审批登记被驳回，请选择重新申请或作废";
+                    titleStr = "报告号【"+projectReportData.getNumber()+"】报告签章审批登记被驳回";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectApprovalSignature.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1358,8 +1362,8 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
                     workProjectNotifyService.save(workProjectNotify);
                 } else {
                     if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
-                        str = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批重新登记，待审批，项目编号："+ruralProjectRecords.getProjectId();
-                        titleStr = "项目【"+ ruralProjectRecords.getProjectName()+"】审定单审批重新登记，待审批";
+                        str = "报告号【"+projectReportData.getNumber()+"】报告签章审批重新登记，待审批，项目编号："+ruralProjectRecords.getProjectId();
+                        titleStr = "报告号【"+projectReportData.getNumber()+"】报告签章审批重新登记，待审批";
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectApprovalSignature.getId());
                         userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1425,6 +1429,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     @Transactional(readOnly = false)
     public void cancelReportSignatureProcess(ProjectReportSignature projectApprovalSignature) throws Exception {
         RuralProjectRecords projectRecords = projectRecordsService.get(projectApprovalSignature.getProjectId());
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         WorkActivityProcess process = new WorkActivityProcess();
         process.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
         process.setIsApproval("0");
@@ -1437,7 +1442,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         if (userList!=null && userList.size()!=0) {
             for (User u : userList) {
                 User user = UserUtils.get(u.getId());
-                UserUtils.pushIm(u.getId(),"申请人:"+ user.getName()+",项目名称:"+projectRecords.getProjectName() +" 审定单签章申请强制撤销!");
+                UserUtils.pushIm(u.getId(),"申请人:"+ user.getName()+",报告号:"+projectReportData.getNumber() +" 报告签章申请强制撤销!");
             }
         }
         if(processList!=null && processList.size()>0){
@@ -1467,7 +1472,7 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
             sendMessage.setProcessInstanceId(projectApprovalSignature.getProcessInstanceId());
             sendMessage.preUpdate();
             dao.updateReportSignature(sendMessage);
-            actTaskService.endProcessInstance(projectApprovalSignature.getProcessInstanceId(), "审定单签章申请-撤回");
+            actTaskService.endProcessInstance(projectApprovalSignature.getProcessInstanceId(), "报告签章申请-撤回");
         }
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java

@@ -503,10 +503,10 @@ public class RuralProjectMessageElectronicSealController extends BaseController
                 if(projectApprovalSignature.getStatus() == 3 || projectApprovalSignature.getStatus() == 1) {
                     //projectApprovalSignature.setStatus(ProjectStatusEnum.IN_APRL.getValue());
                 }else if(projectApprovalSignature.getStatus() == 2){
-                    addMessage(redirectAttributes, "审定单签章申请已送审，无法重复送审");
+                    addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
                 }else if(projectApprovalSignature.getStatus() == 5){
-                    addMessage(redirectAttributes, "审定单签章申请已登记完成，无法再次送审");
+                    addMessage(redirectAttributes, "报告签章申请已登记完成，无法再次送审");
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
                 }
                 ruralProjectMessageElectronicSealService.reportSignatureSave(projectApprovalSignature);//保存
@@ -516,10 +516,10 @@ public class RuralProjectMessageElectronicSealController extends BaseController
                 projectApprovalSignature.setStatus(ProjectStatusEnum.IN_APRL.getValue());
                 ruralProjectMessageElectronicSealService.reportSignatureSave(projectApprovalSignature);//保存
             }
-            addMessage(redirectAttributes, "保存审定单签章申请成功");
+            addMessage(redirectAttributes, "保存报告签章申请成功");
         }catch (Exception e){
-            logger.error("保存审定单签章申请异常：",e);
-            addMessage(redirectAttributes, "保存审定单签章申请异常:"+e.getMessage());
+            logger.error("保存报告签章申请异常：",e);
+            addMessage(redirectAttributes, "保存报告签章申请异常:"+e.getMessage());
         }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
     }
@@ -549,7 +549,7 @@ public class RuralProjectMessageElectronicSealController extends BaseController
                 projectApprovalSignature.setAct(projectRecords.getAct());
                 if(null != saveAuditFlag) {
                     if (projectApprovalSignature.getStatus() != 4 && projectApprovalSignature.getStatus() != 5) {
-                        addMessage(redirectAttributes, "审定单签章申请已送审，请勿重复送审");
+                        addMessage(redirectAttributes, "报告签章申请已送审，请勿重复送审");
                         if (StringUtils.isNotBlank(home) && "home".equals(home)) {
                             return "redirect:" + Global.getAdminPath() + "/home/?repage";
                         } else {
@@ -558,7 +558,7 @@ public class RuralProjectMessageElectronicSealController extends BaseController
                     }
                 }
                 if(projectApprovalSignature.getStatus() == 5){
-                    addMessage(redirectAttributes, "审定单签章申请已登记完成，无法再次送审");
+                    addMessage(redirectAttributes, "报告签章申请已登记完成，无法再次送审");
                     if (StringUtils.isNotBlank(home) && "home".equals(home)){
                         return "redirect:" + Global.getAdminPath() + "/home/?repage";
                     }else {
@@ -569,7 +569,7 @@ public class RuralProjectMessageElectronicSealController extends BaseController
                 addMessage(redirectAttributes, str);
             }
         }catch (Exception e){
-            addMessage(redirectAttributes, "审定单签章申请审批失败");
+            addMessage(redirectAttributes, "报告签章申请审批失败");
             logger.error("Exception e:"+e);
         }
 
@@ -637,14 +637,14 @@ public class RuralProjectMessageElectronicSealController extends BaseController
             ProjectReportSignature projectApprovalSignature = ruralProjectMessageElectronicSealService.getProjectReportSignature(id);
 
             if("5".equals(projectApprovalSignature.getStatus())){
-                addMessage(redirectAttributes, "审定单签章申请已审批通过，无法撤回");
+                addMessage(redirectAttributes, "报告签章申请已审批通过，无法撤回");
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
             }
             ruralProjectMessageElectronicSealService.cancelReportSignatureProcess(projectApprovalSignature);
-            addMessage(redirectAttributes, "撤回该审定单签章申请审批成功");
+            addMessage(redirectAttributes, "撤回该报告签章申请审批成功");
         }catch (Exception e){
             logger.info(e.getMessage());
-            addMessage(redirectAttributes, "撤回该审定单签章申请审批失败");
+            addMessage(redirectAttributes, "撤回该报告签章申请审批失败");
         }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/electronicSeal/?repage";
     }

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1277,7 +1277,8 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 				} else if (workProjectNotify.getType().equals("144")) {    //合同管理new
 					RuralProjectRecords ruralProjectRecords = ruralProjectMessageElectronicSealService.getProjectApprovalSignatureById(workProjectNotify.getNotifyId());
-
+					ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+					ruralProjectRecords.setSignatureContractId(projectReportData.getSignatureContractId());
 					if (ruralProjectRecords != null && StringUtils.isNotBlank(ruralProjectRecords.getId())) {
 						//根据项目id查询对应的审定单数据状态是否是已经被送审或者 是否存在值
 						ProjectApprovalSignature projectApprovalSignature = ruralProjectMessageElectronicSealService.getProjectApprovalSignature(ruralProjectRecords.getId());

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView.jsp

@@ -1210,9 +1210,11 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId='+'${projectRecords.signatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">审定单签章下载</a>
                                             <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
                                             <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
                                             <%--													</c:if>--%>
+
                                     </div>
                                 </td>
                             </tr>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView.jsp

@@ -1213,6 +1213,7 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadReportAttach?contractId='+'${projectRecords.reportSignatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
                                             <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
                                             <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
                                             <%--													</c:if>--%>