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

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

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

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

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

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

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

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

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

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

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

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

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

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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.param.*;
 import com.unis.basic.info.modular.unitInfo.vo.BasicEnumVo;
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoV;
@@ -181,4 +182,17 @@ public class UnitInfoController {
     public CommonResult<List<Map<String, String>>> getAreaByParentId(@PathVariable("parentId") String parentId) {
         return CommonResult.data(unitInfoService.getAreaByParentId(parentId));
     }
+
+    /**
+     * 获取企业信息分区统计
+     *
+     * @author TS
+     * @date 2024/07/29 09:58
+     */
+    @ApiOperationSupport(order = 8)
+    @ApiOperation("获取企业信息分区统计")
+    @GetMapping("/basic.info/unitInfo/getCityUnitInfo")
+    public CommonResult<List<CiytUnitInfo>> getCityUnitInfo() {
+        return CommonResult.data(unitInfoService.getCityUnitInfo());
+    }
 }

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

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

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.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.checkerframework.checker.units.qual.C;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -161,6 +163,7 @@ public class UnitInfo {
     @ApiModelProperty(value = "纬度，以度数（十进制）表示", position = 31)
     private BigDecimal wd;
 
+
     /** 单位状态，1:正常，2:退出储备粮承储 */
     @ApiModelProperty(value = "单位状态，1:正常，2:退出储备粮承储", position = 32)
     private Integer dwzt;
@@ -185,4 +188,13 @@ public class UnitInfo {
     @ApiModelProperty(value = "注册地址-区", position = 37)
     private String zcdzArea;
 
-}
+    /** 电子扫描件*/
+    @ApiModelProperty(value = "电子扫描件", position = 38)
+    private String electronicScan;
+
+    /** 总仓容 */
+    @ApiModelProperty(value = "总仓容", position = 39)
+    private BigDecimal totalWarehouseCapacity;
+
+
+}

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;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.basic.info.modular.grainPriceCollectCitySum.entity.GrainPriceCollectCitySum;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.entity.UnitInfo;
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,6 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
                                   @Param("fddbr") String fddbr);
 
     Map<String, Object> getDwGjjDate(String id);
+
+    List<CiytUnitInfo> getCityUnitInfo();
 }

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

@@ -81,4 +81,18 @@
             biz_unit_info
         where id = #{id}
     </select>
+    <select id="getCityUnitInfo" resultType="com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo">
+      SELECT
+        d.ID AS cityId,
+        d.DICT_LABEL AS cityName,
+        count(c.dwdm) unitCount
+    FROM
+        province_all.dev_dict d
+    LEFT JOIN province_all.biz_unit_info c ON d.ID = c.zcdz_city
+    WHERE
+        d.PARENT_ID = '1781535965870915586'
+    GROUP BY
+        d.ID,
+        d.DICT_LABEL
+    </select>
 </mapper>

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

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

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

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

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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unis.basic.info.modular.unitInfo.entity.BasicEnum;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.entity.UnitInfo;
 import com.unis.basic.info.modular.unitInfo.param.UnitInfoAddParam;
 import com.unis.basic.info.modular.unitInfo.param.UnitInfoEditParam;
@@ -103,4 +104,10 @@ public interface UnitInfoService extends IService<UnitInfo> {
     public List<UnitInfoVO> TreeList();
 
     List<Map<String, String>> getAreaByParentId(String parentId);
+
+    /**
+     * 获取企业信息分区统计
+     * @return
+     */
+    List<CiytUnitInfo> getCityUnitInfo();
 }

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;
 import com.unis.basic.info.modular.mq.dto.jkEnum;
 import com.unis.basic.info.modular.mq.pub.RecPublishService;
 import com.unis.basic.info.modular.unitInfo.entity.BasicEnum;
+import com.unis.basic.info.modular.unitInfo.entity.CiytUnitInfo;
 import com.unis.basic.info.modular.unitInfo.mapper.EnumMapper;
 import com.unis.basic.info.modular.unitInfo.vo.BasicEnumVo;
 import com.unis.basic.info.modular.unitInfo.vo.UnitInfoV;
@@ -399,6 +400,16 @@ public class UnitInfoServiceImpl extends ServiceImpl<UnitInfoMapper, UnitInfo> i
         return enumMapper.getAreaByParentId(parentId);
     }
 
