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 6d1270b..8e5a23b 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 @@ -24,6 +24,7 @@ import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; @@ -43,6 +44,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.time.LocalDate; +import java.time.ZoneId; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -150,17 +153,29 @@ 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")) { + HuzhouPlaninfo target = new HuzhouPlaninfo(); + BeanUtils.copyProperties(source,target,"id","actualStartTime","actualEndTime"); + target.setTaskName("提交终验申请"); + target.setTaskFile("《提交终验申请》"); + target.setIsfinish("0"); + // 设置日期为 2025-12-31 + LocalDate targetLocalDate = LocalDate.of(2025, 12, 31); + ZoneId zone = ZoneId.of("GMT+8"); + Date setDate = Date.from(targetLocalDate.atStartOfDay(zone).toInstant()); + target.setScheduledStartTime(setDate); + target.setScheduledEndTime(setDate); + planinfoMapper.insert(target); } } - String projectId = planinfoService.getById(planinfoid).getProjectId(); HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId); @@ -350,7 +365,25 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl variables = new HashMap<>(); + variables.put("taskLeadingDepartment",strings); + runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第四个人变量信息 + //发起人节点处理 + 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); + }else{ HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); huzhouPlaninfo.setId(planinfoid); huzhouPlaninfo.setIsfinish("2"); @@ -388,6 +421,30 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl contractList, HuzhouPlaninfo planinfo, String taskName) throws JsonProcessingException { + // 增加终验申请校验 + if ("终验阶段".equals(taskName)){ + String projectId = planinfo.getProjectId(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPlaninfo::getProjectId,projectId); + queryWrapper.eq(HuzhouPlaninfo::getTaskName,"提交终验申请"); + queryWrapper.eq(HuzhouPlaninfo::getIsfinish,"2"); + HuzhouPlaninfo target = planinfoMapper.selectOne(queryWrapper); + if (target==null){ + throw new EasyException("请先完成终验申请!"); + } + } + if (CollectionUtil.isEmpty(contractList) && taskName.equals("合同签订")){ + throw new EasyException("合同信息不能为空!"); + } + // 校验合同金额 + if (CollectionUtil.isNotEmpty(contractList)) { + if (contractinfoService.checkContractAmount(contractList, contractMoneyFieldsValue, taskName)) { + log.info("金额校验成功!"); + } + } + } + /** * 判断是否为二次上传合同信息 * @param contractList 合同信息集合 diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 9138940..5dd5df2 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -2798,7 +2798,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl !"-1".equals(project.getStage())) .filter(project -> !"湖州市长兴县浙里健康e生省级试点应用建设项目".equals(project.getProjectName()))