指标规则修改

ims-service/ims-eval/src/main/java/com/ims/eval/cache/CacheContext.java

@@ -1,15 +1,14 @@
 package com.ims.eval.cache;
 
 import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.entity.IndicatorType;
 import com.ims.eval.service.IDataDictionaryService;
+import com.ims.eval.service.IIndicatorTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -21,6 +20,9 @@ public class CacheContext implements CommandLineRunner {
 	@Autowired
 	private IDataDictionaryService dataDictionaryService;
 
+	@Autowired
+	private IIndicatorTypeService iIndicatorTypeService;
+
 
 	//初始化字典表
 	public static List<DataDictionary> ddList = new ArrayList<>();
@@ -30,9 +32,12 @@ public class CacheContext implements CommandLineRunner {
 	public static Map<String, List<DataDictionary>> ddSuperKeyMap  = new HashMap<>();
 
 
+	public static List<IndicatorType> itList = new ArrayList<>();
+
 	@Override
 	public void run(String... args) throws Exception {
 		initDataDictionary();
+		initIndicatorType();
 
 	}
 
@@ -58,4 +63,18 @@ public class CacheContext implements CommandLineRunner {
 	}
 
 
+	/**
+	 * 初始化集团表
+	 */
+	public void initIndicatorType(){
+		//清理集合中的数据
+		itList.clear();
+
+		itList = iIndicatorTypeService.list().stream().filter(t->!t.isDelFlag()).collect(Collectors.toList());
+		itList.sort(Comparator.comparing(IndicatorType::getOrderNum));
+	}
+
+
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptResponsibilityController.java

@@ -1,14 +1,15 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.DeptResponsibility;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IDeptResponsibilityService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -29,17 +30,18 @@ public class DeptResponsibilityController {
 
 
 	/**
+	 * 分页查询
 	 * @param pageNum          当前页数
 	 * @param pageSize         当前页大小
 	 * @param id               主键
-	 * @param organizationName 考评组织名称
-	 * @param organizationId   考评组织ID
-	 * @param organizationType 考评类别
-	 * @param binSection       业务版块
-	 * @param binStage         业务阶段
-	 * @param evaluationCycle  考评周期
-	 * @param year             年
-	 * @param month            月
+	 * @param cycleUnit  周期单位
+	 * @param checkCycle 周期
+	 * @param beginDate 考核开始时间
+	 * @param endDate 考核截止时间
+	 * @param stage 审批状态
+	 * @param createBy 创建者
+	 * @param year 年
+	 * @param month 月
 	 * @return
 	 */
 	//@ImsPreAuth("eval:deptResponsibility:view")
@@ -47,20 +49,46 @@ public class DeptResponsibilityController {
 	public R list(@RequestParam(value = "pageNum") Integer pageNum,
 				  @RequestParam(value = "pageSize") Integer pageSize,
 				  @RequestParam(value = "id", required = false) String id,
-				  @RequestParam(value = "organizationName", required = false) String organizationName,
-				  @RequestParam(value = "organizationId", required = false) String organizationId,
-				  @RequestParam(value = "organizationType", required = false) String organizationType,
-				  @RequestParam(value = "binSection", required = false) String binSection,
+				  @RequestParam(value = "cycleUnit", required = false) String cycleUnit,
+				  @RequestParam(value = "checkCycle", required = false) String checkCycle,
+				  @RequestParam(value = "beginDate", required = false) String beginDate,
+				  @RequestParam(value = "endDate", required = false) String endDate,
 				  @RequestParam(value = "binStage", required = false) String binStage,
-				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
+				  @RequestParam(value = "stage", required = false) String stage,
+				  @RequestParam(value = "createBy", required = false) String createBy,
 				  @RequestParam(value = "year", required = false) String year,
 				  @RequestParam(value = "month", required = false) String month) {
-//		IPage<DeptResponsibility> list = deptResponsibilityService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+		IPage<DeptResponsibility> list = deptResponsibilityService.list(pageNum, pageSize, id, cycleUnit, checkCycle, beginDate, endDate, binStage, stage, createBy,year, month);
 		return R.ok().data(null);
 	}
 
 
 
+	/**
+	 * 添加
+	 *
+	 * @param deptResponsibility
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:deptResponsibility:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R add(@RequestBody DeptResponsibility deptResponsibility) {
+
+		try {
+			boolean b = deptResponsibilityService.saveOrUpdate(deptResponsibility);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
 
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/IndicatorTypeController.java

@@ -0,0 +1,101 @@
+package com.ims.eval.controller;
+
+
+import com.ims.eval.cache.CacheContext;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.DataDictionary;
+import com.ims.eval.entity.IndicatorType;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IIndicatorTypeService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 指标分类 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-09
+ */
+@RestController
+@RequestMapping("//indicator-type")
+public class IndicatorTypeController {
+
+	@Autowired
+	private IIndicatorTypeService iIndicatorTypeService;
+
+	@Autowired
+	private CacheContext cache;
+
+
+	/**
+	 * 查询
+	 *
+	 * @param id       主键ID
+	 * @param typeName  name
+	 * @param typeCode  code
+	 * @return
+	 */
+	//@ImsPreAuth("eval:indicatorType:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "typeName", required = false) String typeName,
+				  @RequestParam(value = "typeCode", required = false) String typeCode) {
+//		List<IndicatorType> list = iIndicatorTypeService.list(id, typeName, typeCode);
+		List<IndicatorType> list =CacheContext.itList;
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 添加
+	 *
+	 * @param indicatorType
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:indicatorType:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody IndicatorType indicatorType) {
+
+		try {
+			boolean b = iIndicatorTypeService.saveOrUpdate(indicatorType);
+			if (b) {
+				cache.initIndicatorType();
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:indicatorType:remove")
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = iIndicatorTypeService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			cache.initDataDictionary();
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/OrganizationEvaluationRuleController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.OrganizationEvaluationRule;
+import com.ims.eval.entity.dto.request.OrganizationEvaluationRuleDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import io.swagger.annotations.ApiOperation;
@@ -41,8 +42,6 @@ public class OrganizationEvaluationRuleController {
 	 * @param binSection       业务版块
 	 * @param binStage         业务阶段
 	 * @param evaluationCycle  考评周期
-	 * @param year             年
-	 * @param month            月
 	 * @return
 	 */
 	//@ImsPreAuth("eval:organizationEvaluationRule:view")
@@ -55,10 +54,8 @@ public class OrganizationEvaluationRuleController {
 				  @RequestParam(value = "organizationType", required = false) String organizationType,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage,
-				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
-				  @RequestParam(value = "year", required = false) String year,
-				  @RequestParam(value = "month", required = false) String month) {
-		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
+		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
 		return R.ok().data(list);
 	}
 
@@ -72,10 +69,8 @@ public class OrganizationEvaluationRuleController {
 				  @RequestParam(value = "organizationType", required = false) String organizationType,
 				  @RequestParam(value = "binSection", required = false) String binSection,
 				  @RequestParam(value = "binStage", required = false) String binStage,
-				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
-				  @RequestParam(value = "year", required = false) String year,
-				  @RequestParam(value = "month", required = false) String month) {
-		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
+		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
 		return R.ok().data(list);
 	}
 
@@ -89,8 +84,6 @@ public class OrganizationEvaluationRuleController {
 	 * @param binSection       业务版块
 	 * @param binStage         业务阶段
 	 * @param evaluationCycle  考评周期
-	 * @param year             年
-	 * @param month            月
 	 * @return
 	 */
 	//@ImsPreAuth("eval:organizationEvaluationRule:view")
@@ -102,10 +95,8 @@ public class OrganizationEvaluationRuleController {
 		@RequestParam(value = "organizationType", required = false) String organizationType,
 		@RequestParam(value = "binSection", required = false) String binSection,
 		@RequestParam(value = "binStage", required = false) String binStage,
-		@RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
-		@RequestParam(value = "year", required = false) String year,
-		@RequestParam(value = "month", required = false) String month) {
-		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+		@RequestParam(value = "evaluationCycle", required = false) String evaluationCycle) {
+		List<OrganizationEvaluationRule> list = organizationEvaluationRuleService.listAll(id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
 		return R.ok().data(list);
 	}
 
@@ -153,4 +144,8 @@ public class OrganizationEvaluationRuleController {
 		}
 	}
 
+
+
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/ResponsibilityIndicatorInfoController.java

@@ -0,0 +1,22 @@
+package com.ims.eval.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 责任书指标明细
+
+ 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-08
+ */
+@RestController
+@RequestMapping("//responsibility-indicator-info")
+public class ResponsibilityIndicatorInfoController {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/IndicatorTypeMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.IndicatorType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 指标分类 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-09
+ */
+public interface IndicatorTypeMapper extends BaseMapper<IndicatorType> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/OrganizationEvaluationRuleMapper.java

@@ -22,8 +22,6 @@ public interface OrganizationEvaluationRuleMapper extends BaseMapper<Organizatio
 										   @Param("organizationType") String organizationType,
 										   @Param("binSection") String binSection,
 										   @Param("binStage") String binStage,
-										   @Param("evaluationCycle") String evaluationCycle,
-										   @Param("year") String year,
-										   @Param("month") String month);
+										   @Param("evaluationCycle") String evaluationCycle);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/ResponsibilityIndicatorInfoMapper.java

@@ -0,0 +1,18 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.ResponsibilityIndicatorInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 责任书指标明细
+
+ Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-08
+ */
+public interface ResponsibilityIndicatorInfoMapper extends BaseMapper<ResponsibilityIndicatorInfo> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/DeptResponsibility.java

@@ -28,7 +28,13 @@ public class DeptResponsibility extends Model {
     /**
      * 部门ID
      */
-    private String deptId;
+    private String organizationId;
+
+	/**
+	 * 部门name
+	 */
+	private String organizationName;
+
 
     /**
      * 周期单位
@@ -40,6 +46,20 @@ public class DeptResponsibility extends Model {
      */
     private String checkCycle;
 
+	/**
+	 * 年
+	 */
+	private String year;
+	/**
+	 * 月
+	 */
+	private String month;
+
+	/**
+	 * 考评单位规则id
+	 */
+	private  String organizationEvaluationRuleId;
+
     /**
      * 考核开始时间
      */
@@ -116,4 +136,6 @@ public class DeptResponsibility extends Model {
     private String remark;
 
 
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/IndicatorType.java

@@ -0,0 +1,48 @@
+package com.ims.eval.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 指标分类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class IndicatorType extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+	/**
+	 * 删除标记
+	 */
+	private boolean delFlag;
+
+    /**
+     * 排序
+     */
+    private Integer orderNum;
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationEvaluationRule.java

@@ -14,115 +14,109 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2023-03-01
+ * @since 2023-03-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class OrganizationEvaluationRule extends Model {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键ID
-     */
-    private String id;
+	/**
+	 * 主键ID
+	 */
+	private String id;
 
-    /**
-     * 考评组织名称
-     */
-    private String organizationName;
+	/**
+	 * 考评组织名称
+	 */
+	private String organizationName;
 
-    /**
-     * 考评组织ID
-     */
-    private String organizationId;
+	/**
+	 * 考评组织ID
+	 */
+	private String organizationId;
 
-    /**
-     * 考评类别
-     */
-    private String organizationType;
+	/**
+	 * 考评类别(单位、部门)
+	 */
+	private String organizationType;
 
-    /**
-     * 业务版块
-     */
-    private String binSection;
+	/**
+	 * 业务版块
+	 */
+	private String binSection;
 
 	/**
 	 * 业务版块name
 	 */
 	@TableField(exist = false)
 	private String binSectionName;
-
-    /**
-     * 业务阶段
-     */
-    private String binStage;
-
 	/**
-	 * 业务阶段name
+	 * 业务阶段
 	 */
-	@TableField(exist = false)
-	private String binStageName;
+	private String binStage;
 
-    /**
-     * 考评周期
-     */
-    private String evaluationCycle;
+	/**
+	 * 考评周期
+	 */
+	private String evaluationCycle;
 
-    /**
-     * 考评规则ID
-     */
-    private String evaluateRuleId;
+	/**
+	 * 考评规则ID
+	 */
+	private String evaluateRuleId;
 
 	/**
-	 * 考评规则Name
+	 * 创建时间
 	 */
-	@TableField(exist = false)
-	private String ruleName;
+	private Date createTime;
 
-    /**
-     * 创建时间
-     */
-    private Date createTime;
+	/**
+	 * 创建者
+	 */
+	private String createBy;
 
-    /**
-     * 创建者
-     */
-    private String createBy;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
 
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
+	/**
+	 * 更新者
+	 */
+	private String updateBy;
 
-    /**
-     * 更新者
-     */
-    private String updateBy;
+	/**
+	 * 删除标记(false 为未删除，true 为已删除)
 
-    /**
-     * 删除标记(0 为未删除，1 为已删除)
+	 */
+	private Boolean delFlag;
 
-     */
-    private String delFlag;
+	/**
+	 * 是否考核(false;未考核；true:以考核)
+	 */
+	private Boolean isCheck;
 
-    /**
-     * 是否考核(0;未考核；1:以考核)
-     */
-    private String isCheck;
+	/**
+	 * 生产经营权重
+	 */
+	private double scjyWeight;
 
-    /**
-     * 排序
-     */
-    private Integer orderNum;
+	/**
+	 * 前期权重
+	 */
+	private double qqWeight;
 
 	/**
-	 * 年
+	 * 基建权重
 	 */
-	private String year;
+	private double jjWeight;
+
 	/**
-	 * 月
+	 * 排序
 	 */
-	private String month;
+	private Integer orderNum;
+
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/entity/ResponsibilityIndicatorInfo.java

@@ -0,0 +1,93 @@
+package com.ims.eval.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 责任书指标明细
+
+
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ResponsibilityIndicatorInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 责任书id
+     */
+    private String deptResponsibilityId;
+
+    /**
+     * 指标名称
+     */
+    private String indicatorName;
+
+    /**
+     * 指标编码
+     */
+    private String indicatorCode;
+
+    /**
+     * 选项编码
+     */
+    private String optionCode;
+
+    /**
+     * 选项名称
+     */
+    private String optionName;
+
+	/**
+	 * 量化指标值
+	 */
+	private double quantifiedValue;
+
+	/**
+	 * 非量化指标值
+	 */
+    private String nonQuantifiedValue;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/OrganizationEvaluationRuleDTO.java

@@ -3,6 +3,7 @@ package com.ims.eval.entity.dto.request;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationUnit;
 import com.ims.eval.entity.OrganizationEvaluationRule;
+import com.ims.eval.entity.OrganizationStructure;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,10 +17,11 @@ public class OrganizationEvaluationRuleDTO extends OrganizationEvaluationRule {
 
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "考评单位", required=true)
+	private List<OrganizationStructure> unitList;
 
 	@ApiModelProperty(value = "考评部门", required=true)
-	private List<EvaluationDept> evaluationDepts;
+	private List<OrganizationStructure> deptList;
+
 
-	@ApiModelProperty(value = "考评单位", required=true)
-	private List<EvaluationUnit> evaluationUnits;
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptResponsibilityService.java

@@ -1,5 +1,6 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.DeptResponsibility;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDeptResponsibilityService extends IService<DeptResponsibility> {
 
+	IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String cycleUnit, String checkCycle, String beginDate, String endDate, String binStage, String stage, String createBy, String year, String month);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IIndicatorTypeService.java

@@ -0,0 +1,21 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.IndicatorType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指标分类 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-09
+ */
+public interface IIndicatorTypeService extends IService<IndicatorType> {
+
+
+	List<IndicatorType>list(String id, String typeName, String typeCode);
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IOrganizationEvaluationRuleService.java

@@ -3,6 +3,7 @@ package com.ims.eval.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.dto.request.OrganizationEvaluationRuleDTO;
 
 import java.util.List;
 
@@ -16,11 +17,13 @@ import java.util.List;
  */
 public interface IOrganizationEvaluationRuleService extends IService<OrganizationEvaluationRule> {
 
-	IPage<OrganizationEvaluationRule> list( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle,String year,String month);
+	IPage<OrganizationEvaluationRule> list( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle);
 
-	List<OrganizationEvaluationRule> listAll( String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle,String year,String month);
+	List<OrganizationEvaluationRule> listAll( String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle);
 
 
-	IPage<OrganizationEvaluationRule> list2( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle,String year,String month);
+	IPage<OrganizationEvaluationRule> list2( Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle);
+
+//	List<OrganizationEvaluationRule> listBy(String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle,String year,String month);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IResponsibilityIndicatorInfoService.java

@@ -0,0 +1,18 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.ResponsibilityIndicatorInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 责任书指标明细
+
+ 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-08
+ */
+public interface IResponsibilityIndicatorInfoService extends IService<ResponsibilityIndicatorInfo> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptResponsibilityServiceImpl.java

@@ -1,10 +1,17 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.DeptResponsibility;
 import com.ims.eval.dao.DeptResponsibilityMapper;
-import com.ims.eval.service.IDeptResponsibilityService;
+import com.ims.eval.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +24,69 @@ import org.springframework.stereotype.Service;
 @Service
 public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilityMapper, DeptResponsibility> implements IDeptResponsibilityService {
 
+
+	/**
+	 * 指标主业务类
+	 */
+	private IIndicatorService iIndicatorService;
+
+	/**
+	 * 指标子业务类
+	 */
+	private IIndicatorDictionaryService indicatorDictionaryService;
+
+
+	/**
+	 * 单位/部门考评配置业务类
+	 */
+
+	private IOrganizationEvaluationRuleService organizationEvaluationRuleService;
+
+	/**
+	 * 考评规则业务类
+	 */
+	private IEvaluateRuleService evaluateRuleService;
+
+
+
+
+	@Override
+	public IPage<DeptResponsibility> list(Integer pageNum, Integer pageSize, String id, String cycleUnit, String checkCycle, String beginDate, String endDate, String binStage, String stage, String createBy, String year, String month) {
+		return null;
+	}
+
+	@Transactional
+	@Override
+	public boolean saveOrUpdate(DeptResponsibility entity) {
+		QueryWrapper<DeptResponsibility> qw = new QueryWrapper();
+		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
+			qw.lambda().eq(DeptResponsibility::getOrganizationId,entity.getOrganizationId());
+			qw.lambda().eq(DeptResponsibility::getCheckCycle,entity.getCheckCycle());
+			qw.lambda().eq(DeptResponsibility::getYear,entity.getYear());
+			List<DeptResponsibility> list = baseMapper.selectList(qw);
+			if (null != list && list.size() > 0) {
+				throw new CustomException("此单位在该阶段已存在目标责任书");
+			}
+
+			entity.setCreateTime(new Date());
+		} else {
+			entity.setUpdateTime(new Date());
+		}
+
+		boolean b = super.saveOrUpdate(entity);
+		//判断目标责任书主表新增成功
+		if(b){
+
+			//获取当前单位对应的考评规则
+			entity.getOrganizationId();
+			//周期
+			entity.getCheckCycle();
+
+//			organizationEvaluationRuleService
+
+
+		}
+
+		return b ;
+	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorDictionaryServiceImpl.java

@@ -82,6 +82,12 @@ public class IndicatorDictionaryServiceImpl extends ServiceImpl<IndicatorDiction
 
 		boolean b = false;
 		for (IndicatorDictionaryDTO dto : dictionarys) {
+
+
+			if(null == dto.getChildCode() || "".equals(dto.getChildCode().trim()) || null == dto.getChildName() || "".equals(dto.getChildName().trim())){
+				throw new CustomException("子指标名或编码为空");
+			}
+
 			for (IndicatorDictionary i : dto.getList()) {
 				if (null != i && (null == i.getId() || "".equals(i.getId().trim()))) {
 					QueryWrapper<IndicatorDictionary> qw = new QueryWrapper<>();

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/IndicatorTypeServiceImpl.java

@@ -0,0 +1,63 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.IndicatorType;
+import com.ims.eval.dao.IndicatorTypeMapper;
+import com.ims.eval.service.IIndicatorTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指标分类 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-09
+ */
+@Service
+public class IndicatorTypeServiceImpl extends ServiceImpl<IndicatorTypeMapper, IndicatorType> implements IIndicatorTypeService {
+
+	@Override
+	public List<IndicatorType> list(String id, String typeName, String typeCode) {
+
+		QueryWrapper<IndicatorType> qw = new QueryWrapper();
+		qw.lambda().eq(IndicatorType::getId, id);
+		qw.lambda().like(IndicatorType::getTypeName, typeName);
+		qw.lambda().eq(IndicatorType::getTypeCode, typeCode);
+		qw.lambda().orderByAsc(IndicatorType::getOrderNum);
+		List<IndicatorType> list = baseMapper.selectList(qw);
+
+		return list;
+	}
+
+	@Transactional
+	@Override
+	public boolean saveOrUpdate(IndicatorType entity) {
+
+		if (null != entity && (null != entity.getId() || !"".equals(entity.getId().trim()))) {
+			IndicatorType type = baseMapper.selectById(entity.getId());
+			type.setDelFlag(true);
+			baseMapper.updateById(type);
+		}
+
+		QueryWrapper<IndicatorType> qw = new QueryWrapper();
+		qw.lambda().eq(IndicatorType::getTypeCode, entity.getTypeCode());
+		qw.lambda().eq(IndicatorType::isDelFlag, false);
+		List<IndicatorType> list = baseMapper.selectList(qw);
+		if (null != list && list.size() > 0) {
+			throw new CustomException("当前分类已存在");
+		}
+
+		int count = baseMapper.selectCount(null);
+		entity.setId(null);
+		entity.setOrderNum(count);
+		return super.saveOrUpdate(entity);
+	}
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationRuleServiceImpl.java

@@ -8,6 +8,7 @@ import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.OrganizationEvaluationRule;
 import com.ims.eval.dao.OrganizationEvaluationRuleMapper;
+import com.ims.eval.entity.dto.request.OrganizationEvaluationRuleDTO;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -30,7 +31,7 @@ import java.util.List;
 public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<OrganizationEvaluationRuleMapper, OrganizationEvaluationRule> implements IOrganizationEvaluationRuleService {
 
 	@Override
-	public IPage<OrganizationEvaluationRule> list(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year, String month) {
+	public IPage<OrganizationEvaluationRule> list(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
 		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
 		//构造分页构造器
 		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
@@ -65,19 +66,13 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, evaluationCycle);
 		}
 
-		if (StringUtils.isNotEmpty(year)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getYear, year);
-		}
-		if (StringUtils.isNotEmpty(month)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getMonth, month);
-		}
+
 		qw.lambda().orderByAsc(OrganizationEvaluationRule::getOrderNum);
 
 		IPage<OrganizationEvaluationRule> list = baseMapper.selectPage(page, qw);
 
 		list.getRecords().stream().forEach(l->{
 			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
-			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
 		});
 
 
@@ -85,7 +80,7 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 	}
 
 	@Override
-	public List<OrganizationEvaluationRule> listAll(String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year, String month) {
+	public List<OrganizationEvaluationRule> listAll(String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
 		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
 		//构造分页构造器
 		if (StringUtils.isNotEmpty(id)) {
@@ -116,41 +111,34 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, evaluationCycle);
 		}
 
-		if (StringUtils.isNotEmpty(year)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getYear, year);
-		}
-		if (StringUtils.isNotEmpty(month)) {
-			qw.lambda().eq(OrganizationEvaluationRule::getMonth, month);
-		}
+
 		qw.lambda().orderByAsc(OrganizationEvaluationRule::getOrderNum);
 
 		List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);
 
 		list.stream().forEach(l->{
 			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
-			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
 		});
 
 		return list;
 	}
 
 	@Override
-	public IPage<OrganizationEvaluationRule> list2(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle, String year, String month) {
+	public IPage<OrganizationEvaluationRule> list2(Integer pageNum, Integer pageSize, String id, String organizationName, String organizationId, String organizationType, String binSection, String binStage, String evaluationCycle) {
 		Page<OrganizationEvaluationRule> page = new Page<>(pageNum, pageSize);
-		IPage<OrganizationEvaluationRule>  list = baseMapper.list(page, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+		IPage<OrganizationEvaluationRule>  list = baseMapper.list(page, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle);
 		list.getRecords().stream().forEach(l->{
 			l.setBinSectionName(null == CacheContext.ddNameMap.get(l.getBinSection()) ? "" :CacheContext.ddNameMap.get(l.getBinSection()));
-			l.setBinStageName(null == CacheContext.ddNameMap.get(l.getBinStage()) ? "" : CacheContext.ddNameMap.get(l.getBinStage()));
 		});
 		return list;
 	}
 
+
 	@Transactional
 	@Override
 	public boolean saveOrUpdate(OrganizationEvaluationRule entity) {
 		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
 			QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
-			qw.lambda().eq(OrganizationEvaluationRule::getYear, entity.getYear());
 			qw.lambda().eq(OrganizationEvaluationRule::getOrganizationId, entity.getOrganizationId());
 			qw.lambda().eq(OrganizationEvaluationRule::getEvaluationCycle, entity.getEvaluationCycle());
 			List<OrganizationEvaluationRule> list = baseMapper.selectList(qw);

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/ResponsibilityIndicatorInfoServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.ResponsibilityIndicatorInfo;
+import com.ims.eval.dao.ResponsibilityIndicatorInfoMapper;
+import com.ims.eval.service.IResponsibilityIndicatorInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 责任书指标明细
+
+ 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-08
+ */
+@Service
+public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<ResponsibilityIndicatorInfoMapper, ResponsibilityIndicatorInfo> implements IResponsibilityIndicatorInfoService {
+
+}

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationRuleMapper.xml

@@ -19,8 +19,6 @@
         <result column="del_flag" property="delFlag" />
         <result column="is_check" property="isCheck" />
         <result column="order_num" property="orderNum" />
-        <result column="year" property="year" />
-        <result column="month" property="month" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -63,14 +61,6 @@
                     AND r.evaluation_cycle = #{evaluationCycle}
                 </if>
 
-                <if test="year !=null and year !=''">
-                    AND r.year = #{year}
-                </if>
-
-                <if test="month !=null and month !=''">
-                    AND r.month = #{month}
-                </if>
-
             </where>