bugfix

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -98,6 +98,13 @@ public class LoginFilter implements Filter {
         //将redis里的用户信息存入内存中，避免业务操作多次从redis获取值*/
         LoginUserInfo loginUserInfo = JSONObject.parseObject(userInfo, LoginUserInfo.class);
         LoginUserHolder.set(loginUserInfo);
+        //暂时这样写一下，有的接口需要给LoginUserHolder赋值
+        if ("/kwsMenu/findMenuTree".equals(requestUri) || "/kwsDept/findDeptTree".equals(requestUri)) {
+            RedissonUtils.putString(Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType), JSON.toJSONString(loginUserInfo), Global.PC_TOKEN_EXPIRE);
+            filterChain.doFilter(servletRequest, servletResponse);
+            LoginUserHolder.remove();
+            return;
+        }
 
         /*3、平台管理员直接放行*/
         if (loginUserInfo.getIsMain() == Global.YES && Integer.parseInt(systemType) == SystemTypeEnum.MANAGE.getCode()) {
@@ -107,6 +114,7 @@ public class LoginFilter implements Filter {
             return;
         }
 
+
         //管理员不限制权限，按钮有权限才放行
         if (loginUserInfo.getIsMain() != Global.YES && !checkMenu(systemType + Global.COLON + key, requestUri)) {
             LoginUserHolder.remove();

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/SigningWayEnum.java

@@ -11,9 +11,9 @@ import lombok.Getter;
 public enum SigningWayEnum {
 
     //线上签约
-    ONLINE(1, "1"),
+    ONLINE(1, "线上签约"),
     //线下签约
-    OFFLINE(2, "2");
+    OFFLINE(2, "线下签约");
 
     private final int code;
 

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

@@ -61,4 +61,18 @@ public class KwcCarrierController {
         reqVo.setEntType(EntTypeEnum.LOGISTICS4.getCode());
         kwcContractLogisticsService.export(reqVo);
     }
+
+
+    /**
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/18
+     */
+    @PostMapping("findListGroup")
+    public HttpResult findListGroup(@RequestBody QueryListReqVo reqVo) throws SystemException {
+        reqVo.setEntType(EntTypeEnum.LOGISTICS4.getCode());
+        return HttpResult.ok(kwcContractLogisticsService.findListGroup(reqVo));
+    }
+
 }

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

@@ -154,4 +154,16 @@ public class KwcContractSaleController {
     public HttpResult queryCurrentEntSaleContractList() throws SystemException {
         return HttpResult.ok(kwcContractTradeService.queryCurrentEntSaleContractList());
     }
+
+    /**
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/18
+     */
+    @PostMapping("findListGroup")
+    public HttpResult findListGroup(@RequestBody QueryListReqVo reqVo) throws SystemException {
+        reqVo.setEntType(EntTypeEnum.SUPPLIER.getCode());
+        return HttpResult.ok(kwcContractTradeService.findListGroup(reqVo));
+    }
 }

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

@@ -63,4 +63,16 @@ public class KwcPurchaseController {
         kwcContractTradeService.export(reqVo);
     }
 
+    /**
+     * @return HttpResult
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/18
+     */
+    @PostMapping("findListGroup")
+    public HttpResult findListGroup(@RequestBody QueryListReqVo reqVo) throws SystemException {
+        reqVo.setEntType(EntTypeEnum.PURCHASER.getCode());
+        return HttpResult.ok(kwcContractTradeService.findListGroup(reqVo));
+    }
+
 }

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

@@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.sckw.system.api.RemoteSystemService;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.sckw.contract.dao.KwcContractTradeMapper;
 
@@ -404,6 +405,12 @@ public class KwcContractTradeService {
         });
     }
 
+    /**
+     * @desc: 导出
+     * @param reqVo 查询入参
+     * @author: czh
+     * @date 2023/7/17
+     */
     public void export(QueryListReqVo reqVo) {
         QueryListReqDto queryListReqDto = new QueryListReqDto();
         BeanUtils.copyProperties(reqVo, queryListReqDto);
@@ -444,6 +451,43 @@ public class KwcContractTradeService {
         }
         return getQueryListResVos(queryListResDtos);
     }
