报告签章调整

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -28,6 +28,8 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
+import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
+import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
@@ -76,6 +78,9 @@ public class ProjectReportSignatureWorkController extends BaseController {
     @Autowired
     protected OfficeService officeService;
 
+    @Autowired
+    private WorkProjectNotifyService workProjectNotifyService;
+
 
 
 //    @ModelAttribute
@@ -329,6 +334,17 @@ public class ProjectReportSignatureWorkController extends BaseController {
             projectReportSignature.setWorkAttachments(report.getWorkAttachments());
             projectReportSignature.setOffice(report.getOffice());
             projectReportSignature.setSignatureType(report.getSignatureType());
+            if(StringUtils.isNotBlank(report.getProcessInstanceId())){
+                if(null == report.getAct() || StringUtils.isBlank(report.getAct().getProcInsId())){
+                    Act act = new Act();
+                    act.setProcInsId(report.getProcessInstanceId());
+                    projectReportSignature.setAct(act);
+                }
+                WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(report.getProcessInstanceId());
+                if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                    model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+                }
+            }
         }
 
         //签章责任列表
@@ -392,6 +408,17 @@ public class ProjectReportSignatureWorkController extends BaseController {
             projectReportSignature.setWorkAttachments(report.getWorkAttachments());
             projectReportSignature.setOffice(report.getOffice());
             projectReportSignature.setSignatureType(report.getSignatureType());
+            if(StringUtils.isNotBlank(report.getProcessInstanceId())){
+                if(null == report.getAct() || StringUtils.isBlank(report.getAct().getProcInsId())){
+                    Act act = new Act();
+                    act.setProcInsId(report.getProcessInstanceId());
+                    projectReportSignature.setAct(act);
+                }
+                WorkProjectNotify workProjectNotify = workProjectNotifyService.getByProcessInstanceId(report.getProcessInstanceId());
+                if(null != workProjectNotify && StringUtils.isNotBlank(workProjectNotify.getNotifyType())){
+                    model.addAttribute("projectNotifyType", workProjectNotify.getNotifyType());
+                }
+            }
 
         }
 

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -670,13 +670,14 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
      */
     private void startAudit(ReportSignature signature, String processInstanceId) throws Exception {
         try{
+            ReportSignature report = dao.getReport(signature.getId());
             Map<String, Object> variables = new HashMap<String, Object>();
             identityService.setAuthenticatedUserId(signature.getCurrentUser().getId());
             Office office = signature.getOffice();
             office = officeService.get(office.getId());
             signature.setOffice(office);
-            String contentStr = "签章描述："+ signature.getSignatureName()+"。待审批";
-            String titleStr = "签章描述："+ signature.getSignatureName()+"。待审批";
+            String contentStr = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章待审批";
+            String titleStr = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章待审批";
 
             String businessKey = signature.getId();
 
@@ -770,7 +771,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             logger.info("推送消息耗时：{}ms",System.currentTimeMillis()-t1);
             variables.put("busId", businessKey);
             variables.put("type", processType);
-            variables.put("title", "签章描述：" + signature.getSignatureName());//设置标题；
+            variables.put("title", "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章");//设置标题；
 
             ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
             if (StringUtils.isNotBlank(processInstanceId)) {
@@ -813,13 +814,14 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
      */
     private void startApprovalAudit(ReportSignature signature, String processInstanceId) throws Exception {
         try{
+            ReportSignature approval = dao.getApproval(signature.getId());
             Map<String, Object> variables = new HashMap<String, Object>();
             identityService.setAuthenticatedUserId(signature.getCurrentUser().getId());
             Office office = signature.getOffice();
             office = officeService.get(office.getId());
             signature.setOffice(office);
-            String contentStr = "签章描述："+ signature.getSignatureName()+"。待审批";
-            String titleStr = "签章描述："+ signature.getSignatureName()+"。待审批";
+            String contentStr = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章待审批";
+            String titleStr = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章待审批";
 
             String businessKey = signature.getId();
 
@@ -913,7 +915,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             logger.info("推送消息耗时：{}ms",System.currentTimeMillis()-t1);
             variables.put("busId", businessKey);
             variables.put("type", processType);
-            variables.put("title", "签章描述：" + signature.getSignatureName());//设置标题；
+            variables.put("title", "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章");//设置标题；
 
             ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
             if (StringUtils.isNotBlank(processInstanceId)) {
@@ -1253,7 +1255,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             }
 
             //结束该流程,设为"撤销"状态
-            actTaskService.endProcessInstance(invalidateProcessInstanceId,"签章申请-强制撤销");
+            actTaskService.endProcessInstance(invalidateProcessInstanceId,"报告签章申请-强制撤销");
             reportSignature.setStatus(3);
             reportSignature.preUpdate();
             dao.updateReportSignature(reportSignature);
@@ -1316,7 +1318,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             }
 
             //结束该流程,设为"撤销"状态
-            actTaskService.endProcessInstance(invalidateProcessInstanceId,"签章申请-强制撤销");
+            actTaskService.endProcessInstance(invalidateProcessInstanceId,"审定单签章申请-强制撤销");
             reportSignature.setStatus(3);
             reportSignature.preUpdate();
             dao.updateApprovalSignature(reportSignature);
@@ -1341,6 +1343,16 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
     @Transactional(readOnly = false)
     public void delete(ProjectReportSignatureWork projectReportSignature) {
         super.delete(projectReportSignature);
+        //删除报告签章
+        ReportSignature reportBySigId = dao.getReportBySigId(projectReportSignature.getId());
+        if (null != reportBySigId){
+            dao.deleteReportSignature(reportBySigId.getId());
+        }
+        //删除审定单签章
+        ReportSignature approvalBySigId = dao.getApprovalBySigId(projectReportSignature.getId());
+        if (null != approvalBySigId){
+            dao.deleteApprovalSignature(approvalBySigId.getId());
+        }
     }
 
 
@@ -1401,6 +1413,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
             workActivityMenu.setActivities(activitieList);
         }
+        ReportSignature report = dao.getReport(projectReportSignature.getId());
 
         WorkActivityProcess workActivityProcess = new WorkActivityProcess();
         WorkActivityProcess selectProcess = new WorkActivityProcess();
@@ -1412,9 +1425,9 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         Office office = projectReportSignature.getOffice();
         office = officeService.get(office.getId());
         projectReportSignature.setOffice(office);
-        String notifyStr = "报告签章类型签章描述："+ projectReportSignature.getSignatureName();
+        String notifyStr = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章";
         String str = notifyStr+"，创建人："+projectReportSignature.getCreateBy().getName()+"，所属部门："+projectReportSignature.getOffice().getName();
-        String titleStr = "报告签章类型签章描述："+ projectReportSignature.getSignatureName();
+        String titleStr = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章";
         int key = 0;
         if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("signatureProjectReportWorkAudit")) {
             key = 1;
@@ -1446,7 +1459,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                         }
                     }
                     if (!"yes".equals(projectReportSignature.getAct().getFlag())) {
-                        notifyRole = "调整报告签章类型申请";
+                        notifyRole = "调整报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章申请";
                         projectReportSignature.setStatus(ProjectStatusEnum.REJECTED.getValue());
                         workActivityProcess.setIsApproval("2");
                         String returnBack = "-1";
@@ -1557,8 +1570,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         if(!state) {
             users.add(projectReportSignature.getCreateBy());
             //审核完成提示框
-            String title = "报告签章类型申请审批完成";
-            String content = "报告签章类型申请审批完成，签章描述："+ projectReportSignature.getSignatureName();
+            String title = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章审批完成";
+            String content = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章审批完成";
 
             if ("yes".equals(projectReportSignature.getAct().getFlag())) {
                 projectReportSignature.setStatus(ProjectStatusEnum.SIGNED.getValue());
@@ -1633,8 +1646,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             }else {
                 if (!"yes".equals(projectReportSignature.getAct().getFlag())) {//驳回待办提醒
 
-                    str = "报告签章类型申请被驳回，请选择重新申请或作废。";
-                    titleStr = "报告签章类型申请被驳回。";
+                    str = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章类型申请被驳回，请选择重新申请或作废。";
+                    titleStr = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章类型申请被驳回。";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectReportSignature.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1652,8 +1665,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                     workProjectNotifyService.save(workProjectNotify);
                 } else {
                     if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
-                        str = "报告签章类型申请审批重新登记，待审批，签章描述："+projectReportSignature.getSignatureName();
-                        titleStr = "报告签章类型签章申请审批重新登记，待审批";
+                        str = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章申请审批重新登记，待审批";
+                        titleStr = "报告号："+ report.getReportSignatureRelation().getReportDataNum()+",项目名称:"+report.getReportSignatureRelation().getProjectName()+"。报告签章申请审批重新登记，待审批";
 
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectReportSignature.getId());
@@ -1775,6 +1788,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             workActivityMenu.setActivities(activitieList);
         }
 
+        ReportSignature approval = dao.getApproval(projectReportSignature.getId());
+
         WorkActivityProcess workActivityProcess = new WorkActivityProcess();
         WorkActivityProcess selectProcess = new WorkActivityProcess();
         selectProcess.setProcessInstanceId(projectReportSignature.getProcessInstanceId());
@@ -1785,9 +1800,9 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         Office office = projectReportSignature.getOffice();
         office = officeService.get(office.getId());
         projectReportSignature.setOffice(office);
-        String notifyStr = "审定单签章类型签章描述："+ projectReportSignature.getSignatureName();
+        String notifyStr = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章";
         String str = notifyStr+"，创建人："+projectReportSignature.getCreateBy().getName()+"，所属部门："+projectReportSignature.getOffice().getName();
-        String titleStr = "审定单签章类型签章描述："+ projectReportSignature.getSignatureName();
+        String titleStr = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章";
         int key = 0;
         if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("signatureProjectReportWorkAudit")) {
             key = 1;
@@ -1819,7 +1834,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                         }
                     }
                     if (!"yes".equals(projectReportSignature.getAct().getFlag())) {
-                        notifyRole = "调整审定单签章类型申请";
+                        notifyRole = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。调整审定单签章申请";
                         projectReportSignature.setStatus(ProjectStatusEnum.REJECTED.getValue());
                         workActivityProcess.setIsApproval("2");
                         String returnBack = "-1";
@@ -1930,8 +1945,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         if(!state) {
             users.add(projectReportSignature.getCreateBy());
             //审核完成提示框
-            String title = "审定单签章类型申请审批完成";
-            String content = "审定单签章类型申请审批完成，签章描述："+ projectReportSignature.getSignatureName();
+            String title = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章申请审批完成";
+            String content = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章申请审批完成";
 
             if ("yes".equals(projectReportSignature.getAct().getFlag())) {
                 projectReportSignature.setStatus(ProjectStatusEnum.SIGNED.getValue());
@@ -2006,8 +2021,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             }else {
                 if (!"yes".equals(projectReportSignature.getAct().getFlag())) {//驳回待办提醒
 
-                    str = "审定单签章类型申请被驳回，请选择重新申请或作废。";
-                    titleStr = "审定单签章类型申请被驳回。";
+                    str = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章申请被驳回，请选择重新申请或作废。";
+                    titleStr = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章申请被驳回。";
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(projectReportSignature.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);
@@ -2025,8 +2040,8 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                     workProjectNotifyService.save(workProjectNotify);
                 } else {
                     if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办信息
-                        str = "审定单签章类型申请审批重新登记，待审批，签章描述："+projectReportSignature.getSignatureName();
-                        titleStr = "审定单签章类型签章申请审批重新登记，待审批";
+                        str = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章类型申请审批重新登记，待审批";
+                        titleStr = "报告号："+ approval.getReportSignatureRelation().getReportDataNum()+",项目名称:"+approval.getReportSignatureRelation().getProjectName()+"。审定单签章类型签章申请审批重新登记，待审批";
 
                         WorkProjectNotify notify = new WorkProjectNotify();
                         notify.setNotifyId(projectReportSignature.getId());

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkView.jsp

@@ -761,7 +761,13 @@
                     </table>
                 </div>
             </div>
-
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${projectReportSignature.act.procInsId}"/>
+                    <act:histoicFlow procInsId="${projectReportSignature.act.procInsId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
 

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkViewApproval.jsp

@@ -761,7 +761,13 @@
                     </table>
                 </div>
             </div>
-
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${projectReportSignature.act.procInsId}"/>
+                    <act:histoicFlow procInsId="${projectReportSignature.act.procInsId}"/>
+                </div>
+            </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>