소스 검색

Merge branch 'dev' of http://101.36.160.140:21044/province-qinghai/province-all into dev

ZeroLiYi 3 달 전
부모
커밋
881d75c2ad
39개의 변경된 파일376개의 추가작업 그리고 14개의 파일을 삭제
  1. 3 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/orgInfo/entity/OrgInfo.java
  2. 2 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/orgInfo/enums/OrgInfoEnum.java
  3. 9 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/entity/TankInfo.java
  4. 2 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/enums/TankInfoEnum.java
  5. 9 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/param/TankInfoAddParam.java
  6. 9 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/param/TankInfoEditParam.java
  7. 14 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/controller/UnitInfoController.java
  8. 40 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/entity/CiytUnitInfo.java
  9. 13 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/entity/UnitInfo.java
  10. 3 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/UnitInfoMapper.java
  11. 14 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/mapping/UnitInfoMapper.xml
  12. 8 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/param/UnitInfoAddParam.java
  13. 7 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/param/UnitInfoEditParam.java
  14. 7 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/UnitInfoService.java
  15. 11 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/impl/UnitInfoServiceImpl.java
  16. 15 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/controller/EmPersonInfoController.java
  17. 8 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/entity/EmPersonInfo.java
  18. 39 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/entity/StatisticalChartInfo.java
  19. 9 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/mapper/EmPersonInfoMapper.java
  20. 26 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/mapper/mapping/EmPersonInfoMapper.xml
  21. 35 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/param/ChartTypeParam.java
  22. 8 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/param/EmPersonInfoAddParam.java
  23. 8 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/param/EmPersonInfoEditParam.java
  24. 9 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/service/EmPersonInfoService.java
  25. 13 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/service/impl/EmPersonInfoServiceImpl.java
  26. 5 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/entity/EmSystemBuild.java
  27. 5 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/param/EmSystemBuildAddParam.java
  28. 5 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/param/EmSystemBuildEditParam.java
  29. 4 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/param/EmSystemBuildPageParam.java
  30. 3 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/service/impl/EmSystemBuildServiceImpl.java
  31. 3 2
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/KcswDefaultMapper.java
  32. 6 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/mapping/KcswDefaultMapper.xml
  33. 4 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/param/CrkKcswParam.java
  34. 3 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/param/KcswDefaultPageParam.java
  35. 8 4
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/service/impl/KcswDefaultServiceImpl.java
  36. 1 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/mapper/QualityInspectionOrgMapper.java
  37. 4 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/mapper/mapping/QualityInspectionOrgMapper.xml
  38. 3 0
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/param/QualityInspectionOrgPageParam.java
  39. 1 1
      unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/service/impl/QualityInspectionOrgServiceImpl.java

+ 3 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/orgInfo/entity/OrgInfo.java

@@ -298,4 +298,7 @@ public class OrgInfo {
298 298
     @TableField(exist = false)//企业名称
299 299
     @ApiModelProperty(value = "企业名称", position = 67)
300 300
     private String qymc;
301
+
302
+    @ApiModelProperty(value = "统一库区编码", position = 68)
303
+    private String tykqbm;
301 304
 }

+ 2 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/orgInfo/enums/OrgInfoEnum.java

@@ -10,7 +10,8 @@
10 10
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
11 11
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
12 12
  */
13
-package com.unis.orgInfo.modular.info.enums;
13
+package com.unis.basic.info.modular.orgInfo.enums;
14
+
14 15
 
15 16
 import lombok.Getter;
16 17
 

+ 9 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/entity/TankInfo.java

