From 7d8017705b79ac7a8350ae38f96870193e1119f5 Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Fri, 24 Mar 2023 17:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93BUG=E4=BF=AE=E6=94=B9-?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/bean/SysEnterpriseDo.java | 14 +- .../java/com/rzyc/enums/PostListType.java | 21 + .../com/rzyc/mapper/EntPostListMapper.java | 21 +- .../java/com/rzyc/mapper/RkSourcesMapper.java | 3 +- .../com/rzyc/mapper/ent/InEntListMapper.java | 2 +- .../com/rzyc/mapper/ent/InListItemMapper.java | 3 +- .../src/main/java/com/rzyc/model/InPost.java | 3 + .../com/rzyc/model/RkSourceStatistic.java | 6 +- .../com/rzyc/model/dto/InListItemAddDto.java | 11 + .../java/com/rzyc/model/dto/InPostDto.java | 75 ++++ .../com/rzyc/model/dto/InPostItemDto.java | 98 +++++ .../com/rzyc/model/dto/InPostListDto.java | 97 +++++ .../main/java/com/rzyc/model/ent/EntPost.java | 2 +- .../java/com/rzyc/model/ent/InListItem.java | 11 + .../resources/mapper/EntPostListMapper.xml | 20 +- .../main/resources/mapper/RkSourcesMapper.xml | 3 + .../resources/mapper/ent/InListItemMapper.xml | 3 + .../mapper/ent/SysEnterpriseMapper.xml | 2 +- .../com/rzyc/controller/BaseController.java | 2 +- .../rzyc/controller/PcCheckController.java | 21 +- .../rzyc/controller/PcCompanyController.java | 26 ++ .../com/rzyc/service/PcBusinessService.java | 9 +- .../com/rzyc/service/SaveEntListThread.java | 2 +- .../rzyc/service/SaveIndustryPostThread.java | 2 +- .../com/rzyc/controller/BaseController.java | 34 +- .../rzyc/controller/BigdataController.java | 4 +- .../controller/IndustryListController.java | 103 ++++- .../rzyc/controller/MinWorkController.java | 64 ++- .../controller/ent/PcCheckController.java | 2 + .../controller/ent/PcCompanyController.java | 44 +- .../rzyc/service/AssignmentTaskThread.java | 397 ++++++++++++++++++ .../com/rzyc/service/PcBusinessService.java | 29 +- .../com/rzyc/service/SaveEntListThread.java | 3 +- .../service/SaveEntPostAndUserThread.java | 85 +++- .../rzyc/service/SaveIndustryPostThread.java | 20 +- 35 files changed, 1161 insertions(+), 81 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/enums/PostListType.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/dto/InPostDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/dto/InPostItemDto.java create mode 100644 inventory-dao/src/main/java/com/rzyc/model/dto/InPostListDto.java create mode 100644 inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java diff --git a/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java b/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java index 07e7853..ed8be44 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/SysEnterpriseDo.java @@ -3,6 +3,8 @@ package com.rzyc.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; +import java.util.Date; + @Api("新增企业参数类") public class SysEnterpriseDo { private String sysenterpriseid; @@ -59,7 +61,7 @@ public class SysEnterpriseDo { @ApiModelProperty("安全管理人员联系方式") private String safeTelephone; @ApiModelProperty("从业人员") - private String personcount; + private Integer personcount; @ApiModelProperty("主管部门id") private String managerDept; @ApiModelProperty("管理部门") @@ -83,7 +85,7 @@ public class SysEnterpriseDo { @ApiModelProperty("用户id") private String userId; - private String establishdate; + private Date establishdate; @ApiModelProperty("企业简介") private String comments; @@ -112,11 +114,11 @@ public class SysEnterpriseDo { this.workClassId = workClassId; } - public String getEstablishdate() { + public Date getEstablishdate() { return establishdate; } - public void setEstablishdate(String establishdate) { + public void setEstablishdate(Date establishdate) { this.establishdate = establishdate; } @@ -272,11 +274,11 @@ public class SysEnterpriseDo { this.safeTelephone = safeTelephone; } - public String getPersoncount() { + public Integer getPersoncount() { return personcount; } - public void setPersoncount(String personcount) { + public void setPersoncount(Integer personcount) { this.personcount = personcount; } diff --git a/inventory-dao/src/main/java/com/rzyc/enums/PostListType.java b/inventory-dao/src/main/java/com/rzyc/enums/PostListType.java new file mode 100644 index 0000000..8b8dced --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/enums/PostListType.java @@ -0,0 +1,21 @@ +package com.rzyc.enums; + +public enum PostListType { + + LIST_TYPE_IS(1), + LIST_TYPE_NO(2); + + private Integer type; + + PostListType(Integer type) { + this.type = type; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java index 0354a69..b93e3b1 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/EntPostListMapper.java @@ -54,7 +54,7 @@ public interface EntPostListMapper extends BaseMapper { /** - * 企业清单(类型)分组查询 + * 企业清单(类型)分组查询（公共） * @param enterpriseId 企业id * @param listId 清单id * @param userId 用户id @@ -62,6 +62,16 @@ public interface EntPostListMapper extends BaseMapper { */ ListselectEntListGroupByListId(@Param("enterpriseId") String enterpriseId,@Param("listId")String listId,@Param("userId")String userId); + /** + * 企业清单(类型)分组查询（岗位） + * @param enterpriseId 企业id + * @param listId 清单id + * @param userId 用户id + * @return int 企业清单(类型) + */ + ListselectEntListGroupByPostListId(@Param("enterpriseId") String enterpriseId,@Param("listId")String listId,@Param("userId")String userId); + + /** * 删除企业用户岗位清单 @@ -69,4 +79,13 @@ public interface EntPostListMapper extends BaseMapper { * @return int */ Integer deleteEntPostList(String entUserId); + + + /** + * 修改清单完成状态 + * @param listId + * @param finishState + * @return int + */ + Integer updateFishState(@Param("listId") String listId,@Param("finishState")Integer finishState); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/RkSourcesMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/RkSourcesMapper.java index 664d557..610131e 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/RkSourcesMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/RkSourcesMapper.java @@ -41,10 +41,11 @@ public interface RkSourcesMapper extends BaseMapper { /** * 危险源统计 + * @param orgCode * @param industryId * @return RkSources * */ - List sourcesEntStatistic(@Param("industryId") String industryId); + List sourcesEntStatistic(@Param("industryId") String industryId,@Param("orgCode")String orgCode); /** diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java index 37ddea5..0bf2c30 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java @@ -20,7 +20,7 @@ import java.util.List; public interface InEntListMapper extends BaseMapper { /** - * 查询企业清单类型 + * 查询企业清单类型(不查询出企业岗位的清单) * @param enterpriseId 企业id * @return list * */ diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java index 8b7cd7b..e8f8fdd 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java @@ -19,7 +19,8 @@ import java.util.List; @Repository public interface InListItemMapper extends BaseMapper { - List selectContents(@Param("industryId") String industryId, @Param("listId")String listId); + List selectContents(@Param("industryId") String industryId, @Param("listId")String listId,@Param("postList")Integer postList); + /*通过行业查询清单信息*/ List findByIndustryId(@Param("industryId") String industryId); diff --git a/inventory-dao/src/main/java/com/rzyc/model/InPost.java b/inventory-dao/src/main/java/com/rzyc/model/InPost.java index 9222b06..c930dfa 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/InPost.java +++ b/inventory-dao/src/main/java/com/rzyc/model/InPost.java @@ -32,6 +32,9 @@ public class InPost implements Serializable { this.publicPostLevel = publicPostLevel; } + public InPost() { + } + @ApiModelProperty(value = "主键") @TableId("public_post_id") private String publicPostId; diff --git a/inventory-dao/src/main/java/com/rzyc/model/RkSourceStatistic.java b/inventory-dao/src/main/java/com/rzyc/model/RkSourceStatistic.java index c083cfd..68cc22c 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/RkSourceStatistic.java +++ b/inventory-dao/src/main/java/com/rzyc/model/RkSourceStatistic.java @@ -7,7 +7,7 @@ package com.rzyc.model; */ public class RkSourceStatistic { - private String riskTypeCount; + private Integer riskTypeCount; private long entCount; @@ -29,11 +29,11 @@ public class RkSourceStatistic { this.industryClassName = industryClassName; } - public String getRiskTypeCount() { + public Integer getRiskTypeCount() { return riskTypeCount; } - public void setRiskTypeCount(String riskTypeCount) { + public void setRiskTypeCount(Integer riskTypeCount) { this.riskTypeCount = riskTypeCount; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java index 29a434a..cfafbf2 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemAddDto.java @@ -52,6 +52,17 @@ public class InListItemAddDto { @ApiModelProperty(value = "清单法律法规") private String itemLaw; + @ApiModelProperty(value = "1.是岗位 2.是公共") + private Integer postList; + + + public Integer getPostList() { + return postList; + } + + public void setPostList(Integer postList) { + this.postList = postList; + } public String getItemTitle() { return itemTitle; diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InPostDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InPostDto.java new file mode 100644 index 0000000..c39b57e --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InPostDto.java @@ -0,0 +1,75 @@ +package com.rzyc.model.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +/** + * @author Xuwanxin + * @date 2023/3/22 + * */ +public class InPostDto { + + @ApiModelProperty(value = "岗位名") + @TableField("public_post_name") + private String publicPostName; + + @ApiModelProperty(value = "岗位路径") + @TableField("public_post_path") + private String publicPostPath; + + @ApiModelProperty(value = "岗位层级") + @TableField("public_post_level") + private Integer publicPostLevel = 1; + + + @ApiModelProperty("行业id") + @TableField("industry_id") + private String industryId; + + @ApiModelProperty("行业名") + @TableField("industry_name") + private String industryName; + + public String getIndustryName() { + return industryName; + } + + public void setIndustryName(String industryName) { + this.industryName = industryName; + } + + public String getPublicPostName() { + return publicPostName; + } + + public void setPublicPostName(String publicPostName) { + this.publicPostName = publicPostName; + } + + public String getPublicPostPath() { + return publicPostPath; + } + + public void setPublicPostPath(String publicPostPath) { + this.publicPostPath = publicPostPath; + } + + public Integer getPublicPostLevel() { + return publicPostLevel; + } + + public void setPublicPostLevel(Integer publicPostLevel) { + this.publicPostLevel = publicPostLevel; + } + + public String getIndustryId() { + return industryId; + } + + public void setIndustryId(String industryId) { + this.industryId = industryId; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InPostItemDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InPostItemDto.java new file mode 100644 index 0000000..e4067bd --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InPostItemDto.java @@ -0,0 +1,98 @@ +package com.rzyc.model.dto; + +import io.swagger.annotations.ApiModelProperty; +/** + * @author Xuwanxin + * @date 2023/3/22 + * + * */ +public class InPostItemDto { + + + @ApiModelProperty(value = "公共岗位id") + private String postId; + + @ApiModelProperty(value = "行业id") + private String industryId; + + @ApiModelProperty("清单id") + private String itemId; + + @ApiModelProperty(value = "清单标题") + private String itemTitle; + + @ApiModelProperty(value = "清单内容") + private String itemContent; + + @ApiModelProperty(value = "考核指标 1:每年 2：每半年 4：每季度 12:每月") + private Integer standard; + + @ApiModelProperty(value = "频率") + private Integer frequency; + + private Integer postList; + + public Integer getPostList() { + return postList; + } + + public void setPostList(Integer postList) { + this.postList = postList; + } + + public String getPostId() { + return postId; + } + + public void setPostId(String postId) { + this.postId = postId; + } + + public String getIndustryId() { + return industryId; + } + + public void setIndustryId(String industryId) { + this.industryId = industryId; + } + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getItemTitle() { + return itemTitle; + } + + public void setItemTitle(String itemTitle) { + this.itemTitle = itemTitle; + } + + public String getItemContent() { + return itemContent; + } + + public void setItemContent(String itemContent) { + this.itemContent = itemContent; + } + + public Integer getStandard() { + return standard; + } + + public void setStandard(Integer standard) { + this.standard = standard; + } + + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InPostListDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InPostListDto.java new file mode 100644 index 0000000..bc1931b --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InPostListDto.java @@ -0,0 +1,97 @@ +package com.rzyc.model.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +public class InPostListDto { + + + @ApiModelProperty(value = "岗位履职清单id") + @TableId("public_post_list_id") + private String publicPostListId; + + @ApiModelProperty(value = "岗位id") + @TableField("public_post_id") + private String publicPostId; + + @ApiModelProperty(value = "清单标题") + @TableField("public_item_title") + private String publicItemTitle; + + @ApiModelProperty(value = "清单内容") + @TableField("public_item_content") + private String publicItemContent; + + @ApiModelProperty(value = "排序") + @TableField("sort_id") + private Integer sortId; + + + + @ApiModelProperty(value = "考核指标 1:每年 2：每半年 4：每季度 12:每月") + @TableField("standard") + private Integer standard; + + @ApiModelProperty(value = "频率") + @TableField("frequency") + private Integer frequency; + + public String getPublicPostListId() { + return publicPostListId; + } + + public void setPublicPostListId(String publicPostListId) { + this.publicPostListId = publicPostListId; + } + + public String getPublicPostId() { + return publicPostId; + } + + public void setPublicPostId(String publicPostId) { + this.publicPostId = publicPostId; + } + + public String getPublicItemTitle() { + return publicItemTitle; + } + + public void setPublicItemTitle(String publicItemTitle) { + this.publicItemTitle = publicItemTitle; + } + + public String getPublicItemContent() { + return publicItemContent; + } + + public void setPublicItemContent(String publicItemContent) { + this.publicItemContent = publicItemContent; + } + + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + + public Integer getStandard() { + return standard; + } + + public void setStandard(Integer standard) { + this.standard = standard; + } + + public Integer getFrequency() { + return frequency; + } + + public void setFrequency(Integer frequency) { + this.frequency = frequency; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/EntPost.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPost.java index d8c5264..8c27e19 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/EntPost.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntPost.java @@ -81,7 +81,7 @@ public class EntPost implements Serializable { private Listchildren; @ApiModelProperty(value = "公共岗位id") - @TableField(exist = false) + @TableField(exist = true) private String publicPostId; public String getPublicPostId() { diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java index 7cb933d..06fc443 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InListItem.java @@ -90,6 +90,17 @@ public class InListItem implements Serializable { @TableField("modify_by") private String modifyBy; + @ApiModelProperty(value = "1.是岗位 2.是公共") + @TableField("post_list") + private Integer postList; + + public Integer getPostList() { + return postList; + } + + public void setPostList(Integer postList) { + this.postList = postList; + } public String getItemTitle() { return itemTitle; diff --git a/inventory-dao/src/main/resources/mapper/EntPostListMapper.xml b/inventory-dao/src/main/resources/mapper/EntPostListMapper.xml index 7d356b4..99eda34 100644 --- a/inventory-dao/src/main/resources/mapper/EntPostListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/EntPostListMapper.xml @@ -32,6 +32,10 @@ post_list_id, post_id, ent_user_id, enterprise_id, ent_list_id, list_id, item_title, item_content, sort_id, year_num, standard, frequency, finish_state, red_alert, yellow_alert, del_state, create_time, create_by, modify_time, modify_by + + update ent_post_list set finish_state = #{finishState} where post_list_id = #{listId} + + delete from ent_post_list where ent_user_id = #{entUserId} @@ -84,7 +88,7 @@ from ent_post_list epl left join ent_post_task ept on epl.post_list_id = ept.ent_list_id left join in_list il on epl.list_id = il.list_id - where epl.enterprise_id = #{enterpriseId} + where epl.enterprise_id = #{enterpriseId} and il.name is not null and epl.ent_user_id = #{userId} @@ -93,6 +97,20 @@ group by il.list_id + diff --git a/inventory-dao/src/main/resources/mapper/RkSourcesMapper.xml b/inventory-dao/src/main/resources/mapper/RkSourcesMapper.xml index c58053e..6e9859f 100644 --- a/inventory-dao/src/main/resources/mapper/RkSourcesMapper.xml +++ b/inventory-dao/src/main/resources/mapper/RkSourcesMapper.xml @@ -106,6 +106,9 @@ and rs.base_inclass_id = #{industryId} + + and se.area_code = #{orgCode} + group by rs.base_inclass_id diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml index f24de01..2ec2cfa 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml @@ -47,6 +47,9 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod