流程描述

zjugis-business/src/main/java/com/zjugis/business/flow/contract/service/FlowContractService.java

@@ -157,7 +157,8 @@ public class FlowContractService {
     @Transactional
     public int updateById(Contract contract) {
         int res = contractMapper.updateById(contract);
-        String flowDesc = StringUtils.join(Arrays.asList(contract.getName(), contract.getApplicantName()), "/");
+        Contract db = contractMapper.selectById(contract.getId());
+        String flowDesc = StringUtils.join(Arrays.asList(db.getName(), db.getApplicantName()), "/");
         workflowClient.saveFlowDescribe(contract.getInstanceId(),flowDesc);
 //        contractService.updateAreaManager(contract);
         return res;

zjugis-business/src/main/java/com/zjugis/business/flow/contractApply/service/FlowContractApplyService.java

@@ -152,7 +152,8 @@ public class FlowContractApplyService {
     public int updateById(ContractApply subcontractApply) {
         int res = subcontractApplyMapper.updateById(subcontractApply);
         Project project = projectService.selectDOById(subcontractApply.getProjectId());
-        String flowDesc = StringUtils.join(Arrays.asList(subcontractApply.getApplyWorker(), subcontractApply.getApplyDate(),subcontractApply.getContractAmount(),project != null? project.getXmmc():""), "/");
+        ContractApply db = subcontractApplyMapper.selectById(subcontractApply.getId());
+        String flowDesc = StringUtils.join(Arrays.asList(db.getApplyWorker(), db.getApplyDate(),db.getContractAmount(),project != null? project.getXmmc():""), "/");
         workflowClient.saveFlowDescribe(subcontractApply.getInstanceId(),flowDesc);
         return res;
     }

zjugis-business/src/main/java/com/zjugis/business/flow/contractSub/service/FlowContractSubService.java

@@ -1,10 +1,7 @@
 package com.zjugis.business.flow.contractSub.service;
 
 import com.alibaba.fastjson2.JSON;
-import com.zjugis.business.bean.entity.Contract;
-import com.zjugis.business.bean.entity.ContractSub;
-import com.zjugis.business.bean.entity.Project;
-import com.zjugis.business.bean.entity.Supplier;
+import com.zjugis.business.bean.entity.*;
 import com.zjugis.business.constants.ContractApplyConstants;
 import com.zjugis.business.constants.DictConstants;
 import com.zjugis.business.constants.FlowStatusConstants;
@@ -116,7 +113,8 @@ public class FlowContractSubService {
 
     public int updateById(ContractSub entity) {
         int res = contractSubMapper.updateById(entity);
-        String flowDesc = StringUtils.join(Arrays.asList(entity.getName(), entity.getApplicantName()), "/");
+        ContractSub db = contractSubMapper.selectById(entity.getId());
+        String flowDesc = StringUtils.join(Arrays.asList(db.getName(), db.getApplicantName()), "/");
         workflowClient.saveFlowDescribe(entity.getInstanceId(),flowDesc);
         return res;
     }

zjugis-business/src/main/java/com/zjugis/business/security/SecurityConfiguration.java

@@ -24,7 +24,7 @@ public class SecurityConfiguration {
                 registry.antMatchers("/actuator").anonymous()
                         .antMatchers("/actuator/**").anonymous();
                 // Druid 监控
-                registry.antMatchers("/druid/**").anonymous();
+                registry.antMatchers("/druid/**").permitAll();
                 // RPC 服务的安全配置
                 registry.antMatchers(ApiConstants.PREFIX + "/**").permitAll();
                 registry.antMatchers("/**").permitAll();

zjugis-business/src/main/resources/templates/FlowContractApply/outApply.ftl

@@ -177,8 +177,8 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css']>
                           <td colspan="3">
                               <div class="form-group">
                                   <div class="form-item">
-                                      <div class="z-comp-input" name="contractApply$reason">
-                                          <input type="text" value="${formEntity.reason!}">
+                                      <div class="z-comp-textarea" name="contractApply$reason">
+                                          <textarea>${formEntity.reason!}</textarea>
                                       </div>
                                   </div>
                               </div>

zjugis-business/src/main/resources/templates/FlowContractApply/subApply.ftl

@@ -197,8 +197,8 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css']>
                           <td colspan="3">
                               <div class="form-group">
                                   <div class="form-item">
-                                      <div class="z-comp-input" name="contractApply$reason">
-                                          <input type="text" value="${formEntity.reason!}">
+                                      <div class="z-comp-textarea" name="contractApply$reason">
+                                          <textarea>${formEntity.reason!}</textarea>
                                       </div>
                                   </div>
                               </div>

zjugis-workflow/src/main/java/com/zjugis/z_workflow/security/SecurityConfiguration.java

@@ -24,7 +24,7 @@ public class SecurityConfiguration {
                 registry.antMatchers("/actuator").anonymous()
                         .antMatchers("/actuator/**").anonymous();
                 // Druid 监控
-                registry.antMatchers("/druid/**").anonymous();
+                registry.antMatchers("/druid/**").permitAll();
                 // RPC 服务的安全配置
                 registry.antMatchers(ApiConstants.PREFIX + "/**").permitAll();
                 registry.antMatchers("/**").permitAll();