@@ -171,6 +171,15 @@ public class TankInfo {
171 171
     @ApiModelProperty(value = "市平台油罐数据主键ID", position = 35)
172 172
     private String sptDataid;
173 173
 
174
+    @ApiModelProperty(value = "设计年限", position = 36)
175
+    private BigDecimal designLife; //设计年限
176
+
177
+    @ApiModelProperty(value = "启用日期", position = 37)
178
+    private Date startDate;//启用日期
179
+
180
+    @ApiModelProperty(value = "保管员", position = 38)
181
+    private String keeper;//保管员
182
+
174 183
     /*库区名称*/
175 184
     @TableField(exist = false)
176 185
     private String orgName;

+ 2 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/enums/TankInfoEnum.java

@@ -10,7 +10,8 @@
10 10
  * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
11 11
  * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
12 12
  */
13
-package com.unis.tank.modular.tank.enums;
13
+package com.unis.basic.info.modular.tankInfo.enums;
14
+
14 15
 
15 16
 import lombok.Getter;
16 17
 

+ 9 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/param/TankInfoAddParam.java

@@ -167,4 +167,13 @@ public class TankInfoAddParam {
167 167
     @ApiModelProperty(value = "市平台油罐数据主键ID", position = 35)
168 168
     private String sptDataid;
169 169
 
170
+    @ApiModelProperty(value = "设计年限", position = 36)
171
+    private BigDecimal designLife; //设计年限
172
+
173
+    @ApiModelProperty(value = "启用日期", position = 37)
174
+    private Date startDate;//启用日期
175
+
176
+    @ApiModelProperty(value = "保管员", position = 38)
177
+    private String keeper;//保管员
178
+
170 179
 }

+ 9 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/tankInfo/param/TankInfoEditParam.java

@@ -172,4 +172,13 @@ public class TankInfoEditParam {
172 172
     @ApiModelProperty(value = "市平台油罐数据主键ID", position = 35)
173 173
     private String sptDataid;
174 174
 
175
+    @ApiModelProperty(value = "设计年限", position = 36)
176
+    private BigDecimal designLife; //设计年限
177
+
178
+    @ApiModelProperty(value = "启用日期", position = 37)
179
+    private Date startDate;//启用日期
180
+
181
+    @ApiModelProperty(value = "保管员", position = 38)
182
+    private String keeper;//保管员
183
+
175 184
 }

+ 14 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/controller/UnitInfoController.java

@@ -15,6 +15,7 @@ package com.unis.basic.info.modular.unitInfo.controller;
15 15
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
16 16
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
17 17
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
18
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
18 19
 import com.unis.basic.info.modular.unitInfo.param.*;
19 20
 import com.unis.basic.info.modular.unitInfo.vo.BasicEnumVo;
20 21
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoV;
@@ -181,4 +182,17 @@ public class UnitInfoController {
181 182
     public CommonResult<List<Map<String, String>>> getAreaByParentId(@PathVariable("parentId") String parentId) {
182 183
         return CommonResult.data(unitInfoService.getAreaByParentId(parentId));
183 184
     }
185
+
186
+    /**
187
+     * 获取企业信息分区统计
188
+     *
189
+     * @author TS
190
+     * @date 2024/07/29 09:58
191
+     */
192
+    @ApiOperationSupport(order = 8)
193
+    @ApiOperation("获取企业信息分区统计")
194
+    @GetMapping("/basic.info/unitInfo/getCityUnitInfo")
195
+    public CommonResult<List<CiytUnitInfo>> getCityUnitInfo() {
196
+        return CommonResult.data(unitInfoService.getCityUnitInfo());
197
+    }
184 198
 }

+ 40 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/entity/CiytUnitInfo.java

@@ -0,0 +1,40 @@
1
+/*
2
+ * Copyright [2022] [https://www.xiaonuo.vip]
3
+ *
4
+ * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
5
+ *
6
+ * 1.请不要删除和修改根目录下的LICENSE文件。
7
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
8
+ * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。
9
+ * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip
10
+ * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
11
+ * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
12
+ */
13
+package com.unis.basic.info.modular.unitInfo.entity;
14
+
15
+import io.swagger.annotations.ApiModelProperty;
16
+import lombok.Getter;
17
+import lombok.Setter;
18
+
19
+/**
20
+ * 分地区统计VO
21
+ *
22
+ * @author TS
23
+ * @date  2024/07/29 09:08
24
+ **/
25
+@Getter
26
+@Setter
27
+public class CiytUnitInfo {
28
+
29
+    @ApiModelProperty(value = "市区id", position = 1)
30
+    private String cityId;
31
+
32
+
33
+    @ApiModelProperty(value = "市区名称", position = 2)
34
+    private String cityName;
35
+
36
+    @ApiModelProperty(value = "企业数量", position = 3)
37
+    private Integer unitCount;
38
+
39
+
40
+}

+ 13 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/entity/UnitInfo.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.annotation.*;
16 16
 import io.swagger.annotations.ApiModelProperty;
17 17
 import lombok.Getter;
18 18
 import lombok.Setter;
19
+import org.checkerframework.checker.units.qual.C;
20
+
19 21
 import java.math.BigDecimal;
20 22
 import java.util.Date;
21 23
 
@@ -161,6 +163,7 @@ public class UnitInfo {
161 163
     @ApiModelProperty(value = "纬度,以度数(十进制)表示", position = 31)
162 164
     private BigDecimal wd;
163 165
 
166
+
164 167
     /** 单位状态,1:正常,2:退出储备粮承储 */
165 168
     @ApiModelProperty(value = "单位状态,1:正常,2:退出储备粮承储", position = 32)
166 169
     private Integer dwzt;
@@ -185,4 +188,13 @@ public class UnitInfo {
185 188
     @ApiModelProperty(value = "注册地址-区", position = 37)
186 189
     private String zcdzArea;
187 190
 
188
-}
191
+    /** 电子扫描件*/
192
+    @ApiModelProperty(value = "电子扫描件", position = 38)
193
+    private String electronicScan;
194
+
195
+    /** 总仓容 */
196
+    @ApiModelProperty(value = "总仓容", position = 39)
197
+    private BigDecimal totalWarehouseCapacity;
198
+
199
+
200
+}

+ 3 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/UnitInfoMapper.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
18 18
 import com.baomidou.mybatisplus.core.toolkit.Constants;
19 19
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 20
 import com.unis.basic.info.modular.grainPriceCollectCitySum.entity.GrainPriceCollectCitySum;
21
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
21 22
 import com.unis.basic.info.modular.unitInfo.entity.UnitInfo;
22 23
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO;
23 24
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,6 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
43 44
                                   @Param("fddbr") String fddbr);
