代理合同对接

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

@@ -60,6 +60,9 @@ public class ProxyContractDetailResp implements Serializable {
     @Schema(description = "创建人")
     private Long createBy;
 
+    @Schema(description = "创建人名称")
+    private String createByName;
+
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;

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

@@ -22,6 +22,7 @@ public class ProxyContractListResp implements Serializable {
 
     @Schema(description = "合同名称")
     private String name;
+    private String entName;
 
     @Schema(description = "供应单位ID")
     private Long supplyId;
@@ -62,6 +63,9 @@ public class ProxyContractListResp implements Serializable {
     @Schema(description = "创建人")
     private Long createBy;
 
+    @Schema(description = "创建人名称")
+    private String createByName;
+
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/impl/KwcContractProxyServiceImpl.java

@@ -21,6 +21,7 @@ import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -65,10 +66,16 @@ public class KwcContractProxyServiceImpl implements KwcContractProxyService {
         Map<Long, KwcContractProxyUnit> supplyUnitMap = allUnits.stream().filter(u -> Objects.equals(u.getUnitType(), 1)).collect(Collectors.toMap(KwcContractProxyUnit::getContractId, Function.identity(), (a, b) -> a));
 
         Map<Long, KwcContractProxyUnit> proxyUnitMap = allUnits.stream().filter(u -> Objects.equals(u.getUnitType(), 2)).collect(Collectors.toMap(KwcContractProxyUnit::getContractId, Function.identity(), (a, b) -> a));
+        List<Long> ents = records.stream().map(KwcContractProxy::getEntId).distinct().toList();
+        Map<Long, EntCacheResDto> longEntCacheResDtoMap = remoteSystemService.queryEntCacheMapByIds(ents);
+        List<Long> createByIds = records.stream().map(KwcContractProxy::getCreateBy).filter(Objects::nonNull).distinct().toList();
+        Map<Long, UserCacheResDto> userMap = remoteSystemService.queryUserCacheMapByIds(createByIds);
 
         List<ProxyContractListResp> list = records.stream().map(r -> {
             ProxyContractListResp resp = new ProxyContractListResp();
+            EntCacheResDto entCacheResDto = longEntCacheResDtoMap.get(r.getEntId());
             resp.setId(r.getId());
+            resp.setEntName(Objects.nonNull(entCacheResDto) ? entCacheResDto.getFirmName() : "");
             resp.setContractNo(r.getContractNo());
             resp.setName(r.getName());
             resp.setSupplyId(r.getSupplyId());
@@ -81,6 +88,8 @@ public class KwcContractProxyServiceImpl implements KwcContractProxyService {
             resp.setStatus(r.getStatus());
             resp.setStatusDesc(ProxyStatusEnum.getLabel(r.getStatus()));
             resp.setCreateBy(r.getCreateBy());
+            UserCacheResDto userCacheResDto = userMap.get(r.getCreateBy());
+            resp.setCreateByName(Objects.nonNull(userCacheResDto) ? userCacheResDto.getName() : "");
             resp.setCreateTime(r.getCreateTime());
 
             KwcContractProxyUnit supplyUnit = supplyUnitMap.get(r.getId());
@@ -119,6 +128,8 @@ public class KwcContractProxyServiceImpl implements KwcContractProxyService {
         resp.setRemark(proxy.getRemark());
         resp.setStatus(proxy.getStatus());
         resp.setCreateBy(proxy.getCreateBy());
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(proxy.getCreateBy());
+        resp.setCreateByName(Objects.nonNull(userCacheResDto) ? userCacheResDto.getName() : "");
         resp.setCreateTime(proxy.getCreateTime());
         resp.setUpdateBy(proxy.getUpdateBy());
         resp.setUpdateTime(proxy.getUpdateTime());
@@ -221,7 +232,7 @@ public class KwcContractProxyServiceImpl implements KwcContractProxyService {
         if (Objects.equals(auditStatus, 1)) {
             List<KwcContractProxyGoods> kwcContractProxyGoods = proxyGoodsRepository.queryByContractId(proxy.getId());
             List<Long> list = kwcContractProxyGoods.stream().map(KwcContractProxyGoods::getGoodsId).toList();
-            goodsInfoService.insertProxyGoods(list,proxy.getProxyId());
+            goodsInfoService.insertProxyGoods(list, proxy.getProxyId());
         }
         return Boolean.TRUE;
     }