bugfix

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

@@ -24,8 +24,7 @@ public class CooperateManageQueryResVo implements Serializable {
     /**
      * 主键
      */
-    @JsonSerialize(using = LongToStringUtils.class)
-    private Long id;
+    private String id;
 
     /**
      * 合作属性 1供应单位 2采购单位 3托运单位 4承运单位 多个用","隔开单位名称

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

@@ -203,7 +203,7 @@ public class CommonBusinessService {
             String targetEntName = entMap.get(targetEntId);
 
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
-            cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId());
+            cooperateManageQueryResVo.setId(String.valueOf(cooperateManageQueryResDto.getId()));
             cooperateManageQueryResVo.setRemark(cooperateManageQueryResDto.getRemark());
             cooperateManageQueryResVo.setStatus(cooperateManageQueryResDto.getStatus());
             cooperateManageQueryResVo.setApplyTypeCode(cooperateManageQueryResDto.getApplyTypeCode());

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

@@ -129,7 +129,7 @@ public class KwmCooperateApplyService {
             String targetEntName = entMap.get(targetEntId);
 
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
-            cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId());
+            cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId() + "_" + cooperateManageQueryResDto.getStatus());
             cooperateManageQueryResVo.setCreateTime(cooperateManageQueryResDto.getCreateTime());
             cooperateManageQueryResVo.setRemark(cooperateManageQueryResDto.getRemark());
             cooperateManageQueryResVo.setStatus(cooperateManageQueryResDto.getStatus());
@@ -364,6 +364,13 @@ public class KwmCooperateApplyService {
             if (kwmCooperateMapper.insert(kwmCooperate) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
             }
+        } else {
+            KwmCooperate kwmCooperate = kwmCooperateMapper.selectById(id);
+            if (Objects.nonNull(kwmCooperate)) {
+                kwmCooperate.setUpdateBy(LoginUserHolder.getUserId());
+                kwmCooperate.setUpdateTime(date);
+                kwmCooperateMapper.updateById(kwmCooperate);
+            }
         }
 
         KwmCooperate kwmCooperate = kwmCooperateMapper.selectById(id);
@@ -508,7 +515,7 @@ public class KwmCooperateApplyService {
      */
     @Transactional(rollbackFor = {})
     public void updateCooperateInfo(String ids, Integer type, String remark) {
-        List<Long> idList = Arrays.stream(ids.split(Global.COMMA)).map(Long::parseLong).toList();
+        List<Long> idList = Arrays.stream(ids.split(Global.COMMA)).map(item -> item.contains("_") ? item.substring(0, item.indexOf("_")) : item).map(Long::parseLong).toList();
         LambdaQueryWrapper<KwmCooperate> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwmCooperate::getDelFlag, Global.NO);
         wrapper.in(KwmCooperate::getId, idList);
@@ -571,6 +578,7 @@ public class KwmCooperateApplyService {
     public void approve(CooperateApproveReqVo reqVo) {
         updateCooperateInfo(reqVo.getIds(), reqVo.getApprove(), reqVo.getRemark());
         for (String id : reqVo.getIds().split(Global.COMMA)) {
+            id = id.contains("_") ? id.substring(0, id.indexOf("_")) : id;
             if (reqVo.getApprove().equals(CooperateStatusEnum.OK.getCode())) {
                 commonBusinessService.bingManager(reqVo.getManager(), Long.parseLong(id));
                 passMessage(id);

sckw-modules/sckw-manage/src/main/resources/mapper/KwmCooperateMapper.xml

@@ -107,7 +107,7 @@
              </foreach>
          </if>
         group by a.id, b.status
-        order by a.create_time desc
+        order by a.update_time desc
     </select>
 
     <select id="findCooperateByEnt" resultType="com.sckw.manage.model.entity.KwmCooperate">
@@ -238,7 +238,7 @@
             </foreach>
         </if>
         group by a.id
-        order by a.create_time desc
+        order by a.update_time desc
     </select>
 
     <select id="findEntCooperate" resultType="com.sckw.manage.model.entity.KwmCooperate">

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

@@ -326,6 +326,10 @@ 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);
@@ -347,8 +351,6 @@ public class KwsMenuService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ROLE_NOT_EXISTS);
         }
 
-        //特殊处理，员工账号先查pc端的菜单，后面会做菜单关联
-        findMenuTreePojo.setClientType(Integer.valueOf(clientType));
         findMenuTreePojo.setRoleIds(allByUserId.stream().map(KwsUserRole::getRoleId).toList());
     }