Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/controller/KwcContractSaleController.java

@@ -1,9 +1,7 @@
 package com.sckw.contract.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.sckw.contract.model.vo.req.*;
 import com.sckw.contract.service.KwcContractTradeService;
-import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
@@ -16,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Properties;
-
 
 /**
  * @author czh

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/dto/req/QueryListReqDto.java

@@ -73,4 +73,9 @@ public class QueryListReqDto {
      */
     private Long targetEntId;
 
+    /**
+     * 发起人id集合
+     */
+    private List<Long> initiateList;
+
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -39,6 +39,7 @@ import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.KwsUserResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import jakarta.servlet.http.HttpServletResponse;
@@ -714,6 +715,14 @@ public class KwcContractLogisticsService {
                 allEnt.addAll(child.stream().map(EntCacheResDto::getId).toList());
             }
         }
+
+        if (StringUtils.isNotBlank(reqVo.getKeywords())) {
+            List<KwsUserResDto> userByName = remoteUserService.getUserByName(reqVo.getKeywords());
+            if (CollectionUtils.isNotEmpty(userByName)) {
+                queryListReqDto.setInitiateList(userByName.stream().map(KwsUserResDto::getId).toList());
+            }
+        }
+
         queryListReqDto.setAllEnt(allEnt);
         List<QueryListResDto> queryListResDtos = kwcContractLogisticsMapper.queryList(queryListReqDto);
         if (CollectionUtils.isEmpty(queryListResDtos)) {

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

@@ -41,7 +41,9 @@ import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.stream.enums.MessageEnum;
 import com.sckw.stream.model.UserInfo;
+import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.KwsUserResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import jakarta.servlet.http.HttpServletResponse;
@@ -88,6 +90,9 @@ public class KwcContractTradeService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    private RemoteUserService remoteUserService;
+
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private GoodsInfoService goodsInfoService;
 
@@ -156,6 +161,14 @@ public class KwcContractTradeService {
             }
         }
         queryListReqDto.setAllEnt(allEnt);
+
+        if (StringUtils.isNotBlank(reqVo.getKeywords())) {
+            List<KwsUserResDto> userByName = remoteUserService.getUserByName(reqVo.getKeywords());
+            if (CollectionUtils.isNotEmpty(userByName)) {
+                queryListReqDto.setInitiateList(userByName.stream().map(KwsUserResDto::getId).toList());
+            }
+        }
+
         List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryList(queryListReqDto);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
             return PageHelperUtil.getPageResult(new PageInfo<>());

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractLogisticsMapper.xml