+    /**
+     * 获取企业信息分区统计
+     *
+     * @return
+     */
+    @Override
+    public List<CiytUnitInfo> getCityUnitInfo() {
+        return unitInfoMapper.getCityUnitInfo();
+    }
+
 
     /**
      * 国家局数据

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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.ChartTypeParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -157,4 +159,17 @@ public class EmPersonInfoController {
     public CommonResult<List<EmPersonInfo>> getPersions() {
         return CommonResult.data(emPersonInfoService.getPersions());
     }
+    /**
+     * 获取企业管理-人员信息统计图表
+     *
+     * @author TS
+     * @date  2024/04/25 11:36
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("获取企业管理-人员信息统计图表")
+//    @SaCheckPermission("/enterpriseManagement.info/emPersonInfo/getStatisticalChart")
+    @GetMapping("/enterpriseManagement.info/emPersonInfo/getStatisticalChart")
+    public CommonResult<List<StatisticalChartInfo>> getStatisticalChart(@Valid ChartTypeParam chartTypeParam) {
+        return CommonResult.data(emPersonInfoService.getStatisticalChart(chartTypeParam));
+    }
 }

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

@@ -120,4 +120,12 @@ public class EmPersonInfo {
     /** 专业 */
     @ApiModelProperty(value = "专业", position = 21)
     private String major;
+
+    /** 个人简介 */
+    @ApiModelProperty(value = "个人简介", position = 22)
+    private String personalProfile;
+
+    /** 上传证书 */
+    @ApiModelProperty(value = "上传证书", position = 23)
+    private String certificate;
 }

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

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

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;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.EmPersonInfo;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,4 +38,11 @@ public interface EmPersonInfoMapper extends BaseMapper<EmPersonInfo> {
      * @return
      */
     IPage<Map<String,Object>> selectMyMapsPage(Page<EmPersonInfo> p, @Param(Constants.WRAPPER) QueryWrapper<EmPersonInfo> queryWrapper);
+
+    /**
+     * 获取企业管理-人员信息统计图表
+     * @param chartType 图表类型 1:人员,2:岗位性质
+     * @return
+     */
+    List<StatisticalChartInfo> getStatisticalChart(@Param("chartType") Integer chartType);
 }

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

@@ -17,4 +17,30 @@
         </if>
         ORDER BY a.create_time
     </select>
+    <select id="getStatisticalChart" resultType="com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo">
+        <choose>
+            <when  test=" chartType !='' and chartType == '1'.toString()" >
+                /*  1:性别 */
+                SELECT
+                b.DICT_LABEL as genderName,
+                COUNT(a.id)  as count
+                FROM
+                biz_em_person_info a
+                right JOIN dev_dict b ON a.gender = b.ID
+                where b.PARENT_ID = '1543839774776291330'
+                GROUP BY b.ID,b.DICT_LABEL
+            </when >
+            <otherwise >
+                /*  2:岗位性质*/
+                SELECT
+                b.DICT_LABEL as genderName,
+                COUNT(a.id)  as count
+                FROM
+                biz_em_person_info a
+                right JOIN dev_dict b ON a.position_nature = b.ID
+                where b.PARENT_ID = '1783422870449123330'
+                GROUP BY b.ID,b.DICT_LABEL
+            </otherwise>
+        </choose>
+    </select>
 </mapper>

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

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

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

@@ -91,4 +91,12 @@ public class EmPersonInfoAddParam {
     @ApiModelProperty(value = "专业", position = 21)
     private String major;
 
+    /** 个人简介 */
+    @ApiModelProperty(value = "个人简介", position = 22)
+    private String personalProfile;
+
+    /** 上传证书 */
+    @ApiModelProperty(value = "上传证书", position = 23)
+    private String certificate;
+
 }

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

@@ -96,4 +96,12 @@ public class EmPersonInfoEditParam {
     @ApiModelProperty(value = "专业", position = 21)
     private String major;
 
+    /** 个人简介 */
+    @ApiModelProperty(value = "个人简介", position = 22)
+    private String personalProfile;
+
+    /** 上传证书 */
+    @ApiModelProperty(value = "上传证书", position = 23)
+    private String certificate;
+
 }

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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.EmPersonInfo;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.ChartTypeParam;
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.EmPersonInfoAddParam;
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.EmPersonInfoEditParam;
 import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.EmPersonInfoIdParam;