44 45
 
45 46
     Map<String, Object> getDwGjjDate(String id);
47
+
48
+    List<CiytUnitInfo> getCityUnitInfo();
46 49
 }

+ 14 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/mapper/mapping/UnitInfoMapper.xml

@@ -81,4 +81,18 @@
81 81
             biz_unit_info
82 82
         where id = #{id}
83 83
     </select>
84
+    <select id="getCityUnitInfo" resultType="com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo">
85
+      SELECT
86
+        d.ID AS cityId,
87
+        d.DICT_LABEL AS cityName,
88
+        count(c.dwdm) unitCount
89
+    FROM
90
+        province_all.dev_dict d
91
+    LEFT JOIN province_all.biz_unit_info c ON d.ID = c.zcdz_city
92
+    WHERE
93
+        d.PARENT_ID = '1781535965870915586'
94
+    GROUP BY
95
+        d.ID,
96
+        d.DICT_LABEL
97
+    </select>
84 98
 </mapper>

+ 8 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/param/UnitInfoAddParam.java

@@ -237,4 +237,12 @@ public class UnitInfoAddParam {
237 237
     /** 注册地址-区  进行三级联查*/
238 238
     @ApiModelProperty(value = "注册地址-区", position = 37)
239 239
     private String zcdzArea;
240
+
241
+    /** 电子扫描件*/
242
+    @ApiModelProperty(value = "电子扫描件", position = 38)
243
+    private String electronicScan;
244
+
245
+    /** 总仓容 */
246
+    @ApiModelProperty(value = "总仓容", position = 39)
247
+    private BigDecimal totalWarehouseCapacity;
240 248
 }

+ 7 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/param/UnitInfoEditParam.java

@@ -245,5 +245,12 @@ public class UnitInfoEditParam {
245 245
     @ApiModelProperty(value = "注册地址-区", position = 37)
246 246
     private String zcdzArea;
247 247
 
248
+    /** 电子扫描件*/
249
+    @ApiModelProperty(value = "电子扫描件", position = 38)
250
+    private String electronicScan;
251
+
252
+    /** 总仓容 */
253
+    @ApiModelProperty(value = "总仓容", position = 39)
254
+    private BigDecimal totalWarehouseCapacity;
248 255
 
249 256
 }

+ 7 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/UnitInfoService.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
17 17
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
18 18
 import com.baomidou.mybatisplus.extension.service.IService;
19 19
 import com.unis.basic.info.modular.unitInfo.entity.BasicEnum;
20
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
20 21
 import com.unis.basic.info.modular.unitInfo.entity.UnitInfo;
21 22
 import com.unis.basic.info.modular.unitInfo.param.UnitInfoAddParam;
22 23
 import com.unis.basic.info.modular.unitInfo.param.UnitInfoEditParam;
@@ -103,4 +104,10 @@ public interface UnitInfoService extends IService<UnitInfo> {
103 104
     public List<UnitInfoVO> TreeList();
104 105
 
105 106
     List<Map<String, String>> getAreaByParentId(String parentId);
107
+
108
+    /**
109
+     * 获取企业信息分区统计
110
+     * @return
111
+     */
112
+    List<CiytUnitInfo> getCityUnitInfo();
106 113
 }

+ 11 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/basic.info/modular/unitInfo/service/impl/UnitInfoServiceImpl.java

@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
24 24
 import com.unis.basic.info.modular.mq.dto.jkEnum;
25 25
 import com.unis.basic.info.modular.mq.pub.RecPublishService;
26 26
 import com.unis.basic.info.modular.unitInfo.entity.BasicEnum;
27
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
27 28
 import com.unis.basic.info.modular.unitInfo.mapper.EnumMapper;
28 29
 import com.unis.basic.info.modular.unitInfo.vo.BasicEnumVo;
29 30
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoV;
@@ -399,6 +400,16 @@ public class UnitInfoServiceImpl extends ServiceImpl<UnitInfoMapper, UnitInfo> i
399 400
         return enumMapper.getAreaByParentId(parentId);
400 401
     }
401 402
 
403
+    /**
404
+     * 获取企业信息分区统计
405
+     *
406
+     * @return
407
+     */
408
+    @Override
409
+    public List<CiytUnitInfo> getCityUnitInfo() {
410
+        return unitInfoMapper.getCityUnitInfo();
411
+    }
412
+
402 413
 
