diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java index 0a0577d..c84499d 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java @@ -33,6 +33,18 @@ public class ItemAddBonusDto { @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true) private Integer examineState; + @NotNull(message = "标准分数不能为空") + @ApiModelProperty(value = "标准分数",required = true) + private Double score; + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + public String getStandardId() { return standardId; } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java index 40ec04f..acbc820 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java @@ -40,7 +40,7 @@ public class ItemAddSpecificDto { @NotNull(message="部门不能为空") @ApiModelProperty(value = "部门id",required = true) - private String listperformid; + private String performId; public String getStandardId() { return standardId; @@ -90,11 +90,11 @@ public class ItemAddSpecificDto { this.score = score; } - public String getListperformid() { - return listperformid; + public String getPerformId() { + return performId; } - public void setListperformid(String listperformid) { - this.listperformid = listperformid; + public void setPerformId(String performId) { + this.performId = performId; } } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java new file mode 100644 index 0000000..f332175 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java @@ -0,0 +1,40 @@ +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-02 9:28 + * @Version V1.0 + */ +@ApiModel("部门普通考核项列表") +public class UnitStandardDto { + + @NotNull(message = "用户id不能为空") + @ApiModelProperty(value = "用户id",required = true) + private String userId; + + @NotNull(message = "考核不能为空") + @ApiModelProperty(value = "考核id",required = true) + private String examineId; + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitUploadDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitUploadDto.java new file mode 100644 index 0000000..4136bb1 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitUploadDto.java @@ -0,0 +1,75 @@ +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-02 13:51 + * @Version V1.0 + */ +@ApiModel("部门上传资料") +public class UnitUploadDto { + + @NotNull(message = "用户不能为空") + @ApiModelProperty(value = "用户id",required = true) + private String userId; + + @NotNull(message = "评分标准不能为空") + @ApiModelProperty(value = "评分标准id",required = true) + private String standardId; + + @NotNull(message = "文件名不能为空") + @ApiModelProperty(value = "文件名",required = true) + private String fileName; + + @NotNull(message = "文件路径不能为空") + @ApiModelProperty(value = "文件路径",required = true) + private String filePath; + + @ApiModelProperty("备注") + private String remarks; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getStandardId() { + return standardId; + } + + public void setStandardId(String standardId) { + this.standardId = standardId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java new file mode 100644 index 0000000..330b9d4 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/vo/StandardInfo.java @@ -0,0 +1,259 @@ +package com.rzyc.bean.ex.vo; + +import com.rzyc.model.ex.ExScoreFile; +import io.swagger.annotations.ApiModelProperty; + +import java.util.List; + + +/** + * 考核项评分信息 + * @author dong + * @date 2024-04-02 14:52 + * @Version V1.0 + */ +public class StandardInfo { + + + @ApiModelProperty(value = "评分标准id") + private String standardId; + + @ApiModelProperty(value = "考核id") + private String examineId; + + @ApiModelProperty(value = "评分标准") + private String title; + + @ApiModelProperty(value = "分数") + private Double score; + + @ApiModelProperty(value = "考核项id") + private String itemId; + + @ApiModelProperty(value = "考核项路径") + private String itemPath; + + @ApiModelProperty(value = "部门id 个性清单时选择") + private String performId; + + @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、属地") + private Integer examineState; + + @ApiModelProperty(value = "考核项类型 1、普通 2、个性 3、加分项") + private Integer itemType; + + @ApiModelProperty(value = "排序") + private Integer sortId; + + @ApiModelProperty(value = "删除状态 1：正常 2:已删除") + private Integer delState; + + @ApiModelProperty("考核指标") + private String indexName; + + @ApiModelProperty("考核指标id") + private String indexId; + + @ApiModelProperty("考核要点") + private String pointName; + + @ApiModelProperty("考核要点id") + private String pointId; + + @ApiModelProperty("考核内容") + private String content; + + @ApiModelProperty("考核内容id") + private String contentId; + + @ApiModelProperty("部门名") + private String performName; + + @ApiModelProperty("评分id") + private String socreId; + + @ApiModelProperty("得分") + private Double socreNum; + + @ApiModelProperty("意见建议") + private String opinion; + + @ApiModelProperty("附件") + private List scoreFiles; + + public List getScoreFiles() { + return scoreFiles; + } + + public void setScoreFiles(List scoreFiles) { + this.scoreFiles = scoreFiles; + } + + public String getStandardId() { + return standardId; + } + + public void setStandardId(String standardId) { + this.standardId = standardId; + } + + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } + + public String getItemId() { + return itemId; + } + + public void setItemId(String itemId) { + this.itemId = itemId; + } + + public String getItemPath() { + return itemPath; + } + + public void setItemPath(String itemPath) { + this.itemPath = itemPath; + } + + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + + public Integer getItemType() { + return itemType; + } + + public void setItemType(Integer itemType) { + this.itemType = itemType; + } + + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + + 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 getPerformName() { + return performName; + } + + public void setPerformName(String performName) { + this.performName = performName; + } + + public String getSocreId() { + return socreId; + } + + public void setSocreId(String socreId) { + this.socreId = socreId; + } + + public Double getSocreNum() { + return socreNum; + } + + public void setSocreNum(Double socreNum) { + this.socreNum = socreNum; + } + + public String getOpinion() { + return opinion; + } + + public void setOpinion(String opinion) { + this.opinion = opinion; + } +} 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 d87a240..6533ef5 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 @@ -26,4 +26,10 @@ public interface ExExamineItemMapper extends BaseMapper { /*通过父级查询*/ List findByParentId(@Param("parentId") String parentId); + + /*根据标题查询*/ + ExExamineItem findByTitile(@Param("examineId") String examineId, + @Param("examineState") Integer examineState, + @Param("title") String title, + @Param("parentId") String parentId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java index 23efa3f..7c11e83 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java @@ -20,6 +20,9 @@ public interface ExExamineMapper extends BaseMapper { List examineList(@Param("delState") Integer delState, @Param("yearNum") String yearNum, @Param("condition") String condition); + /*考核列表*/ + List findAll(@Param("delState") Integer delState); + /*按照年份查询*/ ExExamine findByYear(@Param("yearNum") String yearNum); diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExPerformMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExPerformMapper.java new file mode 100644 index 0000000..b76a601 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExPerformMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExPerform; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 部门评分信息 Mapper 接口 + *

+ * + * @author + * @since 2024-04-02 + */ +public interface ExPerformMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreFileMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreFileMapper.java new file mode 100644 index 0000000..549900e --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreFileMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExScoreFile; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 评分附件 Mapper 接口 + *

+ * + * @author + * @since 2024-04-02 + */ +public interface ExScoreFileMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreMapper.java new file mode 100644 index 0000000..35edf07 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreMapper.java @@ -0,0 +1,23 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExScore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import javax.validation.Valid; + +/** + *

+ * 评分信息 Mapper 接口 + *

+ * + * @author + * @since 2024-04-02 + */ +public interface ExScoreMapper extends BaseMapper { + + /*部门评分信息*/ + ExScore findByPerformId(@Param("standardId") String standardId, + @Param("performId") String performId); + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreRecordMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreRecordMapper.java new file mode 100644 index 0000000..a06336e --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ex/ExScoreRecordMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper.ex; + +import com.rzyc.model.ex.ExScoreRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 评分记录 Mapper 接口 + *

+ * + * @author + * @since 2024-04-02 + */ +public interface ExScoreRecordMapper extends BaseMapper { + +} 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 ac9c78a..38fac25 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 @@ -1,5 +1,6 @@ package com.rzyc.mapper.ex; +import com.rzyc.bean.ex.vo.StandardInfo; import com.rzyc.model.ex.ExStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -27,4 +28,10 @@ public interface ExStandardMapper extends BaseMapper { @Param("examineId") String examineId, @Param("performId") String performId); + /*标准评分信息*/ + List standardScoreList(@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/ExPerform.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExPerform.java new file mode 100644 index 0000000..8e871fb --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExPerform.java @@ -0,0 +1,139 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 部门评分信息 + *

+ * + * @author + * @since 2024-04-02 + */ +@TableName("ex_perform") +@ApiModel(value="ExPerform对象", description="部门评分信息") +public class ExPerform implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "部门评分id") + @TableId("relation_id") + private String relationId; + + @ApiModelProperty(value = "部门id") + @TableField("perform_id") + private String performId; + + @ApiModelProperty(value = "考核id") + @TableField("examine_id") + private String examineId; + + @ApiModelProperty(value = "得分") + @TableField("socre_num") + private Double socreNum; + + @ApiModelProperty(value = "评分人") + @TableField("user_id") + private String userId; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getRelationId() { + return relationId; + } + + public void setRelationId(String relationId) { + this.relationId = relationId; + } + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + public Double getSocreNum() { + return socreNum; + } + + public void setSocreNum(Double socreNum) { + this.socreNum = socreNum; + } + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExPerform{" + + "relationId=" + relationId + + ", performId=" + performId + + ", examineId=" + examineId + + ", socreNum=" + socreNum + + ", userId=" + userId + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java new file mode 100644 index 0000000..bec97a0 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScore.java @@ -0,0 +1,163 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 评分信息 + *

+ * + * @author + * @since 2024-04-02 + */ +@TableName("ex_score") +@ApiModel(value="ExScore对象", description="评分信息") +public class ExScore implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评分id") + @TableId("socre_id") + private String socreId; + + @ApiModelProperty(value = "考核id") + @TableField("examine_id") + private String examineId; + + @ApiModelProperty(value = "评分标准id") + @TableField("standard_id") + private String standardId; + + @ApiModelProperty(value = "部门id") + @TableField("perform_id") + private String performId; + + @ApiModelProperty(value = "得分") + @TableField("socre_num") + private Double socreNum; + + @ApiModelProperty(value = "意见建议") + @TableField("opinion") + private String opinion; + + @ApiModelProperty(value = "评分人") + @TableField("user_id") + private String userId; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改数据") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getSocreId() { + return socreId; + } + + public void setSocreId(String socreId) { + this.socreId = socreId; + } + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + public String getStandardId() { + return standardId; + } + + public void setStandardId(String standardId) { + this.standardId = standardId; + } + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + public Double getSocreNum() { + return socreNum; + } + + public void setSocreNum(Double socreNum) { + this.socreNum = socreNum; + } + public String getOpinion() { + return opinion; + } + + public void setOpinion(String opinion) { + this.opinion = opinion; + } + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExScore{" + + "socreId=" + socreId + + ", examineId=" + examineId + + ", standardId=" + standardId + + ", performId=" + performId + + ", socreNum=" + socreNum + + ", opinion=" + opinion + + ", userId=" + userId + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScoreFile.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScoreFile.java new file mode 100644 index 0000000..fb84513 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScoreFile.java @@ -0,0 +1,175 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 评分附件 + *

+ * + * @author + * @since 2024-04-02 + */ +@TableName("ex_score_file") +@ApiModel(value="ExScoreFile对象", description="评分附件") +public class ExScoreFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "附件id") + @TableId("file_id") + private String fileId; + + @ApiModelProperty(value = "附件链接") + @TableField("file_path") + private String filePath; + + @ApiModelProperty(value = "附件名") + @TableField("file_name") + private String fileName; + + @ApiModelProperty(value = "备注") + @TableField("remarks") + private String remarks; + + @ApiModelProperty(value = "考核id") + @TableField("examine_id") + private String examineId; + + @ApiModelProperty(value = "评分标准id") + @TableField("standard_id") + private String standardId; + + @ApiModelProperty(value = "部门id") + @TableField("perform_id") + private String performId; + + @ApiModelProperty(value = "评分id") + @TableField("socre_id") + private String socreId; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + public String getExamineId() { + return examineId; + } + + public void setExamineId(String examineId) { + this.examineId = examineId; + } + public String getStandardId() { + return standardId; + } + + public void setStandardId(String standardId) { + this.standardId = standardId; + } + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + public String getSocreId() { + return socreId; + } + + public void setSocreId(String socreId) { + this.socreId = socreId; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExScoreFile{" + + "fileId=" + fileId + + ", filePath=" + filePath + + ", fileName=" + fileName + + ", remarks=" + remarks + + ", examineId=" + examineId + + ", standardId=" + standardId + + ", performId=" + performId + + ", socreId=" + socreId + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ex/ExScoreRecord.java b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScoreRecord.java new file mode 100644 index 0000000..294bde1 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/ex/ExScoreRecord.java @@ -0,0 +1,127 @@ +package com.rzyc.model.ex; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 评分记录 + *

+ * + * @author + * @since 2024-04-02 + */ +@TableName("ex_score_record") +@ApiModel(value="ExScoreRecord对象", description="评分记录") +public class ExScoreRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "记录id") + @TableId("record_id") + private String recordId; + + @ApiModelProperty(value = "评分id") + @TableField("socre_id") + private String socreId; + + @ApiModelProperty(value = "分数") + @TableField("socre_num") + private Double socreNum; + + @ApiModelProperty(value = "用户id") + @TableField("user_id") + private String userId; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + public String getSocreId() { + return socreId; + } + + public void setSocreId(String socreId) { + this.socreId = socreId; + } + public Double getSocreNum() { + return socreNum; + } + + public void setSocreNum(Double socreNum) { + this.socreNum = socreNum; + } + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "ExScoreRecord{" + + "recordId=" + recordId + + ", socreId=" + socreId + + ", socreNum=" + socreNum + + ", userId=" + userId + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java index 98243d9..28a4884 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java @@ -1,6 +1,7 @@ package com.rzyc.model.user; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,10 +15,14 @@ import java.util.List; @ApiModel("岗位") public class ListPerform implements Serializable { - @TableField("ListPerformId") + @TableId("ListPerformId") @ApiModelProperty("岗位id") private String listperformid; + @TableField(exist = false) + @ApiModelProperty("岗位id") + private String performId; + @ApiModelProperty("岗位编号") @TableField("PerformClassCode") @@ -127,6 +132,22 @@ public class ListPerform implements Serializable { @TableField("examine_state") private Integer examineState; + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + + public Integer getExamineState() { + return examineState; + } + + public void setExamineState(Integer examineState) { + this.examineState = examineState; + } + private static final long serialVersionUID = 1L; public String getAreaCode() { diff --git a/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml index 84f50e4..3c348fc 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExExamineItemMapper.xml @@ -48,4 +48,16 @@ where ei.parent_id = #{parentId} + + + diff --git a/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml index b081ceb..5f65b36 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExExamineMapper.xml @@ -35,6 +35,13 @@ ORDER BY ex.`year_num` DESC + + + + SELECT * + FROM ex_score es + WHERE es.perform_id = #{performId} + AND es.standard_id = #{standardId} + + + diff --git a/inventory-dao/src/main/resources/mapper/ex/ExScoreRecordMapper.xml b/inventory-dao/src/main/resources/mapper/ex/ExScoreRecordMapper.xml new file mode 100644 index 0000000..cc608d1 --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/ex/ExScoreRecordMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + record_id, socre_id, socre_num, user_id, 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 fa4f7bd..a34265d 100644 --- a/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ex/ExStandardMapper.xml @@ -38,19 +38,71 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index e2b2695..3d719d4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -22,9 +22,7 @@ import com.rzyc.enums.*; import com.rzyc.mapper.*; import com.rzyc.mapper.check.*; import com.rzyc.mapper.ent.*; -import com.rzyc.mapper.ex.ExExamineItemMapper; -import com.rzyc.mapper.ex.ExExamineMapper; -import com.rzyc.mapper.ex.ExStandardMapper; +import com.rzyc.mapper.ex.*; import com.rzyc.mapper.log.*; import com.rzyc.mapper.organization.*; import com.rzyc.mapper.oth.*; @@ -600,6 +598,23 @@ public class BaseController { @Autowired protected ExStandardMapper exStandardMapper; + //部门评分信息 + @Autowired + protected ExPerformMapper exPerformMapper; + + //评分信息 + @Autowired + protected ExScoreMapper exScoreMapper; + + //评分附件信息 + @Autowired + protected ExScoreFileMapper exScoreFileMapper; + + //评分记录 + @Autowired + protected ExScoreRecordMapper exScoreRecordMapper; + + 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 6668327..8221de2 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java @@ -4,21 +4,18 @@ import com.common.utils.DateUtils; import com.common.utils.RandomNumber; import com.common.utils.StringUtils; import com.common.utils.model.MultiResult; -import com.common.utils.model.Pager; import com.common.utils.model.SingleResult; import com.rzyc.advice.LoginAuth; import com.rzyc.bean.ex.*; +import com.rzyc.bean.ex.vo.StandardInfo; import com.rzyc.enums.DelState; import com.rzyc.enums.ExItemType; import com.rzyc.enums.ExamineState; -import com.rzyc.model.ex.ExExamine; -import com.rzyc.model.ex.ExExamineItem; -import com.rzyc.model.ex.ExStandard; +import com.rzyc.model.ex.*; import com.rzyc.model.user.ListPerform; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.usermodel.DateUtil; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,6 +40,9 @@ public class ExamineController extends BaseController{ //党政同责考核默认标题 private final static String EXAMINE_TITLE = "党政同责考核"; + //默认分数 + private final static Double SCORE_NUM = 0.0; + /** * 年度党政同责考核记录 @@ -75,6 +75,22 @@ public class ExamineController extends BaseController{ return result; } + /** + * 党政同责考核列表 + * @version v1.0 + * @author dong + * @date 2024/4/2 10:46 + */ + @LoginAuth + @ApiOperation(value = "党政同责考核列表", notes = "党政同责考核列表") + @GetMapping(value = "examineList") + public MultiResult examineList()throws Exception{ + MultiResult result = new MultiResult<>(); + List examines = exExamineMapper.findAll(DelState.NOT_DEL.getState()); + result.setData(examines); + return result; + } + /** * 党政同责信息修改 * @version v1.0 @@ -109,23 +125,60 @@ public class ExamineController extends BaseController{ public SingleResult itemAdd(@Valid @RequestBody ItemAddDto itemAddDto)throws Exception{ SingleResult result = new SingleResult<>(); - String indexId = ""; - String pointId = ""; - String contentId = ""; + + String indexId = itemAddDto.getIndexId(); + String pointId = itemAddDto.getPointId(); + String contentId = itemAddDto.getContentId(); + //数据去重 + String indexName = itemAddDto.getIndexName(); + indexName = StringUtils.replaceBlank(indexName); + String pointName = itemAddDto.getPointName(); + pointName = StringUtils.replaceBlank(pointName); + String content = itemAddDto.getContent(); + content = StringUtils.replaceBlank(content); + + //获取考核指标id + if(StringUtils.isBlank(indexId)){ + ExExamineItem indexItem = exExamineItemMapper.findByTitile(itemAddDto.getExamineId(),itemAddDto.getExamineState(),indexName,""); + if(null != indexItem){ + indexId = indexItem.getItemId(); + } + } + + //获取考核要点id + if(StringUtils.isBlank(pointId)){ + ExExamineItem pointItem = exExamineItemMapper.findByTitile(itemAddDto.getExamineId(),itemAddDto.getExamineState(),pointName,indexId); + if(null != pointItem){ + pointId = pointItem.getItemId(); + } + } + + //获取考核内容id + if(StringUtils.isBlank(contentId)){ + ExExamineItem contentItem = exExamineItemMapper.findByTitile(itemAddDto.getExamineId(),itemAddDto.getExamineState(),content,pointId); + if(null != contentItem){ + contentId = contentItem.getItemId(); + } + } + + + + + //考核指标 if(StringUtils.isBlank(indexId)){ - indexId = examineItemAdd(itemAddDto.getIndexName(),null, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); + indexId = examineItemAdd(indexName,null, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); } //考核要点 if(StringUtils.isBlank(pointId)){ - pointId = examineItemAdd(itemAddDto.getPointName(),indexId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); + pointId = examineItemAdd(pointName,indexId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); } //考核内容 if(StringUtils.isBlank(contentId)){ - contentId = examineItemAdd(itemAddDto.getContent(),pointId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); + contentId = examineItemAdd(content,pointId, ExItemType.ORDINARY.getType(),itemAddDto.getExamineId(),itemAddDto.getExamineState()); } //考核内容信息 @@ -227,6 +280,7 @@ public class ExamineController extends BaseController{ exStandard.setStandardId(itemAddBonusDto.getStandardId()); exStandard.setExamineId(itemAddBonusDto.getExamineId()); exStandard.setTitle(itemAddBonusDto.getTitle()); + exStandard.setScore(itemAddBonusDto.getScore()); exStandard.setSortId(itemAddBonusDto.getSortId()); exStandard.setExamineState(itemAddBonusDto.getExamineState()); exStandard.setItemType(ExItemType.BONUS_POINT.getType()); @@ -239,6 +293,7 @@ public class ExamineController extends BaseController{ exStandard.setExamineId(itemAddBonusDto.getExamineId()); exStandard.setTitle(itemAddBonusDto.getTitle()); exStandard.setSortId(itemAddBonusDto.getSortId()); + exStandard.setScore(itemAddBonusDto.getScore()); exStandard.setExamineState(itemAddBonusDto.getExamineState()); exStandard.setItemType(ExItemType.BONUS_POINT.getType()); exStandard.setDelState(DelState.NOT_DEL.getState()); @@ -248,7 +303,6 @@ public class ExamineController extends BaseController{ exStandard.setModifyBy(userId); exStandardMapper.insert(exStandard); } - return result; } @@ -273,7 +327,7 @@ public class ExamineController extends BaseController{ exStandard.setSortId(itemAddSpecificDto.getSortId()); exStandard.setExamineState(itemAddSpecificDto.getExamineState()); exStandard.setScore(itemAddSpecificDto.getScore()); - exStandard.setPerformId(itemAddSpecificDto.getListperformid()); + exStandard.setPerformId(itemAddSpecificDto.getPerformId()); exStandard.setItemType(ExItemType.PERSONALITY.getType()); exStandard.setModifyTime(new Date()); exStandard.setModifyBy(userId); @@ -286,7 +340,7 @@ public class ExamineController extends BaseController{ exStandard.setSortId(itemAddSpecificDto.getSortId()); exStandard.setExamineState(itemAddSpecificDto.getExamineState()); exStandard.setScore(itemAddSpecificDto.getScore()); - exStandard.setPerformId(itemAddSpecificDto.getListperformid()); + exStandard.setPerformId(itemAddSpecificDto.getPerformId()); exStandard.setItemType(ExItemType.PERSONALITY.getType()); exStandard.setDelState(DelState.NOT_DEL.getState()); exStandard.setCreateTime(new Date()); @@ -310,6 +364,11 @@ public class ExamineController extends BaseController{ public MultiResult unitList(@Valid UnitListDto unitListDto)throws Exception{ MultiResult result = new MultiResult<>(); List performs = listPerformMapper.findByExamineState(unitListDto.getExamineState()); + if(null != performs && performs.size() > 0){ + for (ListPerform listPerform : performs){ + listPerform.setPerformId(listPerform.getListperformid()); + } + } result.setData(performs); return result; } @@ -327,16 +386,22 @@ public class ExamineController extends BaseController{ 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()); - } - } + Map examineItemMap = getExamineItemMap(standardListDto.getExamineId(),standardListDto.getExamineState()); //评分标准 List standards = exStandardMapper.standardList(ExItemType.ORDINARY.getType(),standardListDto.getExamineState(),standardListDto.getExamineId()); + handleStandard(standards,examineItemMap); + result.setData(standards); + return result; + } + + /** + * 处理评分标准数据 + * @version v1.0 + * @author dong + * @date 2024/4/2 9:23 + */ + private void handleStandard(List standards,Map examineItemMap)throws Exception{ if(null != standards && standards.size() > 0){ for (ExStandard standard : standards){ String[] strs = standard.getItemPath().split(","); @@ -353,8 +418,23 @@ public class ExamineController extends BaseController{ } } } - result.setData(standards); - return result; + } + + /** + * 获取指标项 + * @version v1.0 + * @author dong + * @date 2024/4/2 9:20 + */ + public Map getExamineItemMap(String examineId,Integer examineState)throws Exception{ + Map examineItemMap = new HashMap<>(); + List examineItems = exExamineItemMapper.itemList(examineId,examineState); + if(null != examineItems && examineItems.size() > 0){ + for (ExExamineItem examineItem : examineItems){ + examineItemMap.put(examineItem.getItemId(),examineItem.getTitle()); + } + } + return examineItemMap; } @@ -415,6 +495,186 @@ public class ExamineController extends BaseController{ return result; } + /** + * 部门普通考核项列表 + * @version v1.0 + * @author dong + * @date 2024/4/2 9:28 + */ + @LoginAuth + @ApiOperation(value = "部门普通考核项列表", notes = "部门普通考核项列表") + @GetMapping(value = "unitStandard") + public MultiResult unitStandard(@Valid UnitStandardDto unitStandardDto)throws Exception{ + MultiResult result = new MultiResult<>(); + //部门id + String unitId = getUnitId(unitStandardDto.getUserId()); + //部门信息 + ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); + if(null != listPerform && null != listPerform.getExamineState()){ + + Integer examineState = listPerform.getExamineState(); + List exStandards = exStandardMapper.standardScoreList(ExItemType.ORDINARY.getType(),examineState,unitStandardDto.getExamineId(),unitId); + if(null != exStandards && exStandards.size() > 0){ + //指标项 + Map examineItemMap = getExamineItemMap(unitStandardDto.getExamineId(),examineState); + handleStandardInfo(exStandards,examineItemMap); + result.setData(exStandards); + } + } + return result; + } + + /** + * 处理评分标准数据 + * @version v1.0 + * @author dong + * @date 2024/4/2 9:23 + */ + private void handleStandardInfo(List standards,Map examineItemMap)throws Exception{ + if(null != standards && standards.size() > 0){ + for (StandardInfo 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])); + } + } + } + } + + /** + * 部门加分项考核项列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 15:57 + */ + @LoginAuth + @ApiOperation(value = "部门加分项考核项列表", notes = "部门加分项考核项列表") + @GetMapping(value = "unitStandardListBonus") + public MultiResult unitStandardListBonus(@Valid UnitStandardDto unitStandardDto)throws Exception{ + MultiResult result = new MultiResult<>(); + + //部门id + String unitId = getUnitId(unitStandardDto.getUserId()); + //部门信息 + ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); + if(null != listPerform && null != listPerform.getExamineState()){ + Integer examineState = listPerform.getExamineState(); + //评分标准 + List standards = exStandardMapper.standardScoreList(ExItemType.BONUS_POINT.getType(),examineState,unitStandardDto.getExamineId(),unitId); + result.setData(standards); + } + + + return result; + } + + + /** + * 部门个性考核项列表 + * @version v1.0 + * @author dong + * @date 2024/4/1 15:57 + */ + @LoginAuth + @ApiOperation(value = "部门个性考核项列表", notes = "部门个性考核项列表") + @GetMapping(value = "unitStandardList") + public MultiResult unitStandardList(@Valid UnitStandardDto unitStandardDto)throws Exception{ + MultiResult result = new MultiResult<>(); + //部门id + String unitId = getUnitId(unitStandardDto.getUserId()); + //部门信息 + ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); + if(null != listPerform && null != listPerform.getExamineState()){ + Integer examineState = listPerform.getExamineState(); + //评分标准 + List standards = exStandardMapper.standardScoreList(ExItemType.PERSONALITY.getType(),examineState,unitStandardDto.getExamineId(),unitId); + result.setData(standards); + } + return result; + } + + + /** + * 部门上传资料 + * @version v1.0 + * @author dong + * @date 2024/4/2 13:48 + */ + @LoginAuth + @ApiOperation(value = "部门上传资料", notes = "部门上传资料") + @PostMapping(value = "unitUpload") + public SingleResult unitUpload(@Valid @RequestBody UnitUploadDto unitUploadDto)throws Exception{ + SingleResult result = new SingleResult<>(); + + + ExStandard exStandard = exStandardMapper.selectById(unitUploadDto.getStandardId()); + if(null != exStandard){ + ExScore exScore = getExScore(unitUploadDto.getUserId(),exStandard); + + ExScoreFile scoreFile = new ExScoreFile(); + BeanUtils.copyProperties(unitUploadDto,scoreFile); + scoreFile.setFileId(RandomNumber.getUUid()); + scoreFile.setSocreId(exScore.getSocreId()); + scoreFile.setExamineId(exStandard.getExamineId()); + scoreFile.setPerformId(exScore.getPerformId()); + scoreFile.setCreateTime(new Date()); + scoreFile.setModifyTime(new Date()); + scoreFile.setCreateBy(unitUploadDto.getUserId()); + scoreFile.setModifyBy(unitUploadDto.getUserId()); + exScoreFileMapper.insert(scoreFile); + } + return result; + } + + + /** + * 获取评分信息 + * @version v1.0 + * @author dong + * @date 2024/4/2 13:57 + */ + private ExScore getExScore(String userId,ExStandard exStandard)throws Exception{ + //部门id + String unitId = getUnitId(userId); + ExScore exScore = exScoreMapper.findByPerformId(exStandard.getStandardId(),unitId); + if(null == exScore){ + exScore = new ExScore(); + exScore.setSocreId(RandomNumber.getUUid()); + exScore.setExamineId(exStandard.getExamineId()); + exScore.setPerformId(unitId); + exScore.setStandardId(exStandard.getStandardId()); + exScore.setSocreNum(SCORE_NUM); + exScore.setCreateTime(new Date()); + exScore.setModifyTime(new Date()); + exScore.setCreateBy(userId); + exScore.setModifyBy(userId); + exScoreMapper.insert(exScore); + } + return exScore; + } + + /** + * 部门资料附件删除 + * @version v1.0 + * @author dong + * @date 2024/4/2 15:17 + */ + @LoginAuth + @ApiOperation(value = "部门资料附件删除", notes = "部门资料附件删除") + @PostMapping(value = "unitFileDel/{fileId}") + public SingleResult unitFileDel(@PathVariable String fileId)throws Exception{ + SingleResult result = new SingleResult<>(); + exScoreFileMapper.deleteById(fileId); + return result; + } }