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

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) {
-        LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
+        if (taskName.equals("合同签订")){
-        queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
+            LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
+            queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
-        queryWrapper.eq(HuzhouContractinfo::getFlag,"实际");
+            queryWrapper.eq(HuzhouContractinfo::getFlag,"计划");
-        List<HuzhouContractinfo> list = list(queryWrapper);
+            List<HuzhouContractinfo> list1  = list(queryWrapper);
-        return list;
+            return list1;
+        }else {
+            LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(HuzhouContractinfo::getProjectId, projectid);
+            queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
+            queryWrapper.eq(HuzhouContractinfo::getFlag,"实际");
+            List<HuzhouContractinfo> list2  = list(queryWrapper);
+            return list2;
+        }
     }
 
     @Override
@@ -365,28 +373,38 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
 
     @Override
     public ContractInfoVo getContractinfoByTaskName(String projectId, String taskName) {
-        LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
+        if (taskName.equals("合同签订")){
-        queryWrapper.eq(HuzhouContractinfo::getProjectId, projectId);
-        queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
-        List<HuzhouContractinfo> rs = list(queryWrapper);
-        if (rs.size() == 1) {
-            // 返回合同信息(计划)
             ContractInfoVo contractInfoVo = new ContractInfoVo();
             List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
             contractInfoVo.setHasInfo(true);
             contractInfoVo.setPlanList(planList);
             return contractInfoVo;
         }
-        if (rs.size()>1){
+        else {
-            // 返回合同信息(计划 + 实际)
+            LambdaQueryWrapper<HuzhouContractinfo> queryWrapper = new LambdaQueryWrapper<>();
-            ContractInfoVo contractInfoVo = new ContractInfoVo();
+            queryWrapper.eq(HuzhouContractinfo::getProjectId, projectId);
-            List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
+            queryWrapper.eq(HuzhouContractinfo::getTaskName, taskName);
-            List<HuzhouContractinfo> realList = this.getRealContractinfoByprojectId(projectId);
+            List<HuzhouContractinfo> rs = list(queryWrapper);
-            contractInfoVo.setHasInfo(true);
+            if (rs.size() == 1) {
-            contractInfoVo.setPlanList(planList);
+                // 返回合同信息(计划)
-            contractInfoVo.setRealList(realList);
+                ContractInfoVo contractInfoVo = new ContractInfoVo();
-            return contractInfoVo;
+                List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
+                contractInfoVo.setHasInfo(true);
+                contractInfoVo.setPlanList(planList);
+                return contractInfoVo;
+            }
+            if (rs.size()>1){
+                // 返回合同信息(计划 + 实际)
+                ContractInfoVo contractInfoVo = new ContractInfoVo();
+                List<HuzhouContractinfo> planList = this.getContractinfoByprojectId(projectId);
+                List<HuzhouContractinfo> realList = this.getRealContractinfoByprojectId(projectId);
+                contractInfoVo.setHasInfo(true);
+                contractInfoVo.setPlanList(planList);
+                contractInfoVo.setRealList(realList);
+                return contractInfoVo;
+            }
         }
+
         ContractInfoVo contractInfoVo = new ContractInfoVo();
         contractInfoVo.setHasInfo(false);
         return contractInfoVo;