403 414
     /**
404 415
      * 国家局数据

+ 15 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/controller/EmPersonInfoController.java

@@ -17,6 +17,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
17 17
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
18 18
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
19 19
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
20
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
21
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.ChartTypeParam;
20 22
 import io.swagger.annotations.Api;
21 23
 import io.swagger.annotations.ApiOperation;
22 24
 import org.springframework.validation.annotation.Validated;
@@ -157,4 +159,17 @@ public class EmPersonInfoController {
157 159
     public CommonResult<List<EmPersonInfo>> getPersions() {
158 160
         return CommonResult.data(emPersonInfoService.getPersions());
159 161
     }
162
+    /**
163
+     * 获取企业管理-人员信息统计图表
164
+     *
165
+     * @author TS
166
+     * @date  2024/04/25 11:36
167
+     */
168
+    @ApiOperationSupport(order = 5)
169
+    @ApiOperation("获取企业管理-人员信息统计图表")
170
+//    @SaCheckPermission("/enterpriseManagement.info/emPersonInfo/getStatisticalChart")
171
+    @GetMapping("/enterpriseManagement.info/emPersonInfo/getStatisticalChart")
172
+    public CommonResult<List<StatisticalChartInfo>> getStatisticalChart(@Valid ChartTypeParam chartTypeParam) {
173
+        return CommonResult.data(emPersonInfoService.getStatisticalChart(chartTypeParam));
174
+    }
160 175
 }

+ 8 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/entity/EmPersonInfo.java

@@ -120,4 +120,12 @@ public class EmPersonInfo {
120 120
     /** 专业 */
121 121
     @ApiModelProperty(value = "专业", position = 21)
122 122
     private String major;
123
+
124
+    /** 个人简介 */
125
+    @ApiModelProperty(value = "个人简介", position = 22)
126
+    private String personalProfile;
127
+
128
+    /** 上传证书 */
129
+    @ApiModelProperty(value = "上传证书", position = 23)
130
+    private String certificate;
123 131
 }

+ 39 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/entity/StatisticalChartInfo.java

@@ -0,0 +1,39 @@
1
+/*
2
+ * Copyright [2022] [https://www.xiaonuo.vip]
3
+ *
4
+ * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
5
+ *
6
+ * 1.请不要删除和修改根目录下的LICENSE文件。
7
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
8
+ * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。
9
+ * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip
10
+ * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
11
+ * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
12
+ */
13
+package com.unis.enterpriseManagement.info.modular.emPersonInfo.entity;
14
+
15
+import io.swagger.annotations.ApiModelProperty;
16
+import lombok.Getter;
17
+import lombok.Setter;
18
+
19
+/**
20
+ * 企业管理-人员信息统计图表VO
21
+ *
22
+ * @author TS
23
+ * @date  2024/07/29 09:08
24
+ **/
25
+@Getter
26
+@Setter
27
+public class StatisticalChartInfo {
28
+
29
+    @ApiModelProperty(value = "性别名称", position = 1)
30
+    private String genderName;
31
+
32
+    @ApiModelProperty(value = "岗位性质名称", position = 2)
33
+    private String positionNatureName;
34
+
35
+    @ApiModelProperty(value = "数量", position = 3)
36
+    private Integer count;
37
+
38
+
39
+}

+ 9 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/mapper/EmPersonInfoMapper.java

@@ -18,8 +18,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
18 18
 import com.baomidou.mybatisplus.core.toolkit.Constants;
19 19
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
20 20
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.EmPersonInfo;
21
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
21 22
 import org.apache.ibatis.annotations.Param;
22 23
 
24
+import java.util.List;
23 25
 import java.util.Map;
24 26
 
25 27
 /**
@@ -36,4 +38,11 @@ public interface EmPersonInfoMapper extends BaseMapper<EmPersonInfo> {
36 38
      * @return
37 39
      */
38 40
     IPage<Map<String,Object>> selectMyMapsPage(Page<EmPersonInfo> p, @Param(Constants.WRAPPER) QueryWrapper<EmPersonInfo> queryWrapper);
41
+
42
+    /**
43
+     * 获取企业管理-人员信息统计图表
44
+     * @param chartType 图表类型 1:人员,2:岗位性质
45
+     * @return
46
+     */
47
+    List<StatisticalChartInfo> getStatisticalChart(@Param("chartType") Integer chartType);
39 48
 }

+ 26 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/mapper/mapping/EmPersonInfoMapper.xml

@@ -17,4 +17,30 @@
17 17
         </if>
18 18
         ORDER BY a.create_time
19 19
     </select>
20
+    <select id="getStatisticalChart" resultType="com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo">
21
+        <choose>
22
+            <when  test=" chartType !='' and chartType == '1'.toString()" >
23
+                /*  1:性别 */
24
+                SELECT
25
+                b.DICT_LABEL as genderName,
26
+                COUNT(a.id)  as count
27
+                FROM
28
+                biz_em_person_info a
29
+                right JOIN dev_dict b ON a.gender = b.ID
30
+                where b.PARENT_ID = '1543839774776291330'
31
+                GROUP BY b.ID,b.DICT_LABEL
32
+            </when >
33
+            <otherwise >
34
+                /*  2:岗位性质*/
35
+                SELECT
36
+                b.DICT_LABEL as genderName,
37
+                COUNT(a.id)  as count
38
+                FROM
39
+                biz_em_person_info a
40
+                right JOIN dev_dict b ON a.position_nature = b.ID
41
+                where b.PARENT_ID = '1783422870449123330'
42
+                GROUP BY b.ID,b.DICT_LABEL
43
+            </otherwise>
44
+        </choose>
45
+    </select>
20 46
 </mapper>

