1111

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -983,6 +983,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 						notifyRole = "市场分管领导";
 						workActivityProcess.setIsApproval("1");
 						enname = "scfgld";
+						vars.put("counts",auditUsers.size());
+						vars.put("fgldList",auditUsers);
+
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1378,7 +1378,7 @@ public class WorkContractInfoController extends BaseController {
             workClientAttachments.addAll(workClientAttachmentList);
             workContractInfo.setWorkAttachments(workClientAttachments);
         }
-        try{
+//        try{
             // 对不同环节的业务逻辑进行操作
             List<User> users = null;
             if ("bmzr".equals(taskDefKey)){
@@ -1401,9 +1401,9 @@ public class WorkContractInfoController extends BaseController {
                 String str = workContractInfoService.auditSave(workContractInfo, VarStr.CONTRACT_STATUS,users);
                 addMessage(redirectAttributes, str);
             }
-        }catch (Exception e){
-            addMessage(redirectAttributes, "审批失败");
-        }
+//        }catch (Exception e){
+//            addMessage(redirectAttributes, "审批失败");
+//        }
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {

src/main/resources/jeeplus.properties

@@ -27,7 +27,6 @@ db.name=ruihuaoa-activity-data
 jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 #jdbc.url=jdbc:mysql://172.16.182.240:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/dkwy?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.username=yangfan
 jdbc.username=root
 #jdbc.username=root
@@ -71,8 +70,7 @@ redis.keyPrefix=jeeplus
 #redis.host=101.37.149.85
 redis.host=127.0.0.1
 #redis.host=192.168.110.61
-redis.port=6380
-#redis.port=6379
+redis.port=6379