Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

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

@@ -753,7 +753,7 @@ public class KwcContractLogisticsService {
         queryListReqDto.setAllEnt(allEnt);
         List<QueryListResDto> queryListResDtos = kwcContractLogisticsMapper.queryList(queryListReqDto);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
 
         List<QueryListResVo> list = getQueryListResVos(queryListResDtos);
@@ -945,7 +945,7 @@ public class KwcContractLogisticsService {
         reqVo.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Global.COMMA, Long.class));
         List<QueryListResDto> queryListResDtos = kwcContractLogisticsMapper.queryLogisticsList(reqVo);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         List<QueryListResVo> list = getLogisticsResVo(queryListResDtos);
         List<LogisticsListExport> dataList = BeanUtils.copyToList(list, LogisticsListExport.class);

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

@@ -756,7 +756,7 @@ public class KwcContractTradeService {
         queryListReqDto.setAllEnt(allEnt);
         List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryList(queryListReqDto);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
 
         List<QueryListResVo> list = getQueryListResVos(queryListResDtos);
@@ -946,7 +946,7 @@ public class KwcContractTradeService {
         reqVo.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Global.COMMA, Long.class));
         List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryTradeList(reqVo);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         List<QueryListResVo> list = getTradeListResVo(queryListResDtos);
         List<TradeListExport> dataList = BeanUtils.copyToList(list, TradeListExport.class);

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfTruckReportDto.java