@@ -92,4 +94,11 @@ public interface EmPersonInfoService extends IService<EmPersonInfo> {
      * @return
      */
     List<EmPersonInfo> getPersions();
+
+    /**
+     *获取企业管理-人员信息统计图表
+     * @param chartTypeParam
+     * @return
+     */
+    List<StatisticalChartInfo> getStatisticalChart(ChartTypeParam chartTypeParam);
 }

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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unis.basic.info.modular.grainPriceCollectProvinceSum.entity.GrainPriceCollectProvinceSum;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.entity.StatisticalChartInfo;
+import com.unis.enterpriseManagement.info.modular.emPersonInfo.param.ChartTypeParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -128,4 +130,15 @@ public class EmPersonInfoServiceImpl extends ServiceImpl<EmPersonInfoMapper, EmP
     public List<EmPersonInfo> getPersions() {
         return this.list();
     }
+
+    /**
+     * 获取企业管理-人员信息统计图表
+     *
+     * @param chartTypeParam
+     * @return
+     */
+    @Override
+    public List<StatisticalChartInfo> getStatisticalChart(ChartTypeParam chartTypeParam) {
+        return emPersonInfoMapper.getStatisticalChart(chartTypeParam.getChartType());
+    }
 }

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

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

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

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

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

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

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

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

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
         if (StringUtils.isNotBlank(emSystemBuildPageParam.getSystemName())){
             queryWrapper.lambda().like(EmSystemBuild::getSystemName,emSystemBuildPageParam.getSystemName());
         }