+
+
+    /**
+     * @return FindListGroupResVo
+     * @desc: 分组查询
+     * @author: czh
+     * @date: 2023/7/18
+     */
+    public List<FindListGroupResVo> findListGroup(QueryListReqVo reqVo) {
+        ContractStatusEnum[] values = ContractStatusEnum.values();
+        List<FindListGroupResVo> list = new ArrayList<>();
+        FindListGroupResVo total = new FindListGroupResVo();
+        total.setCount(0);
+        list.add(total);
+        for (ContractStatusEnum contractStatusEnum : values) {
+            FindListGroupResVo findListGroupResVo = new FindListGroupResVo();
+            findListGroupResVo.setStatus(contractStatusEnum.getCode());
+            findListGroupResVo.setStatusName(contractStatusEnum.getName());
+            findListGroupResVo.setCount(0);
+            list.add(findListGroupResVo);
+        }
+
+        QueryListReqDto queryListReqDto = new QueryListReqDto();
+        BeanUtils.copyProperties(reqVo, queryListReqDto);
+        queryListReqDto.setEntId(LoginUserHolder.getEntId());
+        List<QueryListResDto> queryListResDtoList = kwcContractTradeMapper.queryList(queryListReqDto);
+        if (CollectionUtils.isNotEmpty(queryListResDtoList)) {
+            Map<Integer, List<QueryListResDto>> collect = queryListResDtoList.stream().collect(Collectors.groupingBy(QueryListResDto::getStatus));
+            for (FindListGroupResVo findListGroupResVo : list) {
+                List<QueryListResDto> queryListResDtos = collect.get(findListGroupResVo.getStatus());
+                findListGroupResVo.setCount(CollectionUtils.isEmpty(queryListResDtos) ? Global.NUMERICAL_ZERO : queryListResDtos.size());
+            }
+            //给汇总项求和
+            list.get(0).setCount(queryListResDtoList.size());
+        }
+        return list;
+    }
 }
 
 

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

@@ -72,7 +72,7 @@
               and a.create_time >= #{startTime}
           </if>
           <if test="endTime != null">
-              and a.create_time &lt;= #{endTime}
+              and a.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY)
           </if>
           <if test="status != null">
               and a.status = #{status}

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/controller/KwmCooperateApplyController.java

