阶段合同信息回显逻辑调整

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

@@ -281,12 +281,20 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
 
     @Override
     public List<HuzhouContractinfo> getContractinfoByprojectIdAndTaskName(String projectid, String taskName) {
+        if (taskName.equals("合同签订")){
+            LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
+            queryWrapper.eq(HuzhouContractinfo::getFlag,"计划");
+            List<HuzhouContractinfo> list1  = list(queryWrapper);
+            return list1;
+        }else {
             LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
             queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
             queryWrapper.eq(HuzhouContractinfo::getFlag,"实际");
-        List<HuzhouContractinfo> list = list(queryWrapper);
+            List<HuzhouContractinfo> list2  = list(queryWrapper);
-        return list;
+            return list2;
+        }
     }
 
     @Override
@@ -365,6 +373,14 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
 
     @Override
     public ContractInfoVo getContractinfoByTaskName(String projectId, String taskName) {
+        if (taskName.equals("合同签订")){
+            ContractInfoVo contractInfoVo = new ContractInfoVo();
+            List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
+            contractInfoVo.setHasInfo(true);
+            contractInfoVo.setPlanList(planList);
+            return contractInfoVo;
+        }
+        else {
             LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(HuzhouContractinfo::getProjectId, projectId);
             queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
@@ -387,6 +403,8 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
                 contractInfoVo.setRealList(realList);
                 return contractInfoVo;
             }
+        }
+
         ContractInfoVo contractInfoVo = new ContractInfoVo();
         contractInfoVo.setHasInfo(false);
         return contractInfoVo;