From 8725ef729e40a780d964075308ee25478d2d5a94 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 16 Jun 2025 11:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E8=BF=90=E8=A1=8C=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E5=90=8E=E7=BB=AD=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/service/impl/HuzhouContractinfoServiceImpl.java | 2 +-
 .../huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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<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());
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<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="";