@@ -19,14 +19,14 @@ public class KwfTruckReportDto {
      * 车牌号
      */
     @NotBlank(message = "车牌号不能为空!")
-    @Size(max=7, message = "车牌号长度不能大于7个字符！")
+    @Size(max=8, message = "车牌号长度不能大于8个字符！")
     private String truckNo;
 
     /**
      * 司机名称
      */
     @NotBlank(message = "司机姓名不能为空!")
-    @Size(max=10, message = "司机姓名长度不能大于10个字符！")
+    @Size(max=25, message = "司机姓名长度不能大于25个字符！")
     private String name;
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -638,7 +638,7 @@ public class KwfTruckReportService {
         /**数据校验**/
         //车牌号-非空/长度为7
         String truckNo = strArray[0];
-        if (StringUtils.isBlank(truckNo) || truckNo.trim().length() != 7) {
+        if (StringUtils.isBlank(truckNo) || (truckNo.trim().length() != 7 && truckNo.trim().length() != 8)) {
             msg.append("车牌号格式不正确！");
         }
 

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

@@ -54,6 +54,6 @@ public class AddressQueryReqVo extends PageRequest implements Serializable {
     /**
      * 主键
      */
-    private List<Long> ids;
+    private String ids;
 
 }

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

@@ -47,9 +47,14 @@ public class CooperateApplyQueryReqVo extends PageRequest implements Serializabl
     private Date endTime;
 
     /**
-     * ids id集合
+     * ids
      */
-    private List<Long> ids;
+    private String ids;
+
+    /**
+     * idList
+     */
+    private List<Long> idList;
 
     /**
      * 状态 0 审核中  3 已驳回  4 已撤销

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

@@ -42,9 +42,9 @@ public class CooperateManageQueryReqVo extends PageRequest implements Serializab
     private Date endTime;
 
     /**
-     * id集合
+     * id
      */
-    private List<Long> ids;
+    private String ids;
 
     /**
      * 状态

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

@@ -111,8 +111,9 @@ public class KwmAddressService {
             wrapper.lt(KwmAddress::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
         }
 
-        if (CollectionUtils.isNotEmpty(reqVo.getIds())) {
-            wrapper.in(KwmAddress::getId, reqVo.getIds());
+        if (StringUtils.isNotBlank(reqVo.getIds())) {
+            wrapper.in(KwmAddress::getId, StringUtils.splitStrToList(reqVo.getIds(), Long.class));
+
         }
 
         if (!Objects.equals(LoginUserHolder.getSystemType(), SystemTypeEnum.MANAGE.getCode())) {
@@ -380,7 +381,7 @@ public class KwmAddressService {
     public void export(AddressQueryReqVo reqVo, HttpServletResponse response) {
         List<KwmAddress> kwmAddressList = findList(reqVo);
         if (CollectionUtils.isEmpty(kwmAddressList)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         List<AddressQueryResVo> list = getAddressQueryResVo(kwmAddressList);
         ExcelUtil.downData(response, AddressQueryExport.class, BeanUtils.copyToList(list, AddressQueryExport.class));

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

@@ -188,9 +188,8 @@ public class KwmCooperateApplyService {
             cooperateManageQueryReqDto.setCooperateTypes(Arrays.asList(cooperateTypes.split(Global.COMMA)));
         }
 
-        List<Long> ids = reqVo.getIds();
-        if (!CollectionUtils.isEmpty(ids)) {
-            cooperateManageQueryReqDto.setIds(ids);
+        if (StringUtils.isNotBlank(reqVo.getIds())) {
+            cooperateManageQueryReqDto.setIds(StringUtils.splitStrToList(reqVo.getIds(), Long.class));
         }
         //只允许查出申请中、已拒绝、已撤销的记录
         List<Integer> status = new ArrayList<>();
@@ -211,7 +210,6 @@ public class KwmCooperateApplyService {
         }
         cooperateManageQueryReqDto.setStatus(status);
 
-
         Long entId = LoginUserHolder.getEntId();
         cooperateManageQueryReqDto.setCurrentEntId(entId);
         List<Long> currentEntIdList = new ArrayList<>();
@@ -619,7 +617,7 @@ public class KwmCooperateApplyService {
         CooperateManageQueryReqDto reqDto = buildQueryParam(reqVo);
         List<CooperateManageQueryResDto> list = kwmCooperateMapper.findList(reqDto);
         if (CollectionUtils.isEmpty(list)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
 
         List<CooperateManageQueryResVo> cooperateManageQueryResVos = getCooperateManageQueryResVos(list);

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

@@ -145,9 +145,8 @@ public class KwmCooperateManageService {
         }
         cooperateManageQueryReqDto.setStatus(status);
 
-        List<Long> ids = reqVo.getIds();
-        if (!CollectionUtils.isEmpty(ids)) {
-            cooperateManageQueryReqDto.setIds(ids);
+        if (StringUtils.isNotBlank(reqVo.getIds())) {
+            cooperateManageQueryReqDto.setIds(StringUtils.splitStrToList(reqVo.getIds(), Long.class));
         }
 
 
@@ -371,7 +370,7 @@ public class KwmCooperateManageService {
         CooperateManageQueryReqDto reqDto = buildQueryParam(reqVo);
         List<CooperateManageQueryResDto> list = kwmCooperateMapper.findManageList(reqDto);
         if (CollectionUtils.isEmpty(list)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         List<CooperateManageQueryResVo> cooperateManageQueryResVos = commonBusinessService.getCooperateManageQueryResVos(list);
         List<CooperateManageExport> result = new ArrayList<>();
@@ -760,6 +759,7 @@ public class KwmCooperateManageService {
                 queryAllCooperateInfoReqDto.setQueryEntIdList(entCacheResDtos.stream().map(EntCacheResDto::getId).toList());
             }
         }
+        queryAllCooperateInfoReqDto.setIds(StringUtils.splitStrToList(reqVo.getIds(), Long.class));
         return queryAllCooperateInfoReqDto;
     }
 
@@ -818,11 +818,11 @@ public class KwmCooperateManageService {
     public void exportAllCooperateInfo(CooperateManageQueryReqVo reqVo, HttpServletResponse response) {
         List<CooperateManageQueryResDto> list = kwmCooperateMapper.queryAllCooperateInfoList(getQueryAllCooperateInfoReqDto(reqVo));
         if (CollectionUtils.isEmpty(list)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         List<QueryAllCooperateInfoResVo> allCooperateInfoVo = getAllCooperateInfoVo(list);
         if (CollectionUtils.isEmpty(allCooperateInfoVo)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         List<QueryAllCooperateInfoExcel> queryAllCooperateInfoExcels = BeanUtils.copyToList(allCooperateInfoVo, QueryAllCooperateInfoExcel.class);
         ExcelUtil.downData(response, QueryAllCooperateInfoExcel.class, queryAllCooperateInfoExcels);

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/report/KwsRoleExcel.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.sckw.core.utils.LongToStringUtils;
+import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 
 import java.io.Serial;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @date 2023/9/14
  */
 @Data
+@ExcelContext(fileName = "岗位权限", sheetName = "岗位权限")
 public class KwsRoleExcel implements Serializable {
 
     @Serial

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/report/KwsUserExcel.java

@@ -2,6 +2,7 @@ package com.sckw.system.model.report;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.excel.annotation.ExcelContext;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,6 +15,7 @@ import java.util.Date;
  * @date 2023/9/14
  */
 @Data
+@ExcelContext(fileName = "员工账号", sheetName = "员工账号")
 public class KwsUserExcel implements Serializable {
 
     @Serial

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntFindPageReqVo.java

@@ -98,7 +98,7 @@ public class EntFindPageReqVo extends PageRequest implements Serializable {
     /**
      * 企业id
      */
-    private List<Long> ids;
+    private String ids;
 
     /**
      * 查企业客户

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

@@ -270,7 +270,7 @@ public class KwsEnterpriseService {
     public List<FindEntListPojo> findPojo(EntFindPageReqVo reqVo) {
         FindPojoParam findPojoParam = new FindPojoParam();
         BeanUtils.copyProperties(reqVo, findPojoParam);
-        findPojoParam.setIdList(reqVo.getIds());
+        findPojoParam.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Long.class));
         if (StringUtils.isNotBlank(reqVo.getEntTypes())) {
             findPojoParam.setTypeList(Arrays.stream(reqVo.getEntTypes().split(Global.COMMA)).map(Integer::parseInt).toList());
         }
@@ -1185,7 +1185,7 @@ public class KwsEnterpriseService {
         List<EntFindPageResVo> result = new ArrayList<>();
 
         if (CollectionUtils.isEmpty(list)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
 
         for (FindEntListPojo item : list) {

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

@@ -473,9 +473,13 @@ public class KwsRoleService {
         FindManagePojo manageInfoByEntId = kwsEnterpriseDao.findManageInfoByEntId(LoginUserHolder.getEntId());
         params.put("entId", LoginUserHolder.getEntId());
         params.put("manageRoleId", manageInfoByEntId.getRoleId());
+        String ids = StringUtils.valueOf(params.get("ids"));
+        if (StringUtils.isNotBlank(ids)) {
+            params.put("idList", StringUtils.splitStrToList(ids, Long.class));
+        }
         List<RoleResVo> roleResVos = kwsRoleDao.findPage(params);
         if (CollectionUtils.isEmpty(roleResVos)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
         ExcelUtil.downData(response, KwsRoleExcel.class, BeanUtils.copyToList(roleResVos, KwsRoleExcel.class));
     }

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

@@ -648,10 +648,14 @@ public class KwsUserService {
 
 
     public void export(HashMap params, HttpServletResponse response) {
+        params.put("entId", LoginUserHolder.getEntId());
+        String ids = StringUtils.valueOf(params.get("ids"));
+        if (StringUtils.isNotBlank(ids)) {
+            params.put("idList", StringUtils.splitStrToList(ids, Long.class));
+        }
         List<KwsUserResVo> list = kwsUserDao.findPage(params);
-
         if (CollectionUtils.isEmpty(list)) {
-            throw new SystemException("导出数据为空");
+            throw new SystemException(HttpStatus.SUCCESS_CODE, "暂无数据，请确认！");
         }
 
         List<KwsUserExcel> result = new ArrayList<>();

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

@@ -161,8 +161,9 @@
     <if test="endTime != null and endTime != ''" >
       and sr.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY)
     </if>
-    <if test="ids != null and ids.size() > 0">
-      <foreach collection="ids" item="item" open="(" close=")" separator=",">
+    <if test="idList != null and idList.size() > 0">
+        and sr.id in
+      <foreach collection="idList" item="item" open="(" close=")" separator=",">
         #{item}
       </foreach>
     </if>

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

@@ -240,9 +240,9 @@
     <if test="systemType != null and systemType != ''">
       and su.system_type = #{systemType, jdbcType=VARCHAR}
     </if>
-    <if test="ids != null and ids.size() > 0">
+    <if test="idList != null and idList.size() > 0">
       and su.id in
-      <foreach collection="ids" item="item" open="(" close=")" separator=",">
+      <foreach collection="idList" item="item" open="(" close=")" separator=",">
         #{item}
       </foreach>
     </if>