Merge branch 'master' of http://101.36.160.140:21044/delivery-warehouse-java/delivery-depot-admin into liuj_pc_dev

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/KshzsController.java

@@ -165,6 +165,21 @@ public class KshzsController {
     @Operation(summary = "粮情检测")
     public CommonResult<List<lqjcVo>> selectLqjcList(@Valid @RequestBody paramVo paramVo) {
         List<lqjcVo> dataObj = kshzsService.selectLqjcList(paramVo);
+        if (dataObj != null || dataObj.size() > 0) {
+            for (lqjcVo lqjcVo : dataObj){
+                Integer num = 0;
+                if(lqjcVo.getFileIds() != null) {
+                    String[] ids = lqjcVo.getFileIds().split(",");
+                    List<String> list = new ArrayList<>();
+                    for (String id : ids) {
+                        num += 1;
+                        list.add(id);
+                    }
+                    lqjcVo.setFileIds(num.toString());
+                    lqjcVo.setFileList(list);
+                }
+            }
+        }
         return CommonResult.success(dataObj);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/kqxxVo.java

@@ -23,6 +23,9 @@ public class kqxxVo {
     @Schema(description = "库区代码")
     private String kqdm;
 
+    @Schema(description = "库区编码")
+    private String kqbm;
+
     @Schema(description = "企业名称")
     private String qymc;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/kshzs/vo/lqjcVo.java

@@ -3,6 +3,8 @@ package com.unis.module.coding.controller.admin.kshzs.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author: Insight
  * @Description: TODO
@@ -51,4 +53,7 @@ public class lqjcVo {
     @Schema(description = "附加id")
     private String fileIds;
 
+    @Schema(description = "附加id")
+    private List<String> fileList;
+
 }

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -102,7 +102,7 @@
 
     <select id="queryKqInfo" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.kqxxVo">
         SELECT
-         id kqid,kqdm,kqmc,ssfrqy qymc,shxydm tyshxydm,resid ljdz
+         id kqid,kqdm,kqbm,kqmc,ssfrqy qymc,shxydm tyshxydm,resid ljdz
         FROM DELIVERY_KQXX
         <where>
             <if test="kqid != null and kqid != ''">

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/arealevel/AreaLevelController.java

@@ -136,7 +136,13 @@ public class AreaLevelController {
         ExcelUtils.write(response, "行政区划.xls", "数据", AreaLevelRespVO.class,
                 BeanUtils.toBean(list, AreaLevelRespVO.class));
     }
-
+    @GetMapping("/all")
+    @Operation(summary = "获得行政区划所有")
+    @Parameter(name = "id", description = "编号")
+    public CommonResult<List<AreaLevelDO>> getAreaLevelList() {
+        List<AreaLevelDO> areaLevelAll = areaLevelService.getAll();
+        return success(areaLevelAll);
+    }
     @GetMapping("/getLoginUserXzqhConcise")
     @Operation(summary = "获得当前登录人行政区划简洁版")
     @Parameter(name = "id", description = "编号")

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/arealevel/AreaLevelService.java

@@ -69,4 +69,5 @@ public interface AreaLevelService {
 
     List<AreaLevelDO> getAreaLevelListAll(AdminUserDO user);
     List<AreaLevelDO> getLoginUserXzqhConcise(String areaCode);
+    List<AreaLevelDO> getAll();
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/arealevel/AreaLevelServiceImpl.java

@@ -152,7 +152,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
                     break;
                 }
             }
-        }else {
+        } else {
             resp = areaLevelMapper.selectById(id);
         }
         return resp;
@@ -165,7 +165,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
         List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
         if (allAreaLevels != null) {
             respList = allAreaLevels.stream().filter(areaLevelDO -> areaLevelDO.getAreaLevel() == 1).collect(Collectors.toList());
-        }else {
+        } else {
             respList = areaLevelMapper.selectShengLevel();
         }
         return respList;
@@ -179,7 +179,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
         List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
         if (allAreaLevels != null) {
             respList = allAreaLevels.stream().filter(areaLevelDO -> parentCode.equals(areaLevelDO.getParentCode())).collect(Collectors.toList());
-        }else {
+        } else {
             respList = areaLevelMapper.selectListByParentCode(parentCode);
         }
         return respList;
@@ -263,7 +263,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
         List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
         if (allAreaLevels != null) {
             respList = allAreaLevels.stream().filter(areaLevelDO -> areaCode.equals(areaLevelDO.getParentCode())).collect(Collectors.toList());
-        }else {
+        } else {
             respList = areaLevelMapper.selectListByParentCode(areaCode);
         }
 
@@ -271,6 +271,12 @@ public class AreaLevelServiceImpl implements AreaLevelService {
     }
 
     @Override
+    public List<AreaLevelDO> getAll() {
+        return areaLevelMapper.selectList();
+//        return null;
+    }
+
+    @Override
     public PageResult<AreaLevelDO> getAreaLevelPage(AreaLevelPageReqVO pageReqVO) {
         return areaLevelMapper.selectPage(pageReqVO);
     }