党政同责考核项管理

inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxCheckInfo.java

@@ -1,7 +1,7 @@
 package com.rzyc.bean.bigdata.wx;
 
 import com.rzyc.bean.bigdata.check.CheckRiskNum;
-import com.rzyc.model.SysOrg;
+import com.rzyc.model.sys.SysOrg;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/bean/bigdata/wx/WxDutyNet.java

@@ -1,6 +1,6 @@
 package com.rzyc.bean.bigdata.wx;
 
-import com.rzyc.model.SysOrg;
+import com.rzyc.model.sys.SysOrg;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/bean/ex/ExamineChangeDto.java

@@ -0,0 +1,63 @@
+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 14:01
+ * @Version V1.0
+ */
+@ApiModel("党政同责信息修改")
+public class ExamineChangeDto {
+
+    @NotNull(message = "考核不能为空")
+    @ApiModelProperty(value = "考核id",required = true)
+    private String examineId;
+
+    @ApiModelProperty(value = "开始时间 yyyy-MM-dd",required = true)
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间 yyyy-MM-dd",required = true)
+    @TableField("end_time")
+    private String endTime;
+
+    @ApiModelProperty(value = "状态 1、审核中 2、已发布 3、上传资料 4、评分中 5、评分完成",required = true)
+    private Integer state;
+
+    public String getExamineId() {
+        return examineId;
+    }
+
+    public void setExamineId(String examineId) {
+        this.examineId = examineId;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddBonusDto.java

@@ -0,0 +1,64 @@
+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 15:21
+ * @Version V1.0
+ */
+@ApiModel("加分项考核指标新增")
+public class ItemAddBonusDto {
+
+    @NotNull(message = "考核不能为空")
+    @ApiModelProperty(value = "考核id",required = true)
+    private String examineId;
+
+    @NotNull(message = "考核标准不能为空")
+    @ApiModelProperty(value = "考核标准",required = true)
+    private String title;
+
+    @NotNull(message = "排序不能为空")
+    @ApiModelProperty(value = "排序",required = true)
+    private Integer sortId;
+
+    @NotNull(message = "考核类型不能为空")
+    @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true)
+    private Integer examineState;
+
+    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 Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+
+    public Integer getExamineState() {
+        return examineState;
+    }
+
+    public void setExamineState(Integer examineState) {
+        this.examineState = examineState;
+    }
+}

inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddDto.java

@@ -0,0 +1,142 @@
+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 13:44
+ * @Version V1.0
+ */
+@ApiModel("普通考核指标添加")
+public class ItemAddDto {
+
+    @NotNull(message = "考核不能为空")
+    @ApiModelProperty(value = "考核id",required = true)
+    private String examineId;
+
+    @ApiModelProperty("考核指标")
+    private String indexName;
+
+    @ApiModelProperty("考核指标id 传使用该id 不传则新增考核指标")
+    private String indexId;
+
+    @ApiModelProperty("考核要点")
+    private String pointName;
+
+    @ApiModelProperty("考核要点id 传使用该id 不传则新增考核要点")
+    private String pointId;
+
+    @ApiModelProperty("考核内容")
+    private String content;
+
+    @ApiModelProperty("考核内容id 传使用该id 不传则新增考核内容")
+    private String contentId;
+
+    @NotNull(message = "考核标准不能为空")
+    @ApiModelProperty(value = "考核标准",required = true)
+    private String title;
+
+    @NotNull(message = "标准分数不能为空")
+    @ApiModelProperty(value = "标准分数",required = true)
+    private Double score;
+
+    @NotNull(message = "排序不能为空")
+    @ApiModelProperty(value = "排序",required = true)
+    private Integer sortId;
+
+    @NotNull(message = "考核类型不能为空")
+    @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true)
+    private Integer examineState;
+
+    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 Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+
+    public Integer getExamineState() {
+        return examineState;
+    }
+
+    public void setExamineState(Integer examineState) {
+        this.examineState = examineState;
+    }
+
+    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;
+    }
+}

inventory-dao/src/main/java/com/rzyc/bean/ex/ItemAddSpecificDto.java