+ 35 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/param/ChartTypeParam.java

@@ -0,0 +1,35 @@
1
+/*
2
+ * Copyright [2022] [https://www.xiaonuo.vip]
3
+ *
4
+ * Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
5
+ *
6
+ * 1.请不要删除和修改根目录下的LICENSE文件。
7
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
8
+ * 3.本项目代码可免费商业使用,商业使用请保留源码和相关描述文件的项目出处,作者声明等。
9
+ * 4.分发源码时候,请注明软件出处 https://www.xiaonuo.vip
10
+ * 5.不可二次分发开源参与同类竞品,如有想法可联系团队xiaonuobase@qq.com商议合作。
11
+ * 6.若您的项目无法满足以上几点,需要更多功能代码,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
12
+ */
13
+package com.unis.enterpriseManagement.info.modular.emPersonInfo.param;
14
+
15
+import io.swagger.annotations.ApiModelProperty;
16
+import lombok.Getter;
17
+import lombok.Setter;
18
+
19
+import javax.validation.constraints.NotBlank;
20
+import javax.validation.constraints.NotNull;
21
+
22
+/**
23
+ * 企业管理-人员信息管理统计图表类型参数
24
+ *
25
+ * @author TS
26
+ * @date  2024/04/25 11:36
27
+ **/
28
+@Getter
29
+@Setter
30
+public class ChartTypeParam {
31
+
32
+    @ApiModelProperty(value = "1:人员,2:岗位性质", required = true)
33
+    @NotNull(message = "图表 不能为空")
34
+    private Integer chartType;
35
+}

+ 8 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/param/EmPersonInfoAddParam.java

@@ -91,4 +91,12 @@ public class EmPersonInfoAddParam {
91 91
     @ApiModelProperty(value = "专业", position = 21)
92 92
     private String major;
93 93
 
94
+    /** 个人简介 */
95
+    @ApiModelProperty(value = "个人简介", position = 22)
96
+    private String personalProfile;
97
+
98
+    /** 上传证书 */
99
+    @ApiModelProperty(value = "上传证书", position = 23)
100
+    private String certificate;
101
+
94 102
 }

+ 8 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/param/EmPersonInfoEditParam.java

@@ -96,4 +96,12 @@ public class EmPersonInfoEditParam {
96 96
     @ApiModelProperty(value = "专业", position = 21)
97 97
     private String major;
98 98
 
99
+    /** 个人简介 */
100
+    @ApiModelProperty(value = "个人简介", position = 22)
101
+    private String personalProfile;
102
+
103
+    /** 上传证书 */
104
+    @ApiModelProperty(value = "上传证书", position = 23)
105
+    private String certificate;
106
+
99 107
 }

+ 9 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/service/EmPersonInfoService.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
16 16
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
17 17
 import com.baomidou.mybatisplus.extension.service.IService;
18 18
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.EmPersonInfo;
19
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
20
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.ChartTypeParam;
19 21
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.EmPersonInfoAddParam;
20 22
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.EmPersonInfoEditParam;
21 23
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.EmPersonInfoIdParam;
@@ -92,4 +94,11 @@ public interface EmPersonInfoService extends IService<EmPersonInfo> {
92 94
      * @return
93 95
      */
94 96
     List<EmPersonInfo> getPersions();
97
+
98
+    /**
99
+     *获取企业管理-人员信息统计图表
100
+     * @param chartTypeParam
101
+     * @return
102
+     */
103
+    List<StatisticalChartInfo> getStatisticalChart(ChartTypeParam chartTypeParam);
95 104
 }

+ 13 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emPersonInfo/service/impl/EmPersonInfoServiceImpl.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
21 21
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
22 22
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
23 23
 import com.unis.basic.info.modular.grainPriceCollectProvinceSum.entity.GrainPriceCollectProvinceSum;
24
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
25
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.ChartTypeParam;
24 26
 import org.apache.commons.lang3.StringUtils;
25 27
 import org.springframework.stereotype.Service;
26 28
 import org.springframework.transaction.annotation.Transactional;
@@ -128,4 +130,15 @@ public class EmPersonInfoServiceImpl extends ServiceImpl<EmPersonInfoMapper, EmP
128 130
     public List<EmPersonInfo> getPersions() {
129 131
         return this.list();
130 132
     }
133
+
134
+    /**
135
+     * 获取企业管理-人员信息统计图表
136
+     *
137
+     * @param chartTypeParam
138
+     * @return
139
+     */
140
+    @Override
141
+    public List<StatisticalChartInfo> getStatisticalChart(ChartTypeParam chartTypeParam) {
142
+        return emPersonInfoMapper.getStatisticalChart(chartTypeParam.getChartType());
143
+    }
131 144
 }

