校验修改

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java

@@ -127,8 +127,8 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         String taskName = planinfo.getTaskName();
         taskName=StrUtil.trim(taskName);
         String projectId = planinfoService.getById(planinfoid).getProjectId();
-        // 校验
-        hasRealContractInfo(taskName, projectId);
+        // TODO 1.校验修改 2.插入:huzhou_projectinfo_money表 3.插入:huzhou_contractinfo表
+        //hasRealContractInfo(taskName, projectId);
 
         HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
         String superLeader = "";
@@ -168,61 +168,6 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             strings.add(userid);
         }
 
-//        if (Arrays.asList(tNames).contains(taskName)) {
-//            WorkFlow workFlow = workflowService.createFlow("feasibilityReportPreparation",planinfoid);
-//            Task task = workFlow.getTask();
-//            String taskId = task.getId();
-//            String processInstanceId = workFlow.getProcessInstanceId();
-//            Map<String, Object> variables = new HashMap<>();
-//            variables.put("taskLeadingDepartment",strings);
-//            runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第四个人变量信息
-//            variables.clear();
-//            //根据行政区县判断审批人
-//            if("市本级".equals(adminDivision)){
-//                //是市本级，判读责任单位
-//                String dutyWorkplace = huzhouProjectinfo.getDutyWorkplace();
-//                if(dutyWorkplace.contains("湖州市中心医院")){
-//                    //是湖州市中心医院 则由吴兴区负责人审批
-//                    adminDivision="吴兴区";
-//                }else if(dutyWorkplace.contains("湖州市第一人民医院")){
-//                    //是湖州市第一人民医院，则有南浔区负责人审批
-//                    adminDivision="南浔区";
-//                }else if(dutyWorkplace.contains("湖州市第三人民医院")){
-//                    //是湖州市第三人民医院，则有德清县负责人审批
-//                    adminDivision="德清县";
-//                }else if(dutyWorkplace.contains("湖州市妇幼保健院")){
-//                    adminDivision="安吉县";
-//                }else if(dutyWorkplace.contains("湖州市中医院")){
-//                    adminDivision="长兴县";
-//                }
-//            }
-//            //行政区县名称查询角色有哪些人
-//            userDictByRoles = userService.getUserDictByRoles(adminDivision);
-//            ArrayList<String> strings2 = new ArrayList<>();
-//            if(userDictByRoles==null||userDictByRoles.size()==0){
-//                String error = "信息化保障团队"+adminDivision+"负责人未找到";
-//                throw new EasyException(error);
-//            }
-//            for (HashMap<String, String> map:userDictByRoles
-//            ) {
-//                String userid = map.get("value");
-//                strings2.add(userid);
-//            }
-//            variables.put("informationSecurityTeam",strings2);//设置第二个人
-//            //发起人节点处理
-//            taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过
-//            String comment = "同意";
-//            taskService.addComment(taskId,processInstanceId,comment);//添加审批意见
-//            taskService.complete(taskId, variables);
-//            HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
-//            huzhouPlaninfo.setId(planinfoid);
-//            huzhouPlaninfo.setIsfinish("1");
-//            huzhouPlaninfo.setActualStartTime(new Date());
-//
-//            planinfoService.updateById(huzhouPlaninfo);
-//        }
-
-//       if(Arrays.asList(names).contains(taskName)||existsContractinfo){
         if(Arrays.asList(names).contains(taskName)||existsContractinfo){
            HashMap<String, String> hashMap = new HashMap<>();
            hashMap.put("chuBuSheJiShenPi","初步设计审批");