试运行阶段自动创建后续流程修改

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

@@ -561,7 +561,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
         // 获取计划和实际合同信息集合，假设它们已经按照 pay_date 排序
         List<HuzhouContractinfo> planList = this.getPlanContractinfoByprojectId(projectId);
         List<HuzhouContractinfo> realList = this.getRealContractinfoByprojectId(projectId);
-        
+
 //        if (realList.size() == 0){
 //            resultDesc.append("该项目未提交合同信息");
 //            log.info("子项目名称{}未上传合同信息",  projectInfo.getProjectName());

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

@@ -155,13 +155,16 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         taskName=StrUtil.trim(taskName);
         // 校验参数
         checkVariable(contractMoneyFieldsValue, contractList, planinfo, taskName);
+
+        String projectId = planinfoService.getById(planinfoid).getProjectId();
+        HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
         // 提交试运行阶段的时候自动创建 计划
         if("试运行阶段".equals(taskName)){
             LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(HuzhouPlaninfo::getProjectId,planinfo.getProjectId());
             queryWrapper.eq(HuzhouPlaninfo::getTaskName,"试运行阶段");
             HuzhouPlaninfo source = planinfoMapper.selectOne(queryWrapper);
-            if (source != null && source.getIsfinish().equals("0")) {
+            if (source != null && huzhouProjectinfo.getAdminDivision().equals("市本级") ) {
                 HuzhouPlaninfo target = new HuzhouPlaninfo();
                 BeanUtils.copyProperties(source,target,"id","actualStartTime","actualEndTime");
                 target.setTaskName("提交终验申请");
@@ -176,8 +179,6 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
                 planinfoMapper.insert(target);
             }
         }
-        String projectId = planinfoService.getById(planinfoid).getProjectId();
-        HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId);
 
         String superLeader = "";
         String adminDivision="";