@@ -67,11 +67,17 @@
           <if test="keywords != null and keywords != ''">
               and (b.firm_name like concat('%', #{keywords}, '%') or
                    e.firm_name like concat('%', #{keywords}, '%') or
-                   b.contacts like concat('%', #{keywords}, '%') or
                    b.phone like concat('%', #{keywords}, '%') or
                    b.sign_phone like concat('%', #{keywords}, '%') or
                    a.contract_no like concat('%', #{keywords}, '%') or
-                   a.name like concat('%', #{keywords}, '%'))
+                   a.name like concat('%', #{keywords}, '%')
+                   <if test="initiateList != null and initiateList.size() > 0">
+                       or a.create_by in
+                       <foreach collection="initiateList" item="item" open="(" close=")" separator=",">
+                           #{item}
+                       </foreach>
+                   </if>
+                   )
           </if>
           <if test="idList != null and idList.size() > 0">
               and a.id in

sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -62,11 +62,16 @@
         <if test="keywords != null and keywords != ''">
             and (b.firm_name like concat('%', #{keywords}, '%') or
                  e.firm_name like concat('%', #{keywords}, '%') or
-                 b.contacts like concat('%', #{keywords}, '%') or
                  b.phone like concat('%', #{keywords}, '%') or
                  b.sign_phone like concat('%', #{keywords}, '%') or
                  a.contract_no like concat('%', #{keywords}, '%') or
-                 a.name like concat('%', #{keywords}, '%'))
+                 a.name like concat('%', #{keywords}, '%')
+                 <if test="initiateList != null and initiateList.size() > 0">
+                     or a.create_by in
+                     <foreach collection="initiateList" item="item" open="(" close=")" separator=",">
+                         #{item}
+                     </foreach>
+                 </if> )
         </if>
         <if test="idList != null and idList.size() > 0">
             and a.id in

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/res/CooperateManageQueryResVo.java

@@ -113,4 +113,8 @@ public class CooperateManageQueryResVo implements Serializable {
      */
     private String approvalRemark;
 
+    /**
+     * 对方企业头像
+     */
+    private String head;
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -34,6 +34,7 @@ import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -192,15 +193,16 @@ public class CommonBusinessService {
         allEntIds.addAll(ourEntIds);
         Map<Long, UserCacheResDto> userCacheResDtoMap = remoteSystemService.queryUserCacheMapByIds(userIds);
         List<EntCacheResDto> entCacheResDtos = remoteSystemService.queryEntCacheByIds(allEntIds);
-        Map<Long, String> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<Long, EntCacheResDto> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (!CollectionUtils.isEmpty(entCacheResDtos)) {
-            entMap = entCacheResDtos.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (oldValue, newValue) -> newValue));
+            entMap = entCacheResDtos.stream().collect(Collectors.toMap(EntCacheResDto::getId, Function.identity()));
         }
 
         List<CooperateManageQueryResVo> result = new ArrayList<>();
         for (CooperateManageQueryResDto cooperateManageQueryResDto : list) {
             Long targetEntId = cooperateManageQueryResDto.getTargetEntId();
-            String targetEntName = entMap.get(targetEntId);
+            EntCacheResDto entCacheResDto = entMap.get(targetEntId);
+            EntCacheResDto entCacheResDto2 = entMap.get(cooperateManageQueryResDto.getOurEntId());
 
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
             cooperateManageQueryResVo.setId(String.valueOf(cooperateManageQueryResDto.getId()));
@@ -208,11 +210,12 @@ public class CommonBusinessService {
             cooperateManageQueryResVo.setStatus(cooperateManageQueryResDto.getStatus());
             cooperateManageQueryResVo.setApplyTypeCode(cooperateManageQueryResDto.getApplyTypeCode());
             cooperateManageQueryResVo.setCreateTime(cooperateManageQueryResDto.getCreateTime());
-            cooperateManageQueryResVo.setTargetEntName(targetEntName);
+            cooperateManageQueryResVo.setTargetEntName(Objects.nonNull(entCacheResDto) ? entCacheResDto.getFirmName() : "");
             cooperateManageQueryResVo.setTargetEntId(targetEntId);
             cooperateManageQueryResVo.setEntId(cooperateManageQueryResDto.getOurEntId());
-            cooperateManageQueryResVo.setEntName(entMap.get(cooperateManageQueryResDto.getOurEntId()));
+            cooperateManageQueryResVo.setEntName(Objects.nonNull(entCacheResDto2) ? entCacheResDto2.getFirmName() : "");
             cooperateManageQueryResVo.setApprovalRemark(cooperateManageQueryResDto.getApprovalRemark());
+            cooperateManageQueryResVo.setHead(Objects.nonNull(entCacheResDto) ? entCacheResDto.getHead() : "");
             UserCacheResDto userCacheResDto = userCacheResDtoMap.get(cooperateManageQueryResDto.getCreateBy());
             cooperateManageQueryResVo.setCreateByName(userCacheResDto.getName());
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -48,6 +48,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -121,15 +122,16 @@ public class KwmCooperateApplyService {
         allEntIds.addAll(targetEntIds);
         Map<Long, UserCacheResDto> userCacheResDtoMap = remoteSystemService.queryUserCacheMapByIds(userIds);
         List<EntCacheResDto> entCacheResDtos = remoteSystemService.queryEntCacheByIds(allEntIds);
-        Map<Long, String> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<Long, EntCacheResDto> entMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (!CollectionUtils.isEmpty(entCacheResDtos)) {
-            entMap = entCacheResDtos.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (oldValue, newValue) -> newValue));
+            entMap = entCacheResDtos.stream().collect(Collectors.toMap(EntCacheResDto::getId, Function.identity()));
         }
 
         List<CooperateManageQueryResVo> result = new ArrayList<>();
         for (CooperateManageQueryResDto cooperateManageQueryResDto : list) {
             Long targetEntId = cooperateManageQueryResDto.getTargetEntId();
-            String targetEntName = entMap.get(targetEntId);
+            EntCacheResDto entCacheResDto = entMap.get(targetEntId);
+            EntCacheResDto entCacheResDto2 = entMap.get(cooperateManageQueryResDto.getOurEntId());
 
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
             cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId() + "_" + cooperateManageQueryResDto.getStatus());
@@ -143,12 +145,12 @@ public class KwmCooperateApplyService {
             boolean isOur = entId.equals(entInfo.getId());
             cooperateManageQueryResVo.setApplyTypeCode(isOur ? Global.NUMERICAL_ONE : Global.NUMERICAL_TWO);
 
-            cooperateManageQueryResVo.setTargetEntName(targetEntName);
+            cooperateManageQueryResVo.setTargetEntName(Objects.nonNull(entCacheResDto) ? entCacheResDto.getFirmName() : "");
             cooperateManageQueryResVo.setTargetEntId(targetEntId);
             cooperateManageQueryResVo.setEntId(cooperateManageQueryResDto.getOurEntId());
-            cooperateManageQueryResVo.setEntName(entMap.get(cooperateManageQueryResDto.getOurEntId()));
+            cooperateManageQueryResVo.setEntName(Objects.nonNull(entCacheResDto2) ? entCacheResDto2.getFirmName() : "");
             cooperateManageQueryResVo.setApprovalRemark(cooperateManageQueryResDto.getApprovalRemark());
-
+            cooperateManageQueryResVo.setHead(Objects.nonNull(entCacheResDto) ? entCacheResDto.getHead() : "");
             //我方是发起方
             if (isOur) {
                 cooperateManageQueryResVo.setContacts(cooperateManageQueryResDto.getInviteeContacts());
@@ -157,7 +159,6 @@ public class KwmCooperateApplyService {
                 cooperateManageQueryResVo.setManager(cooperateManageQueryResDto.getInviterContacts());
                 cooperateManageQueryResVo.setManagerPhone(cooperateManageQueryResDto.getInviterPhone());
                 cooperateManageQueryResVo.setManagerId(cooperateManageQueryResDto.getInviterContactsId());
-
             } else {
                 cooperateManageQueryResVo.setContacts(cooperateManageQueryResDto.getInviterContacts());
                 cooperateManageQueryResVo.setPhone(cooperateManageQueryResDto.getInviterPhone());

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -276,8 +276,7 @@ public class KwsMenuService {
         //app菜单特殊处理
         List<KwsMenuResVo> finalList = new ArrayList<>();
         if (SystemTypeEnum.COMPANY.getCode().equals(LoginUserHolder.getSystemType()) &&
-                ClientTypeEnum.app.getValue().equals(LoginUserHolder.getClientType()) &&
-                Objects.equals(LoginUserHolder.getIsMain(), Global.NO)) {
+                ClientTypeEnum.app.getValue().equals(LoginUserHolder.getClientType())) {
             List<KwsMenuMapping> kwsMenuMappings = kwsMenuMappingDao.selectByMenuIds(menuList.stream().map(KwsMenuResVo::getId).toList());
             if (CollectionUtils.isEmpty(kwsMenuMappings)) {
                 return Collections.emptyList();
@@ -288,7 +287,6 @@ public class KwsMenuService {
             if (CollectionUtils.isEmpty(kwsMenus)) {
                 return Collections.emptyList();
             }
-
             finalList = BeanUtils.copyToList(kwsMenus, KwsMenuResVo.class);
         } else {
             finalList = menuList;
@@ -326,10 +324,8 @@ public class KwsMenuService {
             return;
         }
 
-
         //特殊处理，后面会做菜单关联
         findMenuTreePojo.setClientType(clientType.equals(String.valueOf(Global.NUMERICAL_THREE)) ? Integer.valueOf(String.valueOf(Global.NUMERICAL_TWO)) : Integer.valueOf(clientType));
-
         if (Objects.equals(LoginUserHolder.getIsMain(), Global.YES)) {
             Long entId = LoginUserHolder.getEntId();
             List<KwsEntType> listByEntId = kwsEntTypeDao.findListByEntId(entId);