bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterMidPayItemContractVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class MeterMidPayItemContractVO extends MeterMidPayItemContract {
 
     @ApiModelProperty(value = "汇总项列表信息")
-    private List<MeterMidPayItemContract> summaryItemList;
+    private List<MeterMidPayItemContractVO> summaryItemList;
 
     @ApiModelProperty(value = "支付项类型名称")
     private String payTypeName;

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterMidPayItemProjectVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class MeterMidPayItemProjectVO extends MeterMidPayItemProject {
 
     @ApiModelProperty(value = "汇总项列表信息")
-    private List<MeterMidPayItemProject> summaryItemList;
+    private List<MeterMidPayItemProjectVO> summaryItemList;
 
     @ApiModelProperty(value = "支付项类型名称")
     private String payTypeName;

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MeterMidPayItemSystemVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class MeterMidPayItemSystemVO extends MeterMidPayItemSystem {
 
     @ApiModelProperty(value = "汇总项列表信息")
-    private List<MeterMidPayItemSystem> summaryItemList;
+    private List<MeterMidPayItemSystemVO> summaryItemList;
 
     @ApiModelProperty(value = "支付项类型名称")
     private String payTypeName;

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -29,8 +29,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -598,7 +597,7 @@ public class MeterTreeController extends BladeController {
             /*最底层节点修改*/
             dto.setUpdateStatus(1); //编辑
             boolean b1 = meterTreeContractService.updateById(dto);
-            boolean b2 = inventoryFormMeterService.updateInfo(dto.getDecompositionList(),dto.getId());//TODO 修改分解清单列表信息ContractFromVO
+            boolean b2 = inventoryFormMeterService.updateInfo(dto.getDecompositionList(), dto.getId());//TODO 修改分解清单列表信息ContractFromVO
             if (b1 && b2) {
                 return R.success("操作成功");
             }
@@ -660,7 +659,7 @@ public class MeterTreeController extends BladeController {
             }
 
             //TODO 此处为分解列表信息，查询赋值
-            List<ContractFromVO> contrFormAllByContrId = contractInventoryFormService.getContrFormAllByContrId(basicInfo.getContractId(), "",2,basicInfo.getId());
+            List<ContractFromVO> contrFormAllByContrId = contractInventoryFormService.getContrFormAllByContrId(basicInfo.getContractId(), "", 2, basicInfo.getId());
             vo.setDecompositionList(contrFormAllByContrId);
             return R.data(vo);
         }
@@ -777,5 +776,29 @@ public class MeterTreeController extends BladeController {
         return R.fail("操作失败");
     }
 
+    @GetMapping("/getNodeTypeList")
+    @ApiOperationSupport(order = 31)
+    @ApiOperation(value = "系统、项目、合同段获取节点类型列表", notes = "")
+    public R<List<Dict>> getSystemOrProjectNodeTypeList() {
+        List<Dict> query = jdbcTemplate.query("SELECT dict_value,dict_key FROM blade_dict WHERE is_deleted = 0 AND code = 'wbs_node_type' AND dict_key in(1,2,3,4,5,6)", new BeanPropertyRowMapper<>(Dict.class));
+        return R.data(query);
+    }
+
+    @GetMapping("/contract/update/getNodeTypeList")
+    @ApiOperationSupport(order = 32)
+    @ApiOperation(value = "合同段修改时获取下级节点类型列表", notes = "传入id")
+    public R<List<Dict>> getNodeTypeList(@RequestParam String id) {
+        MeterTreeContract contractNode = meterTreeContractService.getById(id);
+        if (contractNode != null && ObjectUtil.isNotEmpty(contractNode.getNodeType())) {
+            Integer nodeType = contractNode.getNodeType();
+            List<Dict> query = jdbcTemplate.query(
+                    "SELECT dict_value, dict_key FROM blade_dict WHERE is_deleted = 0 AND code = 'wbs_node_type' AND dict_key >= ? AND dict_key <= 6",
+                    new Object[]{nodeType},
+                    new BeanPropertyRowMapper<>(Dict.class)
+            );
+            return R.data(query);
+        }
+        return R.data(null);
+    }
 
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MidPayItemController.java

@@ -65,7 +65,19 @@ public class MidPayItemController extends BladeController {
             if (recordInfos.size() > 0) {
                 Set<Long> ids = recordInfos.stream().map(MeterMidPayItemRelation::getMidPayIdRelation).collect(Collectors.toSet());
                 List<MeterMidPayItemSystem> recordList = payItemSystemService.listByIds(ids);
-                vo.setSummaryItemList(recordList);
+                List<MeterMidPayItemSystemVO> recordListVO = new ArrayList<>();
+                for (MeterMidPayItemSystem objRecord : recordList) {
+                    MeterMidPayItemSystemVO voRecord = new MeterMidPayItemSystemVO();
+                    BeanUtil.copyProperties(objRecord, voRecord);
+                    if (ObjectUtil.isNotEmpty(objRecord.getPayApplicableType())) {
+                        voRecord.setPayApplicableTypeName(meterPayAppTypeMap.getOrDefault(objRecord.getPayApplicableType().toString(), null));
+                    }
+                    if (ObjectUtil.isNotEmpty(objRecord.getPayType())) {
+                        voRecord.setPayTypeName(meterPayTypeMap.getOrDefault(objRecord.getPayType().toString(), null));
+                    }
+                    recordListVO.add(voRecord);
+                }
+                vo.setSummaryItemList(recordListVO);
             }
             return R.data(vo);
         }
@@ -156,7 +168,19 @@ public class MidPayItemController extends BladeController {
             if (recordInfos.size() > 0) {
                 Set<Long> ids = recordInfos.stream().map(MeterMidPayItemRelation::getMidPayIdRelation).collect(Collectors.toSet());
                 List<MeterMidPayItemProject> recordList = payItemProjectService.listByIds(ids);
-                vo.setSummaryItemList(recordList);
+                List<MeterMidPayItemProjectVO> recordListVO = new ArrayList<>();
+                for (MeterMidPayItemProject objRecord : recordList) {
+                    MeterMidPayItemProjectVO voRecord = new MeterMidPayItemProjectVO();
+                    BeanUtil.copyProperties(objRecord, voRecord);
+                    if (ObjectUtil.isNotEmpty(objRecord.getPayApplicableType())) {
+                        voRecord.setPayApplicableTypeName(meterPayAppTypeMap.getOrDefault(objRecord.getPayApplicableType().toString(), null));
+                    }
+                    if (ObjectUtil.isNotEmpty(objRecord.getPayType())) {
+                        voRecord.setPayTypeName(meterPayTypeMap.getOrDefault(objRecord.getPayType().toString(), null));
+                    }
+                    recordListVO.add(voRecord);
+                }
+                vo.setSummaryItemList(recordListVO);
             }
             return R.data(vo);
         }
@@ -302,7 +326,19 @@ public class MidPayItemController extends BladeController {
             if (recordInfos.size() > 0) {
                 Set<Long> ids = recordInfos.stream().map(MeterMidPayItemRelation::getMidPayIdRelation).collect(Collectors.toSet());
                 List<MeterMidPayItemContract> recordList = payItemContractService.listByIds(ids);
-                vo.setSummaryItemList(recordList);
+                List<MeterMidPayItemContractVO> recordListVO = new ArrayList<>();
+                for (MeterMidPayItemContract objRecord : recordList) {
+                    MeterMidPayItemContractVO voRecord = new MeterMidPayItemContractVO();
+                    BeanUtil.copyProperties(objRecord, voRecord);
+                    if (ObjectUtil.isNotEmpty(objRecord.getPayApplicableType())) {
+                        voRecord.setPayApplicableTypeName(meterPayAppTypeMap.getOrDefault(objRecord.getPayApplicableType().toString(), null));
+                    }
+                    if (ObjectUtil.isNotEmpty(objRecord.getPayType())) {
+                        voRecord.setPayTypeName(meterPayTypeMap.getOrDefault(objRecord.getPayType().toString(), null));
+                    }
+                    recordListVO.add(voRecord);
+                }
+                vo.setSummaryItemList(recordListVO);
             }
             return R.data(vo);
         }

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -35,7 +35,6 @@ public class WbsTreeController extends BladeController {
 
     /**
      * 客户端懒加载获取合同段树（统计颜色、填报数量）
-     * （从manager服务剥离到user服务，解决manager服务与mysql不在同一服务器中，网络延迟问题）
      *
      * @author liuyc
      * @date 2023年12月6日09:52:54

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -69,8 +69,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "6");
     }
 
-    private static Logger _logger = LoggerFactory.getLogger(UserServiceImpl.class);
-
+    private final static Logger _logger = LoggerFactory.getLogger(UserServiceImpl.class);
     /*存储当前合同段contractId对应的合同段树*/
     private final Map<String, List<WbsTreeContractLazyVO>> localCacheNodes = new ConcurrentHashMap<>();
     /*存储当前合同段contractId_tableOwner对应的资料查询信息*/