@@ -0,0 +1,89 @@
+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 15:47
+ * @Version V1.0
+ */
+@ApiModel("部门个性标准上传")
+public class ItemAddSpecificDto {
+
+
+    @NotNull(message = "考核不能为空")
+    @ApiModelProperty(value = "考核id",required = true)
+    private String examineId;
+
+    @NotNull(message = "考核标准不能为空")
+    @ApiModelProperty(value = "考核标准",required = true)
+    private String title;
+
+    @NotNull(message = "排序不能为空")
+    @ApiModelProperty(value = "排序",required = true)
+    private Integer sortId;
+
+    @NotNull(message = "考核类型不能为空")
+    @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门 3、市县",required = true)
+    private Integer examineState;
+
+    @NotNull(message = "标准分数不能为空")
+    @ApiModelProperty(value = "标准分数",required = true)
+    private Double score;
+
+    @NotNull(message="部门不能为空")
+    @ApiModelProperty(value = "部门id",required = true)
+    private String listperformid;
+
+    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 Integer getSortId() {
+        return sortId;
+    }
+
+    public void setSortId(Integer sortId) {
+        this.sortId = sortId;
+    }
+
+    public Integer getExamineState() {
+        return examineState;
+    }
+
+    public void setExamineState(Integer examineState) {
+        this.examineState = examineState;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public String getListperformid() {
+        return listperformid;
+    }
+
+    public void setListperformid(String listperformid) {
+        this.listperformid = listperformid;
+    }
+}

inventory-dao/src/main/java/com/rzyc/bean/ex/UnitListDto.java

@@ -0,0 +1,28 @@
+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 15:34
+ * @Version V1.0
+ */
+@ApiModel("党政同责考核部门列表")
+public class UnitListDto {
+
+    @NotNull(message = "考核类型不能为空")
+    @ApiModelProperty(value = "党政同责考核类型 1、直属部门 2、监管部门",required = true)
+    private Integer examineState;
+
+    public Integer getExamineState() {
+        return examineState;
+    }
+
+    public void setExamineState(Integer examineState) {
+        this.examineState = examineState;
+    }
+}

inventory-dao/src/main/java/com/rzyc/bean/file/FileResult.java

@@ -1,7 +1,7 @@
 package com.rzyc.bean.file;
 
 import com.common.utils.model.Code;
-import com.rzyc.model.Sysdocument;
+import com.rzyc.model.sys.Sysdocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/bean/file/FileResults.java

@@ -1,7 +1,7 @@
 package com.rzyc.bean.file;
 
 import com.common.utils.model.Code;
-import com.rzyc.model.Sysdocument;
+import com.rzyc.model.sys.Sysdocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/enums/ExItemType.java

@@ -0,0 +1,31 @@
+package com.rzyc.enums;
+
+/**
+ * 考核项类型 1、普通 2、个性 3、加分项
+ * @author dong
+ * @date 2024-04-01 14:52
+ * @Version V1.0
+ */
+public enum ExItemType {
+
+    //普通
+    ORDINARY(1),
+    //个性
+    PERSONALITY(2),
+    //加分项
+    BONUS_POINT(3);
+
+    private Integer type;
+
+    ExItemType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

inventory-dao/src/main/java/com/rzyc/enums/ExamineState.java

@@ -0,0 +1,30 @@
+package com.rzyc.enums;
+
+/**
+ * 状态 1、审核中 2、已发布 3、上传资料 4、评分中 5、评分完成
+ * @version v1.0
+ * @author dong
+ * @date 2024/4/1 11:33
+ */
+public enum ExamineState {
+
+    AUDITING(1),
+    RELEASE(2),
+    UPLOAD(3),
+    SCOREING(4),
+    COMPLETE(5);
+
+    private Integer state;
+
+    ExamineState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntCertificatesMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntCertificates;
+import com.rzyc.model.ent.EntCertificates;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceInsCycleMapper.java

@@ -1,13 +1,10 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntDeviceInsCycle;
+import com.rzyc.model.ent.EntDeviceInsCycle;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rzyc.model.dto.AddOrUpdateDeviceInspectionCycleDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.Date;
 import java.util.List;
 
 /**

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenancePlanMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntDeviceMaintenancePlan;
+import com.rzyc.model.ent.EntDeviceMaintenancePlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMaintenanceRecordMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntDeviceMaintenanceRecord;
+import com.rzyc.model.ent.EntDeviceMaintenanceRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceMapper.java

@@ -1,8 +1,8 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntDevice;
+import com.rzyc.model.ent.EntDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rzyc.model.EntDeviceInsStatistic;
+import com.rzyc.model.ent.EntDeviceInsStatistic;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntDeviceTypeMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntDeviceType;
+import com.rzyc.model.ent.EntDeviceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmEquipmentMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntEmEquipment;
+import com.rzyc.model.ent.EntEmEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmExpertMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntEmExpert;
+import com.rzyc.model.ent.EntEmExpert;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmRehearsalMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntEmRehearsal;
+import com.rzyc.model.ent.EntEmRehearsal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntEmReservePlanMapper.java

@@ -1,7 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntEmExpert;
+import com.rzyc.model.ent.EntEmReservePlan;
-import com.rzyc.model.EntEmReservePlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInsRecordMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntInsRecord;
+import com.rzyc.model.ent.EntInsRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntInspectionRecordMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntInspectionRecord;
+import com.rzyc.model.ent.EntInspectionRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntOperatingInstructionMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntOperatingInstruction;
+import com.rzyc.model.ent.EntOperatingInstruction;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostDutyMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntPostDuty;
+import com.rzyc.model.ent.EntPostDuty;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListDetailMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntPostListDetail;
+import com.rzyc.model.ent.EntPostListDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostListMapper.java

@@ -1,8 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntPostList;
+import com.rzyc.model.ent.EntPostList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rzyc.model.EntPostTask;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntPostTaskMapper.java

@@ -1,8 +1,8 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntPostTask;
+import com.rzyc.model.ent.EntPostTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rzyc.model.EntPostTaskStatistic;
+import com.rzyc.model.ent.EntPostTaskStatistic;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairPlanMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntRepairPlan;
+import com.rzyc.model.ent.EntRepairPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntRepairRecordMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntRepairRecord;
+import com.rzyc.model.ent.EntRepairRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntReportRepairMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntReportRepair;
+import com.rzyc.model.ent.EntReportRepair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserCredentialMapper.java

@@ -1,8 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntUserCredential;
+import com.rzyc.model.ent.EntUserCredential;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.rzyc.model.dto.EntUserCredentialUpdateDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserTypeMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.ent;
 
-import com.rzyc.model.EntUserType;
+import com.rzyc.model.ent.EntUserType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/SysEnterpriseMapper.java

@@ -21,8 +21,6 @@ import com.rzyc.bean.organization.vo.AreaEntNum;
 import com.rzyc.bean.organization.vo.EnterpriseVo;
 import com.rzyc.bean.organization.vo.OrganizationNum;
 import com.rzyc.model.EasyExcel.EasyExcelEnterprise;
-import com.rzyc.model.EasyExcel.EasyExcelInList;
-import com.rzyc.model.SysOrg;
 import com.rzyc.model.ent.SysEnterprise;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineItemMapper.java

@@ -0,0 +1,16 @@
+package com.rzyc.mapper.ex;
+
+import com.rzyc.model.ex.ExExamineItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考核项 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-04-01
+ */
+public interface ExExamineItemMapper extends BaseMapper<ExExamineItem> {
+
+}

inventory-dao/src/main/java/com/rzyc/mapper/ex/ExExamineMapper.java

@@ -0,0 +1,26 @@
+package com.rzyc.mapper.ex;
+
+import com.rzyc.model.ex.ExExamine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 党政同责考核 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-04-01
+ */
+public interface ExExamineMapper extends BaseMapper<ExExamine> {
+
+    /*考核列表*/
+    List<ExExamine> examineList(@Param("delState") Integer delState, @Param("yearNum") String yearNum,
+                                @Param("condition") String condition);
+
+    /*按照年份查询*/
+    ExExamine findByYear(@Param("yearNum") String yearNum);
+
+}

inventory-dao/src/main/java/com/rzyc/mapper/ex/ExStandardMapper.java

@@ -0,0 +1,16 @@
+package com.rzyc.mapper.ex;
+
+import com.rzyc.model.ex.ExStandard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 评分标准 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-04-01
+ */
+public interface ExStandardMapper extends BaseMapper<ExStandard> {
+
+}

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysCodeMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysCode;
+import com.rzyc.model.sys.SysCode;
-import com.rzyc.model.SysCodeExample;
+import com.rzyc.model.sys.SysCodeExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysDocumenttempMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysDocumenttemp;
+import com.rzyc.model.sys.SysDocumenttemp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogAuthMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysLogAuth;
+import com.rzyc.model.sys.SysLogAuth;
-import com.rzyc.model.SysLogAuthExample;
+import com.rzyc.model.sys.SysLogAuthExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysLogOptMapper.java

@@ -1,8 +1,8 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysLogOpt;
+import com.rzyc.model.sys.SysLogOpt;
-import com.rzyc.model.SysLogOptExample;
+import com.rzyc.model.sys.SysLogOptExample;
-import com.rzyc.model.SysLogOptWithBLOBs;
+import com.rzyc.model.sys.SysLogOptWithBLOBs;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysOrgMapper.java

@@ -1,11 +1,10 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rzyc.bean.bigdata.AreaInfo;
 import com.rzyc.bean.organization.vo.CountByOrg;
-import com.rzyc.model.SysOrg;
+import com.rzyc.model.sys.SysOrg;
-import com.rzyc.model.SysOrgExample;
+import com.rzyc.model.sys.SysOrgExample;
-import com.rzyc.model.oth.Manual;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysRole;
+import com.rzyc.model.sys.SysRole;
-import com.rzyc.model.SysRoleExample;
+import com.rzyc.model.sys.SysRoleExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysRoleResourceMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysRoleResource;
+import com.rzyc.model.sys.SysRoleResource;
-import com.rzyc.model.SysRoleResourceExample;
+import com.rzyc.model.sys.SysRoleResourceExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteDescMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysStatuteDesc;
+import com.rzyc.model.sys.SysStatuteDesc;
-import com.rzyc.model.SysStatuteDescExample;
+import com.rzyc.model.sys.SysStatuteDescExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysStatuteMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysStatute;
+import com.rzyc.model.sys.SysStatute;
-import com.rzyc.model.SysStatuteExample;
+import com.rzyc.model.sys.SysStatuteExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysUnitTradeMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysUnitTrade;
+import com.rzyc.model.sys.SysUnitTrade;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysWarning;
+import com.rzyc.model.sys.SysWarning;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningTypeMapper.java

@@ -1,10 +1,9 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysWarningType;
+import com.rzyc.model.sys.SysWarningType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysWarningUserMapper.java

@@ -1,6 +1,6 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.SysWarningUser;
+import com.rzyc.model.sys.SysWarningUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

inventory-dao/src/main/java/com/rzyc/mapper/sys/SysdocumentMapper.java

@@ -1,7 +1,7 @@
-package com.rzyc.mapper;
+package com.rzyc.mapper.sys;
 
-import com.rzyc.model.Sysdocument;
+import com.rzyc.model.sys.Sysdocument;
-import com.rzyc.model.SysdocumentExample;
+import com.rzyc.model.sys.SysdocumentExample;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java

@@ -147,4 +147,7 @@ public interface ListPerformMapper extends BaseMapper<SysEnterprise> {
     List<UserPerformInfo> userPerformInfo(@Param("condition") String condition,
                                           @Param("performId") String performId);
 
+    /*党政同责部门列表*/
+    List<ListPerform> findByExamineState(@Param("examineState") Integer examineState);
+
 }

inventory-dao/src/main/java/com/rzyc/model/ent/EntCertificates.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntDevice.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -10,6 +10,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.rzyc.model.sys.Sysdocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsCycle.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceInsStatistic.java

@@ -1,6 +1,6 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.rzyc.model.sys.Sysdocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenancePlan.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceMaintenanceRecord.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;

inventory-dao/src/main/java/com/rzyc/model/ent/EntDeviceType.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntEmEquipment.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntEmExpert.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntEmRehearsal.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntEmReservePlan.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntInsRecord.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.rzyc.model.sys.Sysdocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/model/ent/EntInspectionRecord.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntOperatingInstruction.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntPostDuty.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntPostList.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntPostListDetail.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTask.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntPostTaskStatistic.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 /**
  * 企业岗位任务履职统计

inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairPlan.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntRepairRecord.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,6 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.rzyc.model.sys.Sysdocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

inventory-dao/src/main/java/com/rzyc/model/ent/EntReportRepair.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntUserCredential.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ent/EntUserType.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.ent;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/ex/ExExamine.java

@@ -0,0 +1,169 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 党政同责考核
+ * </p>
+ *
+ * @author
+ * @since 2024-04-01
+ */
+@TableName("ex_examine")
+@ApiModel(value="ExExamine对象", description="党政同责考核")
+public class ExExamine implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "考核id")
+    @TableId("examine_id")
+    private String examineId;
+
+    @ApiModelProperty(value = "考核标题")
+    @TableField("title")
+    private String title;
+
+    @ApiModelProperty(value = "年份")
+    @TableField("year_num")
+    private String yearNum;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "上传资料开始时间")
+    @TableField("start_time")
+    private Date startTime;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "上传资料结束时间")
+    @TableField("end_time")
+    private Date endTime;
+
+    @ApiModelProperty(value = "状态 1、审核中 2、已发布 3、上传资料 4、评分中 5、评分完成")
+    @TableField("state")
+    private Integer state;
+
+    @ApiModelProperty(value = "删除状态 1：正常 2:已删除")
+    @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;
+
+    @ApiModelProperty(value = "创建人")
+    @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;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("modify_by")
+    private String modifyBy;
+
+    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 String getYearNum() {
+        return yearNum;
+    }
+
+    public void setYearNum(String yearNum) {
+        this.yearNum = yearNum;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+    public Integer getDelState() {
+        return delState;
+    }
+
+    public void setDelState(Integer delState) {
+        this.delState = delState;
+    }
+    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 "ExExamine{" +
+            "examineId=" + examineId +
+            ", title=" + title +
+            ", yearNum=" + yearNum +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", state=" + state +
+            ", delState=" + delState +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", modifyTime=" + modifyTime +
+            ", modifyBy=" + modifyBy +
+        "}";
+    }
+}