+ 5 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/entity/EmSystemBuild.java

@@ -77,8 +77,12 @@ public class EmSystemBuild {
77 77
     @ApiModelProperty(value = "附件", position = 10)
78 78
     private String attachment;
79 79
 
80
+    /** 类型 1:岗位调整通知;2:制度管理;3:人事任免通知; */
81
+    @ApiModelProperty(value = "类型 1:岗位调整通知;2:制度管理;3:人事任免通知;", position = 11)
82
+    private Integer sysType;
83
+
80 84
     /** 创建用户名称 */
81
-    @ApiModelProperty(value = "创建用户名称", position = 11)
85
+    @ApiModelProperty(value = "创建用户名称", position = 12)
82 86
     @TableField(exist = false)
83 87
     private String createUserName;
84 88
 }

+ 5 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/param/EmSystemBuildAddParam.java

@@ -47,4 +47,9 @@ public class EmSystemBuildAddParam {
47 47
     @ApiModelProperty(value = "附件", position = 10)
48 48
     private String attachment;
49 49
 
50
+    /** 类型 1:岗位调整通知;2:制度管理;3:人事任免通知; */
51
+    @ApiModelProperty(value = "类型 1:岗位调整通知;2:制度管理;3:人事任免通知;", position = 11)
52
+    @NotNull(message = "类型不能为空")
53
+    private Integer sysType;
54
+
50 55
 }

+ 5 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/param/EmSystemBuildEditParam.java

@@ -52,4 +52,9 @@ public class EmSystemBuildEditParam {
52 52
     @ApiModelProperty(value = "附件", position = 10)
53 53
     private String attachment;
54 54
 
55
+    /** 类型 1:岗位调整通知;2:制度管理;3:人事任免通知; */
56
+    @ApiModelProperty(value = "类型 1:岗位调整通知;2:制度管理;3:人事任免通知;", position = 11)
57
+    @NotNull(message = "类型不能为空")
58
+    private Integer sysType;
59
+
55 60
 }

+ 4 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/param/EmSystemBuildPageParam.java

@@ -48,4 +48,8 @@ public class EmSystemBuildPageParam {
48 48
     @ApiModelProperty(value = "制度名称")
49 49
     private String systemName;
50 50
 
51
+    /** 类型 1:岗位调整通知;2:制度管理;3:人事任免通知; */
52
+    @ApiModelProperty(value = "类型 1:岗位调整通知;2:制度管理;3:人事任免通知;")
53
+    private Integer sysType;
54
+
51 55
 }

+ 3 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/enterpriseManagement/info/modular/emSystemBuild/service/impl/EmSystemBuildServiceImpl.java

@@ -56,6 +56,9 @@ public class EmSystemBuildServiceImpl extends ServiceImpl<EmSystemBuildMapper, E
56 56
         if (StringUtils.isNotBlank(emSystemBuildPageParam.getSystemName())){
57 57
             queryWrapper.lambda().like(EmSystemBuild::getSystemName,emSystemBuildPageParam.getSystemName());
58 58
         }
