提交新增合同文件校验

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryListResVo.java

@@ -155,6 +155,11 @@ public class QueryListResVo implements Serializable {
     @Schema(description = "承运单位名")
     private String carrierEntName;
 
+    /**
+     * 发起人id
+     */
+    @Schema(description = "发起人id")
+    private Long initiatorId;
 
     /**
      * 发起人

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1665,6 +1665,7 @@ public class KwcContractTradeService {
                 new KwcContractTrade());
         queryListResVo.setContractPname(parentTrade.getName());
         UserCacheResDto userCacheResDto = longUserCacheResDtoMap.getOrDefault(t.getCreateBy(), new UserCacheResDto());
+        queryListResVo.setInitiatorId(t.getCreateBy());
         queryListResVo.setInitiateName(userCacheResDto.getName());
         if (Objects.nonNull(userCacheResDto.getEntInfo())){
             queryListResVo.setInitiateEntName(userCacheResDto.getEntInfo().getFirmName());

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1417,14 +1417,10 @@ public class KwpGoodsService {
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(goods)) {
             return new GoodsInfoResp();
         }
-        List<SysDictResDto> dictResDtos = remoteSystemService.queryDictByType(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
-        Map<String, SysDictResDto> valueAndDictResDtoMap = Maps.newHashMap();
-        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(dictResDtos)){
-           valueAndDictResDtoMap = dictResDtos.stream()
-                    .collect(Collectors.toMap(SysDictResDto::getValue, Function.identity(), (v1, v2) -> v1));
-        }
+        List<String> types = Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.UNIT_TYPE.getType());
         //组装商品参数
-        Map<String, SysDictResDto> finalValueAndDictResDtoMap = valueAndDictResDtoMap;
+        Map<String,  Map<String, String>> finalValueAndDictResDtoMap = remoteSystemService.queryDictByType(types);
+
         List<GoodsInfoResp.GoodsInfo> goodsInfos = goods.stream()
                 .filter(e -> Objects.equals(e.getStatus(), GoodsStatusEnum.PUT_ON_SHELVES.getCode()))
                 .map(x->KwpGoodsService.getGoodsInfo(x, finalValueAndDictResDtoMap))
@@ -1434,12 +1430,16 @@ public class KwpGoodsService {
         return goodsInfoResp;
     }
 
-    private static GoodsInfoResp.GoodsInfo getGoodsInfo(KwpGoods x,Map<String, SysDictResDto> valueAndDictResDtoMap ) {
+    private static GoodsInfoResp.GoodsInfo getGoodsInfo(KwpGoods x,Map<String,  Map<String, String>> valueAndDictResDtoMap ) {
         GoodsInfoResp.GoodsInfo goodsInfo = new GoodsInfoResp.GoodsInfo();
         goodsInfo.setGoodsId(x.getId());
-        SysDictResDto dictResDto = valueAndDictResDtoMap.getOrDefault(x.getGoodsType(), new SysDictResDto());
-        goodsInfo.setGoodsName(x.getName()+"/"+dictResDto.getLabel()+"/"+x.getSpec());
-        goodsInfo.setAmountUnit(x.getUnit());
+
+        Map<String, String> productNameMap = valueAndDictResDtoMap.getOrDefault(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), new HashMap<>());
+        String productType = productNameMap.get(x.getGoodsType());
+        goodsInfo.setGoodsName(x.getName()+"/"+productType+"/"+x.getSpec());
+
+        Map<String, String> unitMap = valueAndDictResDtoMap.getOrDefault(DictTypeEnum.UNIT_TYPE.getType(), new HashMap<>());
+        goodsInfo.setAmountUnit(unitMap.get(x.getUnit()));
         goodsInfo.setPriceUnit(x.getPriceUnit());
         return goodsInfo;
     }