inventory-dao/src/main/java/com/rzyc/model/ex/ExExamineItem.java

@@ -0,0 +1,187 @@
+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;
+
+/**
+ * <p>
+ * 考核项
+ * </p>
+ *
+ * @author
+ * @since 2024-04-01
+ */
+@TableName("ex_examine_item")
+@ApiModel(value="ExExamineItem对象", description="考核项")
+public class ExExamineItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "考核项id")
+    @TableId("item_id")
+    private String itemId;
+
+    @ApiModelProperty(value = "考核id")
+    @TableField("examine_id")
+    private String examineId;
+
+    @ApiModelProperty(value = "考核项")
+    @TableField("title")
+    private String title;
+
+    @ApiModelProperty(value = "考核项分数")
+    @TableField("item_score")
+    private Double itemScore;
+
+    @ApiModelProperty(value = "上级考核项id")
+    @TableField("parent_id")
+    private String parentId;
+
+    @ApiModelProperty(value = "考核项路径")
+    @TableField("parent_path")
+    private String parentPath;
+
+    @ApiModelProperty(value = "考核项类型 1、普通 2、个性 3、加分项")
+    @TableField("item_type")
+    private Integer itemType;
+
+    @ApiModelProperty(value = "排序")
+    @TableField("sort_id")
+    private Integer sortId;
+
+    @ApiModelProperty(value = "删除状态 1：正常 2:已删除")
+    @TableField("del_state")
+    private Integer delState;
+
+    @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 getExamineId() {
+        return examineId;
+    }
+
+    public void setExamineId(String examineId) {
+        this.examineId = examineId;
+    }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public Double getItemScore() {
+        return itemScore;
+    }
+
+    public void setItemScore(Double itemScore) {
+        this.itemScore = itemScore;
+    }
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+    public String getParentPath() {
+        return parentPath;
+    }
+
+    public void setParentPath(String parentPath) {
+        this.parentPath = parentPath;
+    }
+    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 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 "ExExamineItem{" +
+            "itemId=" + itemId +
+            ", title=" + title +
+            ", itemScore=" + itemScore +
+            ", parentId=" + parentId +
+            ", parentPath=" + parentPath +
+            ", itemType=" + itemType +
+            ", sortId=" + sortId +
+            ", delState=" + delState +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", modifyTime=" + modifyTime +
+            ", modifyBy=" + modifyBy +
+        "}";
+    }
+}