59
+        if (emSystemBuildPageParam.getSysType() != null){
60
+            queryWrapper.lambda().like(EmSystemBuild::getSysType,emSystemBuildPageParam.getSysType());
61
+        }
59 62
         if(ObjectUtil.isAllNotEmpty(emSystemBuildPageParam.getSortField(), emSystemBuildPageParam.getSortOrder())) {
60 63
             CommonSortOrderEnum.validate(emSystemBuildPageParam.getSortOrder());
61 64
             queryWrapper.orderBy(true, emSystemBuildPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),

+ 3 - 2
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/KcswDefaultMapper.java

@@ -41,7 +41,7 @@ public interface KcswDefaultMapper extends BaseMapper<DataKcglKcswDefault> {
41 41
 
42 42
     List<CrkChartDataVO> getCrkChartDataByDj(@Param("crkCharParam") CrkCharParam crkCharParam);
43 43
 
44
-    List<CrkKcswXzDataVO> getXzList(@Param("xz") String xz, @Param("orgId") String orgId);
44
+    List<CrkKcswXzDataVO> getXzList( @Param("xz") String xz, @Param("orgId") String orgId,@Param("cityId") String cityId);
45 45
 
46 46
     CrkJyxxDataVO getJyxxDetail(@Param("dataId") String dataId);
47 47
 
@@ -57,8 +57,9 @@ public interface KcswDefaultMapper extends BaseMapper<DataKcglKcswDefault> {
57 57
 
58 58
     /**
59 59
      * 得到小麦粉,大米不同性质库存信息,在成品粮库存实物表进行查询
60
+     *
60 61
      * @param xz
61
-     * @param orgId_
62
+     * @param orgId
62 63
      * @return
63 64
      */
64 65
     CrkKcswXzDataVO getMzlDataByxz(@Param("xz") String xz, @Param("orgId") String orgId);

+ 6 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/mapper/mapping/KcswDefaultMapper.xml

@@ -110,6 +110,7 @@
110 110
         depot_qh.org_info b
111 111
         LEFT JOIN  depot_qh.data_kcgl_kcsw_default a on a.UnitID=b.org_id
112 112
         LEFT JOIN depot_qh.basic_enum b1_enum ON b1_enum.enumId = IFNULL(a.pz,'3164')
113
+        LEFT JOIN  province_all.biz_unit_info f  on b.unit_info_id = f.id
113 114
     WHERE
114 115
         IFNULL(a.hwxz,'6877') IN (${xz}) and IFNULL(a.pz,'3164') in (3164,3166,8000)
115 116
         <if test="orgId == null or orgId == ''">
@@ -118,6 +119,9 @@
118 119
         <if test="orgId != null and orgId != ''">
119 120
             and b.org_id = #{orgId}
120 121
         </if>
122
+        <if test="cityId != null and cityId != ''">
123
+            AND f.zcdz_city  = #{cityId}
124
+        </if>
121 125
     GROUP BY
122 126
         b.org_id,a.pz
123 127
     ) x
@@ -129,6 +133,7 @@
129 133
 
130 134
     <select id="getJyxxDetail" resultType="com.unis.reserveLayout.modular.dataKcglKcswDefault.entity.VO.CrkJyxxDataVO">
131 135
         SELECT
136
+				xz_enum.enumname as "lsxzName",
132 137
         a.lsxz AS "lsxz",
133 138
         b_2.enumName as "lspzName",
134 139
         a.lspz AS "lspz",
@@ -153,6 +158,7 @@
153 158
     LEFT JOIN basic_enum b_5 ON b.jyjg = b_5.enumId
154 159
     LEFT JOIN basic_enum b_6 ON b.lsdj = b_6.enumId
155 160
     LEFT JOIN basic_enum mxpz_enum ON mxpz_enum.enumId = a.mxpz
161
+		LEFT JOIN basic_enum xz_enum on xz_enum.enumId = a.lsxz
156 162
     where b.DataID = #{dataId}
157 163
     </select>
158 164
     <select id="getJyxxMxDetail" resultType="com.unis.reserveLayout.modular.dataKcglKcswDefault.entity.VO.CrkJyxxMxDataVO">

+ 4 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/param/CrkKcswParam.java

@@ -29,7 +29,10 @@ import javax.validation.constraints.NotNull;
29 29
 public class CrkKcswParam {
30 30
 
31 31
     @ApiModelProperty(value = "粮食性质: 6877:省级,6878:市级,6879:县级")
32
-    String lsxz;
32
+    private String lsxz;
33
+
34
+    @ApiModelProperty(value = "市州Id")
35
+    private String cityId;
33 36
 
34 37
 
35 38
 }

+ 3 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/param/KcswDefaultPageParam.java

@@ -50,6 +50,9 @@ public class KcswDefaultPageParam {
50 50
     @ApiModelProperty(value = "粮食品种名称")
51 51
     String lspzName;
52 52
 
53
+    @ApiModelProperty(value = "检验结果")
54
+    String jyjg;
55
+
53 56
     @ApiModelProperty(value = "单据号")
54 57
     String bizNo;
55 58
 

+ 8 - 4
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/dataKcglKcswDefault/service/impl/KcswDefaultServiceImpl.java

@@ -70,6 +70,9 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
70 70
         if (StringUtils.isNotBlank(pageParam.getLspzName())){
71 71
             queryWrapper.like("b_2.enumName",pageParam.getLspzName());
72 72
         }
73
+        if (StringUtils.isNotBlank(pageParam.getJyjg())){
74
+            queryWrapper.like("DATA_CRKYW_JYXX_DEFAULT.jyjg",pageParam.getJyjg());
75
+        }
73 76
         if (StringUtils.isNotBlank(pageParam.getCph())){
74 77
             queryWrapper.like("DATA_CRKYW_RMDJ_DEFAULT.cph",pageParam.getCph());
75 78
         }
@@ -112,13 +115,14 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
112 115
         String xj = "6879"; //县级储备
113 116
         Boolean isFilter = false; //是否性质条件过滤
114 117
         String orgId = "";
118
+        String cityId = crkKcswParam.getCityId();
115 119
         Double mzl = 0.7; //折算比例,默认0.7
116 120
         if (StringUtils.isNotBlank(crkKcswParam.getLsxz())){ //表示需要进行过滤
117 121
             xz = crkKcswParam.getLsxz();
118 122
             isFilter = true;
119 123
         }
120 124
 
121
-        List<CrkKcswXzDataVO> dfcbList = kcswDefaultMapper.getXzList(xz,orgId);
125
+        List<CrkKcswXzDataVO> dfcbList = kcswDefaultMapper.getXzList(xz,orgId,cityId);
122 126
         for(CrkKcswXzDataVO xzDataVO:dfcbList){
123 127
             String orgId_ = xzDataVO.getOrgId();
124 128
             CrkKcswDataVO crkKcswDataVO = new CrkKcswDataVO();
@@ -156,7 +160,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
156 160
             if (!isFilter ||(isFilter  && StringUtils.equals(sj,crkKcswParam.getLsxz()))) {
157 161
                 //省级储备
158 162
                 //原粮:小麦,青稞,稻谷
159
-                List<CrkKcswXzDataVO> sjcbList = kcswDefaultMapper.getXzList(sj, orgId_);
163
+                List<CrkKcswXzDataVO> sjcbList = kcswDefaultMapper.getXzList(sj, orgId_,cityId);
160 164
                 if (sjcbList.size() > 0) {
161 165
                     CrkKcswXzDataVO sjcb = sjcbList.get(0);
162 166
                     //得到省级小麦,大米
@@ -193,7 +197,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
193 197
             //市级储备
194 198
             if (!isFilter ||(isFilter  && StringUtils.equals(cj,crkKcswParam.getLsxz()))) {
195 199
                 //原粮:小麦,青稞,稻谷
196
-                List<CrkKcswXzDataVO> cjcbList = kcswDefaultMapper.getXzList(cj, orgId_);
200
+                List<CrkKcswXzDataVO> cjcbList = kcswDefaultMapper.getXzList(cj, orgId_,cityId);
197 201
                 if (cjcbList.size() > 0) {
198 202
                     CrkKcswXzDataVO cjcb = cjcbList.get(0);
199 203
                     //得到市级小麦,大米
@@ -229,7 +233,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
229 233
             //县级储备
230 234
             if (!isFilter ||(isFilter  && StringUtils.equals(xj,crkKcswParam.getLsxz()))) {
231 235
                 //原粮:小麦,青稞,稻谷
232
-                List<CrkKcswXzDataVO> xjcbList = kcswDefaultMapper.getXzList(xj, orgId_);
236
+                List<CrkKcswXzDataVO> xjcbList = kcswDefaultMapper.getXzList(xj, orgId_,cityId);
233 237
                 if (xjcbList.size() > 0) {
234 238
                     CrkKcswXzDataVO xjcb = xjcbList.get(0);
235 239
                     //得到县级小麦,大米

+ 1 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/mapper/QualityInspectionOrgMapper.java

@@ -29,7 +29,7 @@ import java.util.List;
29 29
  * @date  2024/06/07 10:46
30 30
  **/
31 31
 public interface QualityInspectionOrgMapper extends BaseMapper<QualityInspectionOrg> {
32
-    Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(Page<Object> objectPage,@Param("storehouseName") String storehouseName);
32
+    Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(Page<Object> objectPage,@Param("storehouseName") String storehouseName, @Param("orgId") Integer orgId);
33 33
 
34 34
     QualityInspectionWholeDetail getQualityInspection(@Param("qualityId") Integer qualityId);
35 35
 

+ 4 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/mapper/mapping/QualityInspectionOrgMapper.xml

@@ -23,8 +23,11 @@
23 23
         LEFT JOIN depot_qh.basic_enum be ON qqi.grain_variety_id = be.enumId
24 24
         LEFT JOIN depot_qh.basic_enum be1 ON qqi.grain_nature_id = be1.enumId
25 25
         <where>
26
+            <if test="orgId != null and orgId != ''">
27
+                qqi.org_id = #{orgId}
28
+            </if>
26 29
             <if test="storehouseName != null and storehouseName != ''">
27
-                bs.storehouse_name LIKE CONCAT('%', #{storehouseName}, '%')
30
+                and bs.storehouse_name LIKE CONCAT('%', #{storehouseName}, '%')
28 31
             </if>
29 32
         </where>
30 33
     </select>

+ 3 - 0
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/param/QualityInspectionOrgPageParam.java

@@ -53,4 +53,7 @@ public class QualityInspectionOrgPageParam {
53 53
 
54 54
     @ApiModelProperty(value = "仓房名称(整仓质检)")
55 55
     private String storehouseName;
56
+
57
+    @ApiModelProperty(value = "机构编码")
58
+    private Integer orgId;
56 59
 }

+ 1 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/reserveLayout/modular/qualityInspectionOrg/service/impl/QualityInspectionOrgServiceImpl.java

@@ -102,7 +102,7 @@ public class QualityInspectionOrgServiceImpl extends ServiceImpl<QualityInspecti
102 102
 
103 103
     @Override
104 104
     public Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(QualityInspectionOrgPageParam param) {
105
-        return qualityInspectionOrgMapper.wholeWarehouseQualityInspectionPage(new Page<>(param.getCurrent(), param.getSize()), param.getStorehouseName());
105
+        return qualityInspectionOrgMapper.wholeWarehouseQualityInspectionPage(new Page<>(param.getCurrent(), param.getSize()), param.getStorehouseName(), param.getOrgId());
106 106
     }
107 107
 
108 108
     @Override