评分标准查询

This commit is contained in:
mythxb 2024-04-01 17:30:43 +08:00
parent bfbda05bdc
commit d03013db06
10 changed files with 420 additions and 8 deletions

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
/**
* <p>
@ -13,4 +16,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ExExamineItemMapper extends BaseMapper<ExExamineItem> {
/*考核项列表*/
List<ExExamineItem> itemList(@Param("examineId") String examineId,
@Param("examineState") Integer examineState);
/*顶级考核项*/
List<ExExamineItem> topItemList(@Param("examineId") String examineId,
@Param("examineState") Integer examineState);
/*通过父级查询*/
List<ExExamineItem> findByParentId(@Param("parentId") String parentId);
}

View File

@ -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;
/**
* <p>
@ -13,4 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ExStandardMapper extends BaseMapper<ExStandard> {
/*普通评分标准*/
List<ExStandard> standardList(@Param("itemType") Integer itemType,
@Param("examineState") Integer examineState,
@Param("examineId") String examineId);
/*部门个性评分标准*/
List<ExStandard> unitStandardList(@Param("itemType") Integer itemType,
@Param("examineState") Integer examineState,
@Param("examineId") String examineId,
@Param("performId") String performId);
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -10,6 +10,7 @@
<result column="item_score" property="itemScore" />
<result column="parent_id" property="parentId" />
<result column="parent_path" property="parentPath" />
<result column="examine_state" property="examineState" />
<result column="item_type" property="itemType" />
<result column="sort_id" property="sortId" />
<result column="del_state" property="delState" />
@ -21,8 +22,30 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
<!--考核项列表-->
<select id="itemList" resultMap="BaseResultMap">
SELECT * FROM `ex_examine_item` ei
WHERE ei.`examine_id` = #{examineId}
AND ei.`examine_state` = #{examineState}
</select>
<!--顶级考核项列表-->
<select id="topItemList" resultMap="BaseResultMap">
SELECT * FROM `ex_examine_item` ei
WHERE ei.`examine_id` = #{examineId}
AND ei.`examine_state` = #{examineState}
AND (ei.`parent_id` IS NULL OR ei.`parent_id` = '')
</select>
<!--通过父级查询-->
<select id="findByParentId" resultMap="BaseResultMap">
SELECT ei.* FROM `ex_examine_item` ei
where ei.parent_id = #{parentId}
</select>
</mapper>

View File

@ -11,6 +11,7 @@
<result column="item_id" property="itemId" />
<result column="item_path" property="itemPath" />
<result column="perform_id" property="performId" />
<result column="PerformClassName" property="performName" />
<result column="examine_state" property="examineState" />
<result column="item_type" property="itemType" />
<result column="sort_id" property="sortId" />
@ -27,4 +28,29 @@
item_type, sort_id, del_state, create_time, create_by, modify_time, modify_by
</sql>
<!--普通评分标准-->
<select id="standardList" resultMap="BaseResultMap">
SELECT es.* FROM ex_standard es
WHERE es.`item_type` = #{itemType}
AND es.`examine_state` = #{examineState}
AND es.`examine_id` = #{examineId}
ORDER BY es.`sort_id` ASC
</select>
<!--部门个性评分标准-->
<select id="unitStandardList" resultMap="BaseResultMap">
SELECT lf.`PerformClassName`, es.*
FROM ex_standard es
LEFT JOIN `listperform` lf ON es.`perform_id` = lf.`ListPerformId`
WHERE es.`item_type` = #{itemType}
AND es.`examine_state` = #{examineState}
AND es.`examine_id` = #{examineId}
<if test="null != performId and '' != performId">
AND es.`perform_id` = #{performId}
</if>
ORDER BY es.`sort_id` ASC
</select>
</mapper>

View File

@ -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<ExStandard> standardList()throws Exception{
public MultiResult<ExStandard> standardList(@Valid StandardListDto standardListDto)throws Exception{
MultiResult<ExStandard> result = new MultiResult<>();
//指标项
Map<String,String> examineItemMap = new HashMap<>();
List<ExExamineItem> examineItems = exExamineItemMapper.itemList(standardListDto.getExamineId(),standardListDto.getExamineState());
if(null != examineItems && examineItems.size() > 0){
for (ExExamineItem examineItem : examineItems){
examineItemMap.put(examineItem.getItemId(),examineItem.getTitle());
}
}
//评分标准
List<ExStandard> 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<ExExamineItem> itemList(@Valid ItemListDto itemListDto)throws Exception{
MultiResult<ExExamineItem> result = new MultiResult<>();
List<ExExamineItem> 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<ExStandard> standardListBonus(@Valid StandardListDto standardListDto)throws Exception{
MultiResult<ExStandard> result = new MultiResult<>();
//评分标准
List<ExStandard> 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<ExStandard> standardListUnit(@Valid StandardListUnitDto standardListUnitDto)throws Exception{
MultiResult<ExStandard> result = new MultiResult<>();
//评分标准
List<ExStandard> standards = exStandardMapper.unitStandardList(ExItemType.PERSONALITY.getType(),standardListUnitDto.getExamineState(),standardListUnitDto.getExamineId(),standardListUnitDto.getListperformid());
result.setData(standards);
return result;
}
}