inventory-dao/src/main/java/com/rzyc/model/ex/ExStandard.java

@@ -0,0 +1,211 @@
+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;
+
+/**
+ * <p>
+ * 评分标准
+ * </p>
+ *
+ * @author
+ * @since 2024-04-01
+ */
+@TableName("ex_standard")
+@ApiModel(value="ExStandard对象", description="评分标准")
+public class ExStandard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "评分标准id")
+    @TableId("standard_id")
+    private String standardId;
+
+    @ApiModelProperty(value = "考核id")
+    @TableField("examine_id")
+    private String examineId;
+
+    @ApiModelProperty(value = "评分标准")
+    @TableField("title")
+    private String title;
+
+    @ApiModelProperty(value = "分数")
+    @TableField("score")
+    private Double score;
+
+    @ApiModelProperty(value = "考核项id")
+    @TableField("item_id")
+    private String itemId;
+
+    @ApiModelProperty(value = "考核项路径")
+    @TableField("item_path")
+    private String itemPath;
+
+    @ApiModelProperty(value = "部门id 个性清单时选择")
+    @TableField("perform_id")
+    private String performId;
+
+    @ApiModelProperty(value = "党政同责考核类型 1、负有安全生产监管职责的部门 2、其他有关部门 3、属地")
+    @TableField("examine_state")
+    private Integer examineState;
+
+    @ApiModelProperty(value = "考核项类型 1、普通 2、个性 3、加分项")
+    @TableField("item_type")
+    private Integer itemType;
+
+    @ApiModelProperty(value = "排序")
+    @TableField("sort_id")
+    private Integer sortId;
+
+    @ApiModelProperty(value = "删除状态 1：正常 2:已删除")
+    @TableField("del_state")
+    private Integer delState;
+
+    @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 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 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 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 "ExStandard{" +
+            "standardId=" + standardId +
+            ", title=" + title +
+            ", score=" + score +
+            ", itemId=" + itemId +
+            ", itemPath=" + itemPath +
+            ", performId=" + performId +
+            ", examineState=" + examineState +
+            ", itemType=" + itemType +
+            ", sortId=" + sortId +
+            ", delState=" + delState +
+            ", createTime=" + createTime +
+            ", createBy=" + createBy +
+            ", modifyTime=" + modifyTime +
+            ", modifyBy=" + modifyBy +
+        "}";
+    }
+}

inventory-dao/src/main/java/com/rzyc/model/sys/SysCode.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.io.Serializable;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysCodeExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysDocumenttemp.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuth.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

inventory-dao/src/main/java/com/rzyc/model/sys/SysLogAuthExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOpt.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.io.Serializable;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysLogOptWithBLOBs.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.io.Serializable;
 

inventory-dao/src/main/java/com/rzyc/model/sys/SysOrg.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

inventory-dao/src/main/java/com/rzyc/model/sys/SysOrgExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysRole.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResource.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.io.Serializable;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysRoleResourceExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysStatute.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDesc.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteDescExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysStatuteExample.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import java.util.ArrayList;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysUnitTrade.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysWarning.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;

inventory-dao/src/main/java/com/rzyc/model/sys/SysWarningType.java

@@ -1,4 +1,4 @@
-package com.rzyc.model;
+package com.rzyc.model.sys;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;