企业管理-人员及制度建设 修改

Signed-off-by: tangsong <86121657@qq.com>

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()),