diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemListDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemListDto.java new file mode 100644 index 0000000..24c4f57 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemListDto.java @@ -0,0 +1,51 @@ +package com.rzyc.bean.ex; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * 考核项指标查询 + * @version v1.0 + * @author dong + * @date 2024/4/1 17:01 + */ +@ApiModel("考核指标查询") +public class ItemListDto { + + @ApiModelProperty(value = "考核项id 不传返回第一级 传返回下级") + private String itemId; + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) + private Integer examineState; + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/StandardListDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/StandardListDto.java new file mode 100644 index 0000000..fe12a4f --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/StandardListDto.java @@ -0,0 +1,41 @@ +package com.rzyc.bean.ex; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * 普通考核标准 + * @author dong + * @date 2024-04-01 16:25 + * @Version V1.0 + */ +@ApiModel("普通考核标准") +public class StandardListDto { + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) + private Integer examineState; + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/StandardListUnitDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/StandardListUnitDto.java new file mode 100644 index 0000000..e8196d0 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/StandardListUnitDto.java @@ -0,0 +1,50 @@ +package com.rzyc.bean.ex; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.NotNull; + +/** + * @author dong + * @date 2024-04-01 17:23 + * @Version V1.0 + */ +@ApiModel("个性考核项列表") +public class StandardListUnitDto { + + @NotNull(message = "考核类型不能为空") + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) + private Integer examineState; + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + @ApiModelProperty(value = "部门id") + private String listperformid; + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getListperformid() { + return listperformid; + } + + public void setListperformid(String listperformid) { + this.listperformid = listperformid; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java index f0621e3..d87a240 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java @@ -2,6 +2,9 @@ package com.rzyc.mapper.ex; import com.rzyc.model.ex.ExExamineItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +16,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ExExamineItemMapper extends BaseMapper { + /*考核项列表*/ + List itemList(@Param("examineId") String examineId, + @Param("examineState") Integer examineState); + + /*顶级考核项*/ + List topItemList(@Param("examineId") String examineId, + @Param("examineState") Integer examineState); + + /*通过父级查询*/ + List findByParentId(@Param("parentId") String parentId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java index 2d59df3..ac9c78a 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java @@ -2,6 +2,9 @@ package com.rzyc.mapper.ex; import com.rzyc.model.ex.ExStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ExStandardMapper extends BaseMapper { + /*普通评分标准*/ + List standardList(@Param("itemType") Integer itemType, + @Param("examineState") Integer examineState, + @Param("examineId") String examineId); + + /*部门个性评分标准*/ + List unitStandardList(@Param("itemType") Integer itemType, + @Param("examineState") Integer examineState, + @Param("examineId") String examineId, + @Param("performId") String performId); + } diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java index 9390fb3..29daed5 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java @@ -5,6 +5,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,6 +48,10 @@ public class ExExamineItem implements Serializable { @TableField("parent_path") private String parentPath; + @ApiModelProperty(value = "党政同责考核类型 1、负有安全生产监管职责的部门 2、其他有关部门 3、属地") + @TableField("examine_state") + private Integer examineState; + @ApiModelProperty(value = "考核项类型 1、普通 2、个性 3、加分项") @TableField("item_type") private Integer itemType; @@ -58,6 +64,7 @@ public class ExExamineItem implements Serializable { @TableField("del_state") private Integer delState; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; @@ -66,6 +73,7 @@ public class ExExamineItem implements Serializable { @TableField("create_by") private String createBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "修改时间") @TableField("modify_time") private Date modifyTime; @@ -74,6 +82,14 @@ public class ExExamineItem implements Serializable { @TableField("modify_by") private String modifyBy; + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + public String getExamineId() { return examineId; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java index 6e78f46..a057fe2 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java @@ -5,6 +5,8 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -66,6 +68,7 @@ public class ExStandard implements Serializable { @TableField("del_state") private Integer delState; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; @@ -74,6 +77,7 @@ public class ExStandard implements Serializable { @TableField("create_by") private String createBy; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "修改时间") @TableField("modify_time") private Date modifyTime; @@ -82,6 +86,90 @@ public class ExStandard implements Serializable { @TableField("modify_by") private String modifyBy; + @ApiModelProperty("考核指标") + @TableField(exist = false) + private String indexName; + + @ApiModelProperty("考核指标id 传使用该id 不传则新增考核指标") + @TableField(exist = false) + private String indexId; + + @ApiModelProperty("考核要点") + @TableField(exist = false) + private String pointName; + + @ApiModelProperty("考核要点id 传使用该id 不传则新增考核要点") + @TableField(exist = false) + private String pointId; + + @ApiModelProperty("考核内容") + @TableField(exist = false) + private String content; + + @ApiModelProperty("考核内容id 传使用该id 不传则新增考核内容") + @TableField(exist = false) + private String contentId; + + @ApiModelProperty("部门名") + @TableField(exist = false) + private String performName; + + public String getPerformName() { + return performName; + } + + public void setPerformName(String performName) { + this.performName = performName; + } + + public String getIndexName() { + return indexName; + } + + public void setIndexName(String indexName) { + this.indexName = indexName; + } + + public String getIndexId() { + return indexId; + } + + public void setIndexId(String indexId) { + this.indexId = indexId; + } + + public String getPointName() { + return pointName; + } + + public void setPointName(String pointName) { + this.pointName = pointName; + } + + public String getPointId() { + return pointId; + } + + public void setPointId(String pointId) { + this.pointId = pointId; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentId() { + return contentId; + } + + public void setContentId(String contentId) { + this.contentId = contentId; + } + public String getExamineId() { return examineId; } diff --git a/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml index e72e11e..84f50e4 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml @@ -10,6 +10,7 @@ + @@ -21,8 +22,30 @@ - item_id, examine_id,title, item_score, parent_id, parent_path, item_type, sort_id, + item_id, examine_id,title, item_score, parent_id, parent_path, + examine_state,item_type, sort_id, del_state, create_time, create_by, modify_time, modify_by + + + + + + + + + diff --git a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml index f3a8dc0..fa4f7bd 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml @@ -11,6 +11,7 @@ + @@ -27,4 +28,29 @@ item_type, sort_id, del_state, create_time, create_by, modify_time, modify_by + + + + + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java index 0b37cae..64d868a 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java @@ -24,8 +24,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 党政同责考核模块 @@ -116,17 +115,17 @@ public class ExamineController extends BaseController{ //考核指标 if(StringUtils.isBlank(indexId)){ - indexId = examineItemAdd(itemAddDto.getIndexName(),null, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId()); + indexId = examineItemAdd(itemAddDto.getIndexName(),null, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); } //考核要点 if(StringUtils.isBlank(pointId)){ - pointId = examineItemAdd(itemAddDto.getPointName(),indexId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId()); + pointId = examineItemAdd(itemAddDto.getPointName(),indexId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); } //考核内容 if(StringUtils.isBlank(contentId)){ - contentId = examineItemAdd(itemAddDto.getContent(),pointId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId()); + contentId = examineItemAdd(itemAddDto.getContent(),pointId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); } //考核内容信息 @@ -163,13 +162,15 @@ public class ExamineController extends BaseController{ * @author dong * @date 2024/4/1 14:45 */ - private String examineItemAdd(String title,String parentId,Integer itemType,String examineId)throws Exception{ + private String examineItemAdd(String title,String parentId,Integer itemType, + String examineId,Integer examineState)throws Exception{ String userId = getUserId(); ExExamineItem examineItem = new ExExamineItem(); examineItem.setItemId(RandomNumber.getUUid()); examineItem.setExamineId(examineId); examineItem.setTitle(title); examineItem.setItemType(itemType); + examineItem.setExamineState(examineState); examineItem.setSortId(1); examineItem.setDelState(DelState.NOT_DEL.getState()); examineItem.setCreateBy(userId); @@ -274,9 +275,98 @@ public class ExamineController extends BaseController{ @LoginAuth @ApiOperation(value = "普通考核项列表", notes = "普通考核项列表") @GetMapping(value = "standardList") - public MultiResult standardList()throws Exception{ + public MultiResult standardList(@Valid StandardListDto standardListDto)throws Exception{ MultiResult result = new MultiResult<>(); + + //指标项 + Map examineItemMap = new HashMap<>(); + List examineItems = exExamineItemMapper.itemList(standardListDto.getExamineId(),standardListDto.getExamineState()); + if(null != examineItems && examineItems.size() > 0){ + for (ExExamineItem examineItem : examineItems){ + examineItemMap.put(examineItem.getItemId(),examineItem.getTitle()); + } + } + + //评分标准 + List standards = exStandardMapper.standardList(ExItemType.ORDINARY.getType(),standardListDto.getExamineState(),standardListDto.getExamineId()); + if(null != standards && standards.size() > 0){ + for (ExStandard standard : standards){ + String[] strs = standard.getItemPath().split(","); + if(null != strs && 3 == strs.length ){ + //考核指标 + standard.setIndexId(strs[0]); + standard.setIndexName(examineItemMap.get(strs[0])); + //考核要点 + standard.setPointId(strs[1]); + standard.setPointName(examineItemMap.get(strs[1])); + //考核内容 + standard.setContentId(strs[2]); + standard.setContent(examineItemMap.get(strs[2])); + } + } + } + result.setData(standards); return result; } + + /** + * 考核指标列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 17:07 + */ + @LoginAuth + @ApiOperation(value = "考核指标列表", notes = "考核指标列表") + @GetMapping(value = "itemList") + public MultiResult itemList(@Valid ItemListDto itemListDto)throws Exception{ + MultiResult result = new MultiResult<>(); + + List examineItems = new ArrayList<>(); + if(StringUtils.isBlank(itemListDto.getItemId())){ + examineItems = exExamineItemMapper.topItemList(itemListDto.getExamineId(),itemListDto.getExamineState()); + }else{ + examineItems = exExamineItemMapper.findByParentId(itemListDto.getItemId()); + } + result.setData(examineItems); + return result; + } + + /** + * 加分项考核项列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 15:57 + */ + @LoginAuth + @ApiOperation(value = "加分项考核项列表", notes = "加分项考核项列表") + @GetMapping(value = "standardListBonus") + public MultiResult standardListBonus(@Valid StandardListDto standardListDto)throws Exception{ + MultiResult result = new MultiResult<>(); + + //评分标准 + List standards = exStandardMapper.standardList(ExItemType.BONUS_POINT.getType(),standardListDto.getExamineState(),standardListDto.getExamineId()); + result.setData(standards); + return result; + } + + /** + * 个性考核项列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 15:57 + */ + @LoginAuth + @ApiOperation(value = "个性考核项列表", notes = "个性考核项列表") + @GetMapping(value = "standardListUnit") + public MultiResult standardListUnit(@Valid StandardListUnitDto standardListUnitDto)throws Exception{ + MultiResult result = new MultiResult<>(); + //评分标准 + List standards = exStandardMapper.unitStandardList(ExItemType.PERSONALITY.getType(),standardListUnitDto.getExamineState(),standardListUnitDto.getExamineId(),standardListUnitDto.getListperformid()); + result.setData(standards); + return result; + } + + + }