+        if (emSystemBuildPageParam.getSysType() != null){
+            queryWrapper.lambda().like(EmSystemBuild::getSysType,emSystemBuildPageParam.getSysType());
+        }
         if(ObjectUtil.isAllNotEmpty(emSystemBuildPageParam.getSortField(), emSystemBuildPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(emSystemBuildPageParam.getSortOrder());
             queryWrapper.orderBy(true, emSystemBuildPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),

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> {
 
     List<CrkChartDataVO> getCrkChartDataByDj(@Param("crkCharParam") CrkCharParam crkCharParam);
 
-    List<CrkKcswXzDataVO> getXzList(@Param("xz") String xz, @Param("orgId") String orgId);
+    List<CrkKcswXzDataVO> getXzList( @Param("xz") String xz, @Param("orgId") String orgId,@Param("cityId") String cityId);
 
     CrkJyxxDataVO getJyxxDetail(@Param("dataId") String dataId);
 
@@ -57,8 +57,9 @@ public interface KcswDefaultMapper extends BaseMapper<DataKcglKcswDefault> {
 
     /**
      * 得到小麦粉，大米不同性质库存信息，在成品粮库存实物表进行查询
+     *
      * @param xz
-     * @param orgId_
+     * @param orgId
      * @return
      */
     CrkKcswXzDataVO getMzlDataByxz(@Param("xz") String xz, @Param("orgId") String orgId);

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

@@ -110,6 +110,7 @@
         depot_qh.org_info b
         LEFT JOIN  depot_qh.data_kcgl_kcsw_default a on a.UnitID=b.org_id
         LEFT JOIN depot_qh.basic_enum b1_enum ON b1_enum.enumId = IFNULL(a.pz,'3164')
+        LEFT JOIN  province_all.biz_unit_info f  on b.unit_info_id = f.id
     WHERE
         IFNULL(a.hwxz,'6877') IN (${xz}) and IFNULL(a.pz,'3164') in (3164,3166,8000)
         <if test="orgId == null or orgId == ''">
@@ -118,6 +119,9 @@
         <if test="orgId != null and orgId != ''">
             and b.org_id = #{orgId}
         </if>
+        <if test="cityId != null and cityId != ''">
+            AND f.zcdz_city  = #{cityId}
+        </if>
     GROUP BY
         b.org_id,a.pz
     ) x
@@ -129,6 +133,7 @@
 
     <select id="getJyxxDetail" resultType="com.unis.reserveLayout.modular.dataKcglKcswDefault.entity.VO.CrkJyxxDataVO">
         SELECT
+				xz_enum.enumname as "lsxzName",
         a.lsxz AS "lsxz",
         b_2.enumName as "lspzName",
         a.lspz AS "lspz",
@@ -153,6 +158,7 @@
     LEFT JOIN basic_enum b_5 ON b.jyjg = b_5.enumId
     LEFT JOIN basic_enum b_6 ON b.lsdj = b_6.enumId
     LEFT JOIN basic_enum mxpz_enum ON mxpz_enum.enumId = a.mxpz
+		LEFT JOIN basic_enum xz_enum on xz_enum.enumId = a.lsxz
     where b.DataID = #{dataId}
     </select>
     <select id="getJyxxMxDetail" resultType="com.unis.reserveLayout.modular.dataKcglKcswDefault.entity.VO.CrkJyxxMxDataVO">

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;
 public class CrkKcswParam {
 
     @ApiModelProperty(value = "粮食性质: 6877：省级，6878：市级，6879：县级")
-    String lsxz;
+    private String lsxz;
+
+    @ApiModelProperty(value = "市州Id")
+    private String cityId;
 
 
 }

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

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

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
         if (StringUtils.isNotBlank(pageParam.getLspzName())){
             queryWrapper.like("b_2.enumName",pageParam.getLspzName());
         }
+        if (StringUtils.isNotBlank(pageParam.getJyjg())){
+            queryWrapper.like("DATA_CRKYW_JYXX_DEFAULT.jyjg",pageParam.getJyjg());
+        }
         if (StringUtils.isNotBlank(pageParam.getCph())){
             queryWrapper.like("DATA_CRKYW_RMDJ_DEFAULT.cph",pageParam.getCph());
         }
@@ -112,13 +115,14 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
         String xj = "6879"; //县级储备
         Boolean isFilter = false; //是否性质条件过滤
         String orgId = "";
+        String cityId = crkKcswParam.getCityId();
         Double mzl = 0.7; //折算比例，默认0.7
         if (StringUtils.isNotBlank(crkKcswParam.getLsxz())){ //表示需要进行过滤
             xz = crkKcswParam.getLsxz();
             isFilter = true;
         }
 
-        List<CrkKcswXzDataVO> dfcbList = kcswDefaultMapper.getXzList(xz,orgId);
+        List<CrkKcswXzDataVO> dfcbList = kcswDefaultMapper.getXzList(xz,orgId,cityId);
         for(CrkKcswXzDataVO xzDataVO:dfcbList){
             String orgId_ = xzDataVO.getOrgId();
             CrkKcswDataVO crkKcswDataVO = new CrkKcswDataVO();
@@ -156,7 +160,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
             if (!isFilter ||(isFilter  && StringUtils.equals(sj,crkKcswParam.getLsxz()))) {
                 //省级储备
                 //原粮：小麦，青稞，稻谷
-                List<CrkKcswXzDataVO> sjcbList = kcswDefaultMapper.getXzList(sj, orgId_);
+                List<CrkKcswXzDataVO> sjcbList = kcswDefaultMapper.getXzList(sj, orgId_,cityId);
                 if (sjcbList.size() > 0) {
                     CrkKcswXzDataVO sjcb = sjcbList.get(0);
                     //得到省级小麦，大米
@@ -193,7 +197,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
             //市级储备
             if (!isFilter ||(isFilter  && StringUtils.equals(cj,crkKcswParam.getLsxz()))) {
                 //原粮：小麦，青稞，稻谷
-                List<CrkKcswXzDataVO> cjcbList = kcswDefaultMapper.getXzList(cj, orgId_);
+                List<CrkKcswXzDataVO> cjcbList = kcswDefaultMapper.getXzList(cj, orgId_,cityId);
                 if (cjcbList.size() > 0) {
                     CrkKcswXzDataVO cjcb = cjcbList.get(0);
                     //得到市级小麦，大米
@@ -229,7 +233,7 @@ public class KcswDefaultServiceImpl extends ServiceImpl<KcswDefaultMapper, DataK
             //县级储备
             if (!isFilter ||(isFilter  && StringUtils.equals(xj,crkKcswParam.getLsxz()))) {
                 //原粮：小麦，青稞，稻谷
-                List<CrkKcswXzDataVO> xjcbList = kcswDefaultMapper.getXzList(xj, orgId_);
+                List<CrkKcswXzDataVO> xjcbList = kcswDefaultMapper.getXzList(xj, orgId_,cityId);
                 if (xjcbList.size() > 0) {
                     CrkKcswXzDataVO xjcb = xjcbList.get(0);
                     //得到县级小麦，大米

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

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

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

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

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

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

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
 
     @Override
     public Page<QualityInspectionWhole> wholeWarehouseQualityInspectionPage(QualityInspectionOrgPageParam param) {
-        return qualityInspectionOrgMapper.wholeWarehouseQualityInspectionPage(new Page<>(param.getCurrent(), param.getSize()), param.getStorehouseName());
+        return qualityInspectionOrgMapper.wholeWarehouseQualityInspectionPage(new Page<>(param.getCurrent(), param.getSize()), param.getStorehouseName(), param.getOrgId());
     }
 
     @Override