diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java index e8019d5..454747b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java @@ -561,7 +561,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl planList = this.getPlanContractinfoByprojectId(projectId); List realList = this.getRealContractinfoByprojectId(projectId); - + // if (realList.size() == 0){ // resultDesc.append("该项目未提交合同信息"); // log.info("子项目名称{}未上传合同信息", projectInfo.getProjectName()); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index 8e5a23b..6ad977e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -155,13 +155,16 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl 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