@@ -61,7 +61,7 @@ public class KwmCooperateApplyController {
      */
     @PostMapping("/cancel")
     public HttpResult cancel(@Valid @RequestBody IdsReqVo reqVo) throws SystemException {
-        kwmCooperateApplyService.cancel(reqVo.getIds());
+        kwmCooperateApplyService.cancel(reqVo);
         return HttpResult.ok(HttpStatus.MSG_018);
     }
 

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/dto/res/CooperateManageQueryResDto.java

@@ -97,4 +97,9 @@ public class CooperateManageQueryResDto {
      */
     private Integer status;
 
+    /**
+     * 操作备注
+     */
+    private String approvalRemark;
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/entity/KwmCooperate.java

@@ -58,4 +58,9 @@ public class KwmCooperate extends BaseModel {
      */
     private String inviteePhone;
 
+    /**
+     * 操作备注
+     */
+    private String approvalRemark;
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/IdsReqVo.java

@@ -24,4 +24,9 @@ public class IdsReqVo implements Serializable {
     private String ids;
 
     private Long id;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

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

@@ -96,4 +96,9 @@ public class CooperateManageQueryResVo implements Serializable {
      */
     private Integer applyTypeCode;
 
+    /**
+     * 操作备注
+     */
+    private String approvalRemark;
+
 }

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

@@ -179,6 +179,7 @@ public class CommonBusinessService {
             cooperateManageQueryResVo.setCreateByName(userMap.get(cooperateManageQueryResDto.getCreateBy()));
             cooperateManageQueryResVo.setEntName(targetEntName);
             cooperateManageQueryResVo.setEntId(targetEntId);
+            cooperateManageQueryResVo.setApprovalRemark(cooperateManageQueryResDto.getApprovalRemark());
 
             //我方是发起方
             if (entId.compareTo(cooperateManageQueryResDto.getInviterEntId()) == 0) {

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

@@ -2,6 +2,8 @@ package com.sckw.manage.service;
 
 import java.io.IOException;
 import java.util.*;
+
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -74,7 +76,7 @@ public class KwmAddressService {
                 eq(Objects.nonNull(reqVo.getType()), KwmAddress::getType, reqVo.getType()).
                 eq(KwmAddress::getDelFlag, Global.NO).
                 ge(Objects.nonNull(reqVo.getStartTime()), KwmAddress::getCreateTime, reqVo.getStartTime()).
-                le(Objects.nonNull(reqVo.getEndTime()), KwmAddress::getCreateTime, reqVo.getEndTime()).
+                lt(Objects.nonNull(reqVo.getEndTime()), KwmAddress::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1)).
                 and(StringUtils.isNotBlank(reqVo.getKeywords()),
                         wq -> wq.like(KwmAddress::getDetailAddress, reqVo.getKeywords()).or().
                                 like(KwmAddress::getCityName, reqVo.getKeywords()));

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

@@ -25,6 +25,7 @@ import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.entity.KwmCooperateType;
 import com.sckw.manage.model.vo.req.CooperateApplyQueryReqVo;
 import com.sckw.manage.model.vo.req.CooperateApproveReqVo;
+import com.sckw.manage.model.vo.req.IdsReqVo;
 import com.sckw.manage.model.vo.req.InitiateReqVo;
 import com.sckw.manage.model.vo.res.CooperateManageQueryResVo;
 import com.sckw.manage.model.vo.res.FindListGroupResVo;
@@ -268,13 +269,13 @@ public class KwmCooperateApplyService {
 
 
     /**
-     * @param ids 主键
+     * @param reqVo 主键
      * @desc: 撤销
      * @author: czh
      * @date: 2023/7/11
      */
-    public void cancel(String ids) {
-        updateCooperateInfo(ids, CooperateStatusEnum.CANCEL.getCode(), "");
+    public void cancel(IdsReqVo reqVo) {
+        updateCooperateInfo(reqVo.getIds(), CooperateStatusEnum.CANCEL.getCode(), reqVo.getRemark());
     }
 
 
@@ -304,7 +305,7 @@ public class KwmCooperateApplyService {
             item.setStatus(type);
             item.setUpdateBy(userId);
             item.setUpdateTime(date);
-            item.setRemark(remark);
+            item.setApprovalRemark(remark);
             if (kwmCooperateMapper.updateById(item) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
             }

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

@@ -47,6 +47,7 @@
                min(a.create_by) createBy,
                min(a.remark) remark,
                min(a.status) status,
+               min(a.approval_remark) approvalRemark,
                case when min(a.ent_id) = min(a.invitee_ent_id) then min(a.inviter_ent_id) else min(a.invitee_ent_id) end targetEntId,
                case when min(a.ent_id) = #{reqDto.currentEntId} then 1 else 2 end applyTypeCode
           FROM kwm_cooperate a
@@ -57,7 +58,7 @@
                and a.create_time >= #{reqDto.startTime}
            </if>
            <if test="reqDto.endTime != null">
-               and a.create_time &lt;= #{reqDto.endTime}
+               and a.create_time &lt; date_add(#{reqDto.endTime}, INTERVAL 1 DAY)
            </if>
            <if test="reqDto.applyTypeCode != null and reqDto.applyTypeCode == 1">
                and a.ent_id = #{reqDto.currentEntId}

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsUserDao.java

@@ -5,6 +5,8 @@ import com.sckw.system.model.KwsUser;
 import com.sckw.system.model.KwsUserDept;
 import com.sckw.system.model.vo.res.KwsUserResVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -81,6 +83,6 @@ public interface KwsUserDao {
      * @author: czh
      * @date: 2023/7/21
      */
-    List<KwsUser> selectByRoleIds(List<Long> roleIdList);
+    List<KwsUser> selectByRoleIds(@Param(value = "roleIdList") List<Long> roleIdList);
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/QueryCurrentOrganizationResVo.java

@@ -31,4 +31,9 @@ public class QueryCurrentOrganizationResVo implements Serializable {
      */
     private Long pId;
 
+    /**
+     * 企业属性
+     */
+    private String entTypes;
+
 }

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

@@ -696,22 +696,32 @@ public class KwsEnterpriseService {
         list.add(queryCurrentOrganizationResVo);
 
         List<KwsEntDept> kwsEntDepts = kwsEntDeptDao.selectByEntPid(entId);
-        if (CollectionUtils.isEmpty(kwsEntDepts)) {
-            return list;
+        if (CollectionUtils.isNotEmpty(kwsEntDepts)) {
+            List<Long> entIdList = kwsEntDepts.stream().map(KwsEntDept::getEntId).toList();
+            Map<Long, EntCacheResDto> entCacheResDtoMap = remoteSystemService.queryEntCacheMapByIds(entIdList);
+            for (KwsEntDept kwsEntDept : kwsEntDepts) {
+                EntCacheResDto entCacheResDto1 = entCacheResDtoMap.get(kwsEntDept.getEntId());
+                if (Objects.nonNull(entCacheResDto1)) {
+                    QueryCurrentOrganizationResVo queryCurrentOrganizationResVo1 = new QueryCurrentOrganizationResVo();
+                    queryCurrentOrganizationResVo1.setEntId(entCacheResDto1.getId());
+                    queryCurrentOrganizationResVo1.setEntName(entCacheResDto1.getFirmName());
+                    queryCurrentOrganizationResVo1.setPId(kwsEntDept.getEntPid());
+                    list.add(queryCurrentOrganizationResVo1);
+                }
+            }
         }
 
-        List<Long> entIdList = kwsEntDepts.stream().map(KwsEntDept::getEntId).toList();
-        Map<Long, EntCacheResDto> entCacheResDtoMap = remoteSystemService.queryEntCacheMapByIds(entIdList);
-        for (KwsEntDept kwsEntDept : kwsEntDepts) {
-            EntCacheResDto entCacheResDto1 = entCacheResDtoMap.get(kwsEntDept.getEntId());
-            if (Objects.isNull(entCacheResDto1)) {
-                continue;
+        //填充企业属性
+        List<Long> entIds = list.stream().map(QueryCurrentOrganizationResVo::getEntId).toList();
+        List<KwsEntType> listByEntIds = kwsEntTypeDao.findListByEntIds(entIds);
+        if (CollectionUtils.isNotEmpty(listByEntIds)) {
+            Map<Long, List<KwsEntType>> collect = listByEntIds.stream().collect(Collectors.groupingBy(KwsEntType::getEntId));
+            for (QueryCurrentOrganizationResVo queryCurrentOrganizationResVo1 : list) {
+                List<KwsEntType> kwsEntTypes = collect.get(queryCurrentOrganizationResVo1.getEntId());
+                if (CollectionUtils.isNotEmpty(kwsEntTypes)) {
+                    queryCurrentOrganizationResVo1.setEntTypes(String.join(Global.COMMA, kwsEntTypes.stream().map(KwsEntType::getType).map(String::valueOf).distinct().toList()));
+                }
             }
-            QueryCurrentOrganizationResVo queryCurrentOrganizationResVo1 = new QueryCurrentOrganizationResVo();
-            queryCurrentOrganizationResVo1.setEntId(entCacheResDto1.getId());
-            queryCurrentOrganizationResVo1.setEntName(entCacheResDto1.getFirmName());
-            queryCurrentOrganizationResVo1.setPId(kwsEntDept.getEntPid());
-            list.add(queryCurrentOrganizationResVo1);
         }
 
         return list;

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

@@ -24,6 +24,7 @@ import com.sckw.system.model.vo.res.FindMenuTreeResVo;
 import com.sckw.system.model.vo.res.KwsMenuResVo;
 import com.sckw.system.model.vo.res.MenuDetailResVo;
 import com.sckw.system.model.vo.res.QueryChildMenuResVo;
+import org.apache.zookeeper.Login;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -265,6 +266,10 @@ public class KwsMenuService {
         if (Objects.equals(LoginUserHolder.getIsMain(), Global.YES)) {
             return;
         }
+
+        if (Objects.isNull(userId)) {
+            userId = LoginUserHolder.getUserId();
+        }
         KwsUser kwsUser = kwsUserDao.selectByKey(userId);
         if (Objects.isNull(kwsUser)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);

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

@@ -236,17 +236,49 @@ public class KwsRoleService {
      */
     @Transactional(rollbackFor = {})
     public void update(EditRoleReqVo reqVo) throws SystemException {
-
         KwsRole kwsRole = kwsRoleDao.selectByKey(reqVo.getId());
         if (Objects.isNull(kwsRole)) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
 
-        //删除以前的角色
-        deleteRole(Collections.singletonList(kwsRole));
+        List<KwsMenuRights> kwsMenuRightsList = kwsMenuRightsDao.selectByRoleIds(Collections.singletonList(kwsRole.getId()));
+        if (CollectionUtils.isNotEmpty(kwsMenuRightsList)) {
+            for (KwsMenuRights kwsMenuRights : kwsMenuRightsList) {
+                kwsMenuRights.setDelFlag(Global.YES);
+                if (kwsMenuRightsDao.update(kwsMenuRights) <= 0) {
+                    throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+                }
+            }
+        }
+
+        KwsDept kwsDept = kwsDeptDao.selectByKey(kwsRole.getDeptId());
 
-        //新增
-        add(reqVo);
+        RoleBindMenuReqVo roleBindMenuReqVo = new RoleBindMenuReqVo();
+        roleBindMenuReqVo.setRoleId(kwsRole.getId());
+        roleBindMenuReqVo.setEntId(kwsDept.getEntId());
+        roleBindMenuReqVo.setMenuIds(reqVo.getMenuIds());
+        kwsMenuService.roleBindMenu(roleBindMenuReqVo);
+//        List<KwsUser> kwsUsers = kwsUserDao.selectByRoleIds(Collections.singletonList(reqVo.getId()));
+//
+//        //删除以前的角色
+//        deleteRole(Collections.singletonList(kwsRole));
+//
+//        //新增
+//        add(reqVo);
+//
+//        //重新绑定以前的员工
+//        if (CollectionUtils.isEmpty(kwsUsers)) {
+//            return;
+//        }
+
+//        for (KwsUser kwsUser : kwsUsers) {
+//            UserBindRoleReqVo userBindRoleReqVo = new UserBindRoleReqVo();
+//            userBindRoleReqVo.setUserId(kwsUser.getId());
+//            userBindRoleReqVo.setRoleIds(String.valueOf(reqVo.getId()));
+//            userBindRoleReqVo.setSystemType(LoginUserHolder.getSystemType());
+//            userBindRoleReqVo.setRemark("");
+//            userBindRole(userBindRoleReqVo);
+//        }
     }
 
     /**

sckw-modules/sckw-system/src/main/resources/mapper/KwsEntCheckTrackDao.xml

@@ -109,6 +109,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
+
     <select id="findList" resultType="com.sckw.system.model.KwsEntCheckTrack">
       select * from kws_ent_check_track where ent_id = #{entId} order by create_time
     </select>

sckw-modules/sckw-system/src/main/resources/mapper/KwsUserDao.xml

@@ -256,7 +256,7 @@
       and su.create_time >= #{startTime}
     </if>
     <if test="endTime != null and endTime != ''">
-      and su.create_time &lt;= #{endTime}
+      and su.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY))
     </if>
     ORDER BY su.create_time desc
   </select>