年度k值系数

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

@@ -121,4 +121,23 @@ public class DeptResponsibilityController {
 	}
 
 
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:deptResponsibility:remove")
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = deptResponsibilityService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
 }

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

@@ -133,12 +133,12 @@ public class OrganizationEvaluationController {
 		try {
 			List<String> orgEvalRuleIdList = Arrays.asList(evaluationIds.split(","));
 			boolean b = false;
-			for (String id : orgEvalRuleIdList) {
-				b = organizationEvaluationService.generateUnitMonthEvaluation(orgEvalRuleIdList);
-				if (!b) {
-					return R.error().data("保存失败！");
-				}
+
+			b = organizationEvaluationService.generateUnitMonthEvaluation(orgEvalRuleIdList);
+			if (!b) {
+				return R.error().data("保存失败！");
 			}
+
 			return R.ok().data(b);
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -159,12 +159,12 @@ public class OrganizationEvaluationController {
 		try {
 			List<String> orgEvalRuleIdList = Arrays.asList(evaluationIds.split(","));
 			boolean b = false;
-			for (String id : orgEvalRuleIdList) {
-				b = organizationEvaluationService.generateUnitSeasonEvaluation(orgEvalRuleIdList);
-				if (!b) {
-					return R.error().data("保存失败！");
-				}
+
+			b = organizationEvaluationService.generateUnitSeasonEvaluation(orgEvalRuleIdList);
+			if (!b) {
+				return R.error().data("保存失败！");
 			}
+
 			return R.ok().data(b);
 		} catch (CustomException e) {
 			return R.customError(e.getMessage()).data("失败！");
@@ -172,4 +172,24 @@ public class OrganizationEvaluationController {
 	}
 
 
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluation:remove")
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = organizationEvaluationService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+
 }

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

@@ -1,9 +1,16 @@
 package com.ims.eval.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.request.OrganizationEvaluationInfoUpdateDTO;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IOrganizationEvaluationInfoService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,4 +26,49 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//organization-evaluation-info")
 public class OrganizationEvaluationInfoController {
 
+
+	@Autowired
+	private IOrganizationEvaluationInfoService organizationEvaluationInfoService;
+
+
+	/**
+	 *
+	 * @param organizationEvaluationId 目标责任书id
+	 * @return
+	 */
+	//@ImsPreAuth("eval:organizationEvaluationInfo:view")
+	@GetMapping(value = "finishValueList")
+	public R finishValueList(
+		@RequestParam(value = "organizationEvaluationId", required = false) String organizationEvaluationId,
+		@RequestParam(value = "dept", required = false) String dept) {
+		Map list = organizationEvaluationInfoService.finishValueList(organizationEvaluationId, dept);
+		return R.ok().data(list);
+	}
+
+
+	/**
+	 * 批量修改
+	 *
+	 * @param evaluationInfoUpdateDTOS
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:organizationEvaluationInfo:edit")
+	@PostMapping(value = "/saveBatchDto")
+	@ApiOperation(value = "批量新增(修改)", notes = "批量新增（修改）")
+	public R saveBatchDto(@RequestBody List<OrganizationEvaluationInfoUpdateDTO> evaluationInfoUpdateDTOS) {
+
+		try {
+			boolean b = organizationEvaluationInfoService.saveBatchDto(evaluationInfoUpdateDTOS);
+			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/ResponsibilityIndicatorInfoController.java

@@ -57,7 +57,7 @@ public class ResponsibilityIndicatorInfoController {
 	public R finishValueList(
 		@RequestParam(value = "deptResponsibilityIds", required = false) List<String> deptResponsibilityIds,
 		@RequestParam(value = "dept", required = false) String dept) {
-		Map list = responsibilityIndicatorInfoService.planValueList(deptResponsibilityIds, dept);
+		Map list = responsibilityIndicatorInfoService.finishValueList(deptResponsibilityIds, dept);
 		return R.ok().data(list);
 	}
 

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

@@ -0,0 +1,157 @@
+package com.ims.eval.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.YearGroupCoefficient;
+import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
+import com.ims.eval.entity.dto.request.YearGroupCoefficientDTO;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IIndicatorDictionaryService;
+import com.ims.eval.service.IIndicatorService;
+import com.ims.eval.service.IYearGroupCoefficientService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 年度经营业绩系数 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-19
+ */
+@RestController
+@RequestMapping("//year-group-coefficient")
+public class YearGroupCoefficientController {
+
+	@Autowired
+	private IYearGroupCoefficientService yearGroupCoefficientService;
+
+
+	/**
+	 * 查询分页数据
+	 * @param pageNum
+	 * @param pageSize
+	 * @param id
+	 * @param coefficientCode
+	 * @param year
+	 * @param createOrgName
+	 * @param createBy
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "coefficientCode", required = false) String coefficientCode,
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "createOrgName", required = false) String createOrgName,
+				  @RequestParam(value = "createBy", required = false) String createBy) {
+		IPage<YearGroupCoefficient> list = yearGroupCoefficientService.list(pageNum, pageSize, id, coefficientCode, year, createOrgName, createBy);
+		return R.ok().data(list);
+	}
+
+	/**
+	 * 查询所有数据
+	 * @param id
+	 * @param coefficientCode
+	 * @param year
+	 * @param createOrgName
+	 * @param createBy
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:view")
+	@GetMapping(value = "listAll")
+	public R listAll(
+		@RequestParam(value = "id", required = false) String id,
+		@RequestParam(value = "coefficientCode", required = false) String coefficientCode,
+		@RequestParam(value = "year", required = false) String year,
+		@RequestParam(value = "createOrgName", required = false) String createOrgName,
+		@RequestParam(value = "createBy", required = false) String createBy) {
+		List<YearGroupCoefficient> list = yearGroupCoefficientService.listAll(id, coefficientCode, year, createOrgName, createBy);
+		return R.ok().data(list);
+	}
+
+
+
+
+	/**
+	 * 添加
+	 *
+	 * @param yearGroupCoefficient
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:dataDictionary:edit")
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody YearGroupCoefficient yearGroupCoefficient) {
+
+		try {
+			boolean b = yearGroupCoefficientService.saveOrUpdate(yearGroupCoefficient);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+	/**
+	 * 添加
+	 *
+	 * @param coefficientDTO
+	 * @return
+	 */
+
+	//@ImsPreAuth("eval:dataDictionary:edit")
+	@PostMapping(value = "/saveGroup")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R saveGroup(@RequestBody YearGroupCoefficientDTO coefficientDTO) {
+
+		try {
+			boolean b = yearGroupCoefficientService.saveGroup(coefficientDTO);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e){
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+
+
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:remove")
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = yearGroupCoefficientService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+}

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

@@ -0,0 +1,34 @@
+package com.ims.eval.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IIndicatorDictionaryService;
+import com.ims.eval.service.IIndicatorService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 年度经营业绩系数 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-17
+ */
+@RestController
+@RequestMapping("//year-operating-coefficient")
+public class YearOperatingCoefficientController {
+
+
+
+
+}

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

@@ -2,6 +2,10 @@ package com.ims.eval.dao;
 
 import com.ims.eval.entity.OrganizationEvaluationInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface OrganizationEvaluationInfoMapper extends BaseMapper<OrganizationEvaluationInfo> {
 
+
+
+
+	List<OrganizationEvaluationInfoResDTO> selectListEvaluationInfoId(@Param("organizationEvaluationId") String organizationEvaluationId,
+																	  @Param("dept") String dept,
+																	  @Param("optionCode") String optionCode);
+
 }

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.YearGroupCoefficient;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 年度经营业绩系数 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-19
+ */
+public interface YearGroupCoefficientMapper extends BaseMapper<YearGroupCoefficient> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.YearOperatingCoefficient;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 年度经营业绩系数 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-17
+ */
+public interface YearOperatingCoefficientMapper extends BaseMapper<YearOperatingCoefficient> {
+
+}

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

@@ -34,6 +34,11 @@ public class OrganizationEvaluationInfo extends Model {
      */
     private String organizationEvaluationId;
 
+	/**
+	 * 组织考评规则id
+	 */
+	private String  organizationEvaluationRuleId;
+
     /**
      * 指标ID
      */

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

@@ -33,6 +33,11 @@ public class ResponsibilityIndicatorInfo extends Model {
 	private String deptResponsibilityId;
 
 	/**
+	 * 组织考评规则id
+	 */
+	private String  organizationEvaluationRuleId;
+
+	/**
 	 * 指标ID
 	 */
 	private String indicatorId;

ims-service/sm-test/src/main/java/com/ims/eval/entity/Indicator.java

@@ -3,20 +3,22 @@ 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-02-26
+ * @since 2023-03-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class Indicator extends Model {
+public class YearGroupCoefficient extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -26,69 +28,44 @@ public class Indicator extends Model {
     private String id;
 
     /**
-     * 指标名称
-     */
-    private String indicatorName;
-
-    /**
-     * 指标编码
-     */
-    private String indicatorCede;
-
-    /**
-     * 指标单位
-     */
-    private String unit;
-
-    /**
-     * 能否量化
-     */
-    private String isQuantified;
-
-    /**
-     * 是否专项
-     */
-    private String isAdditional;
-
-    /**
-     * 描述
+     * 业务编码
      */
-    private String des;
+    private String coefficientCode;
 
     /**
-     * 业务版块
+     * 创建者组织名称
      */
-    private String binSection;
+    private String createOrgName;
 
     /**
-     * 业务阶段
+     * 创建者组织ID
      */
-    private String binStage;
+    private String createOrgId;
 
     /**
-     * 部门
+     * 年
      */
-    private String dept;
+    private String year;
 
     /**
-     * 公司
+     * 月
      */
-    private String company;
+    private String month;
 
     /**
-     * 是否启用
+     * 单据状态
      */
-    private Boolean enable;
+    private String state;
 
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 修改时间
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * 创建者
@@ -108,7 +85,12 @@ public class Indicator extends Model {
     /**
      * 排序
      */
-    private BigDecimal orderNum;
+    private String des;
+
+    /**
+     * 排序
+     */
+    private Integer orderNum;
 
 
 }

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

@@ -0,0 +1,145 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 年度经营业绩系数
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class YearOperatingCoefficient extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 组织ID
+     */
+    private String organizationId;
+
+
+	/**
+	 * 年度经营业绩系数ID
+	 */
+	private String yearGroupCoefficientId;
+
+    /**
+     * 业务版块
+     */
+    private String binSection;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * K
+     */
+    private double k;
+
+    /**
+     * 资产总额
+     */
+    private double zzc;
+
+    /**
+     * K1
+     */
+    private double k1;
+
+    /**
+     * 机组（场站、矿井）数
+     */
+    private double jzs;
+
+    /**
+     * K2
+     */
+    private double k2;
+
+    /**
+     * 账面利润总额
+     */
+    private double zmlrze;
+
+    /**
+     * 发电量
+     */
+    private double fdl;
+
+    /**
+     * 度电利润
+     */
+    private double ddlr;
+
+    /**
+     * K3
+     */
+    private double k3;
+
+    /**
+     * 定员
+     */
+    private double dy;
+
+    /**
+     * K4
+     */
+    private double k4;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+
+}

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

@@ -0,0 +1,46 @@
+package com.ims.eval.entity.dto.request;
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class OrganizationEvaluationInfoUpdateDTO {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	private String id;
+
+
+	/**
+	 * 能否量化
+	 */
+	private String isQuantified;
+
+	/**
+	 * 量化值
+	 */
+	private double quantifiedValue;
+
+	/**
+	 * 非量化值
+	 */
+	private String nonQuantifiedValue;
+
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+
+	/**
+	 * 更新者
+	 */
+	private String updateBy;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+}

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

@@ -0,0 +1,13 @@
+package com.ims.eval.entity.dto.request;
+
+import com.ims.eval.entity.YearGroupCoefficient;
+import com.ims.eval.entity.YearOperatingCoefficient;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class YearGroupCoefficientDTO extends YearGroupCoefficient {
+
+	List<YearOperatingCoefficient> coefficientList;
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/response/OrganizationEvaluationInfoResDTO.java

@@ -0,0 +1,88 @@
+package com.ims.eval.entity.dto.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "考评明细响应类", description = "考评明细响应类")
+public class OrganizationEvaluationInfoResDTO {
+
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	private String id;
+
+	/**
+	 * 指标ID
+	 */
+	private String indicatorId;
+
+	/**
+	 * 能否量化
+	 */
+	private String isQuantified;
+
+	/**
+	 * 业务阶段
+	 */
+	private String stageName;
+
+	/**
+	 * 业务板块
+	 */
+	private String sectionName;
+
+	/**
+	 * 组织名
+	 */
+	private String organizationName;
+
+	/**
+	 * 责任部门
+	 */
+	private String deptName;
+
+
+	/**
+	 * 指标类别
+	 */
+	private String typeName;
+
+	/**
+	 * 指标名
+	 */
+	private String indicatorName;
+
+	/**
+	 * 指标子名
+	 */
+	private String childName;
+
+	/**
+	 * 指标项
+	 */
+	private String optionName;
+
+	/**
+	 * 指标项Code
+	 */
+	private String optionCode;
+
+	/**
+	 * 量化值
+	 */
+	private double quantifiedValue;
+
+	/**
+	 * 非量化值
+	 */
+	private String nonQuantifiedValue;
+
+	/**
+	 * 指标单位
+	 */
+	private String unit;
+}

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

@@ -2,6 +2,10 @@ package com.ims.eval.service;
 
 import com.ims.eval.entity.OrganizationEvaluationInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.dto.request.OrganizationEvaluationInfoUpdateDTO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOrganizationEvaluationInfoService extends IService<OrganizationEvaluationInfo> {
 
+	Map finishValueList(String organizationEvaluationId, String dept);
+
+	boolean saveBatchDto(List<OrganizationEvaluationInfoUpdateDTO>  evaluationInfoUpdateDTOS);
+
 }

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

@@ -0,0 +1,26 @@
+package com.ims.eval.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.YearGroupCoefficient;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ims.eval.entity.dto.request.YearGroupCoefficientDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 年度经营业绩系数 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-19
+ */
+public interface IYearGroupCoefficientService extends IService<YearGroupCoefficient> {
+
+	IPage<YearGroupCoefficient> list(Integer pageNum, Integer pageSize, String id, String coefficientCode, String year, String createOrgName, String createBy);
+
+	List<YearGroupCoefficient> listAll(String id, String coefficientCode, String year, String createOrgName, String createBy);
+
+	boolean saveGroup(YearGroupCoefficientDTO coefficientDTO);
+
+}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.YearOperatingCoefficient;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 年度经营业绩系数 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-17
+ */
+public interface IYearOperatingCoefficientService extends IService<YearOperatingCoefficient> {
+
+}

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

@@ -9,7 +9,6 @@ import com.ims.eval.config.CustomException;
 import com.ims.eval.dao.ResponsibilityIndicatorInfoMapper;
 import com.ims.eval.entity.*;
 import com.ims.eval.dao.DeptResponsibilityMapper;
-import com.ims.eval.entity.dto.response.IndicatorResDTO;
 import com.ims.eval.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,10 +16,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.io.Serializable;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -187,6 +184,7 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 			indicators.stream().forEach(i -> {
 				ResponsibilityIndicatorInfo info = new ResponsibilityIndicatorInfo();
 				info.setDeptResponsibilityId(oriResponsibility.getId());
+				info.setOrganizationEvaluationRuleId(ruleId);
 				info.setIndicatorId(i.getId());
 				info.setIndicatorDictionaryId(null);
 				info.setOptionCode("ZRMB");
@@ -315,4 +313,22 @@ public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilit
 		return list;
 	}
 
+	@Transactional
+	@Override
+	public boolean removeByIds(Collection<? extends Serializable> idList) {
+
+		QueryWrapper<ResponsibilityIndicatorInfo> infoqw = new QueryWrapper<>();
+		infoqw.lambda().in(ResponsibilityIndicatorInfo::getDeptResponsibilityId, idList);
+		int infcount = responsibilityIndicatorInfoService.count(infoqw);
+		if (infcount > 0) {
+			throw new CustomException("已发起流程不允许删除");
+		}
+
+		boolean b = super.removeByIds(idList);
+		if (!b) {
+			throw new CustomException("删除失败");
+
+		}
+		return true;
+	}
 }

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

@@ -1,10 +1,22 @@
 package com.ims.eval.service.impl;
 
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.OrganizationEvaluationInfo;
 import com.ims.eval.dao.OrganizationEvaluationInfoMapper;
+import com.ims.eval.entity.ResponsibilityIndicatorInfo;
+import com.ims.eval.entity.dto.request.OrganizationEvaluationInfoUpdateDTO;
+import com.ims.eval.entity.dto.request.ResponsibilityIndicatorInfoUpdateDTO;
+import com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO;
+import com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO;
 import com.ims.eval.service.IOrganizationEvaluationInfoService;
 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;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -19,4 +31,34 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<OrganizationEvaluationInfoMapper, OrganizationEvaluationInfo> implements IOrganizationEvaluationInfoService {
 
+	@Override
+	public Map finishValueList(String organizationEvaluationId, String dept) {
+
+		List<OrganizationEvaluationInfoResDTO> list = baseMapper.selectListEvaluationInfoId(organizationEvaluationId,dept,"");//默认获取指定的怎目标
+
+		Map<String  ,List<OrganizationEvaluationInfoResDTO>> map  = list.stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIsQuantified));
+		map.put("quantifiedList", map.remove("是"));
+		map.put("nonQuantifiedList", map.remove("否"));
+		return map;
+	}
+
+	@Transactional
+	@Override
+	public boolean saveBatchDto(List<OrganizationEvaluationInfoUpdateDTO> evaluationInfoUpdateDTOS) {
+		for (OrganizationEvaluationInfoUpdateDTO entity : evaluationInfoUpdateDTOS) {
+			OrganizationEvaluationInfo organizationEvaluationInfo = baseMapper.selectById(entity.getId());
+
+			organizationEvaluationInfo.setQuantifiedValue(entity.getQuantifiedValue());//量化值
+			organizationEvaluationInfo.setNonQuantifiedValue(entity.getNonQuantifiedValue());//非量化值
+			organizationEvaluationInfo.setUpdateTime(new Date());//更新时间
+			organizationEvaluationInfo.setUpdateBy(entity.getUpdateBy());//更新者
+			organizationEvaluationInfo.setRemark(entity.getRemark());//备注
+
+			boolean b = super.saveOrUpdate(organizationEvaluationInfo);
+			if(!b){
+				throw new CustomException("更新失败");
+			}
+		}
+		return true;
+	}
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -203,7 +204,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		return b;
 	}
 
-	//	@Transactional
+	@Transactional
 	@Override
 	public boolean generateUnitEvaluationInfo(List<String> ids) {
 
@@ -270,6 +271,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				resDTOS.stream().forEach(r -> {
 					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
+					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
@@ -351,6 +353,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				resDTOS.stream().forEach(r -> {
 					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
+					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
@@ -424,6 +427,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 				resDTOS.stream().forEach(r -> {
 					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 					info.setOrganizationEvaluationId(organizationEvaluation.getId());
+					info.setOrganizationEvaluationRuleId(ruleId);
 					info.setIndicatorId(r.getId());
 					info.setIndicatorDictionaryId(r.getIndicatorDictionaryID());
 					info.setOptionCode(r.getOptionCode());
@@ -461,4 +465,22 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 		List<OrganizationEvaluation> list = baseMapper.selectList(qw);
 		return list;
 	}
+
+
+	@Transactional
+	@Override
+	public boolean removeByIds(Collection<? extends Serializable> idList) {
+
+		QueryWrapper<OrganizationEvaluationInfo> infoqw = new QueryWrapper<>();
+		infoqw.lambda().in(OrganizationEvaluationInfo::getOrganizationEvaluationId, idList);
+		int infocount = organizationEvaluationInfoService.count(infoqw);
+		if (infocount > 0) {
+			throw new CustomException("已发起流程不允许删除");
+		}
+		boolean b = super.removeByIds(idList);
+		if (!b) {
+			throw new CustomException("删除失败");
+		}
+		return true;
+	}
 }

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

@@ -90,7 +90,7 @@ public class ResponsibilityIndicatorInfoServiceImpl extends ServiceImpl<Responsi
 		qw.lambda().eq(ResponsibilityIndicatorInfo::getDeptResponsibilityId,deptResponsibilityId);
 		List<ResponsibilityIndicatorInfo> list = baseMapper.selectList(qw);
 		list.stream().forEach(i->{
-			map.put(i.getId(),i.getIsQuantified().equals("是")?i.getQuantifiedValue():i.getQuantifiedValue());
+			map.put(i.getIndicatorId(),i.getIsQuantified().equals("是")?i.getQuantifiedValue():i.getQuantifiedValue());
 		});
 		return map;
 	}

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

@@ -0,0 +1,167 @@
+package com.ims.eval.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.cache.CacheContext;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.YearGroupCoefficient;
+import com.ims.eval.dao.YearGroupCoefficientMapper;
+import com.ims.eval.entity.YearOperatingCoefficient;
+import com.ims.eval.entity.dto.request.YearGroupCoefficientDTO;
+import com.ims.eval.service.IYearGroupCoefficientService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ims.eval.service.IYearOperatingCoefficientService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 年度经营业绩系数 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-19
+ */
+@Service
+public class YearGroupCoefficientServiceImpl extends ServiceImpl<YearGroupCoefficientMapper, YearGroupCoefficient> implements IYearGroupCoefficientService {
+
+
+
+	@Autowired
+	private IYearOperatingCoefficientService yearOperatingCoefficientService;
+
+	@Override
+	public IPage<YearGroupCoefficient> list(Integer pageNum, Integer pageSize, String id, String coefficientCode, String year, String createOrgName, String createBy) {
+
+		QueryWrapper<YearGroupCoefficient> qw = new QueryWrapper<>();
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		//构造分页构造器
+		Page<YearGroupCoefficient> page = new Page<>(pageNum, pageSize);
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(YearGroupCoefficient::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(coefficientCode)) {
+			qw.lambda().like(YearGroupCoefficient::getCoefficientCode, coefficientCode);
+		}
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(YearGroupCoefficient::getYear, year);
+		}
+		if (StringUtils.isNotEmpty(createOrgName)) {
+			qw.lambda().like(YearGroupCoefficient::getCreateOrgName, createOrgName);
+		}
+		if (StringUtils.isNotEmpty(createBy)) {
+			qw.lambda().eq(YearGroupCoefficient::getCreateBy, createBy);
+		}
+
+		IPage<YearGroupCoefficient> list = baseMapper.selectPage(page, qw);
+
+		return list;
+	}
+
+	@Override
+	public List<YearGroupCoefficient> listAll(String id, String coefficientCode, String year, String createOrgName, String createBy) {
+
+		QueryWrapper<YearGroupCoefficient> qw = new QueryWrapper<>();
+
+
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(YearGroupCoefficient::getId, id);
+		}
+
+		if (StringUtils.isNotEmpty(coefficientCode)) {
+			qw.lambda().like(YearGroupCoefficient::getCoefficientCode, coefficientCode);
+		}
+
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(YearGroupCoefficient::getYear, year);
+		}
+
+		if (StringUtils.isNotEmpty(createOrgName)) {
+			qw.lambda().like(YearGroupCoefficient::getCreateOrgName, createOrgName);
+		}
+
+		if (StringUtils.isNotEmpty(createBy)) {
+			qw.lambda().eq(YearGroupCoefficient::getCreateBy, createBy);
+		}
+
+		List<YearGroupCoefficient> list = baseMapper.selectList(qw);
+
+		return list;
+	}
+
+	@Transactional
+	@Override
+	public boolean saveGroup(YearGroupCoefficientDTO coefficientDTO) {
+		QueryWrapper<YearGroupCoefficient> qw = new QueryWrapper<>();
+
+		if (null != coefficientDTO && (null == coefficientDTO.getId() || "".equals(coefficientDTO.getId().trim()))) {
+			if (StringUtils.isNotEmpty(coefficientDTO.getYear())) {
+				qw.lambda().eq(YearGroupCoefficient::getYear, coefficientDTO.getYear());
+			}
+			List<YearGroupCoefficient> list = baseMapper.selectList(qw);
+			if (null != list && list.size() > 0) {
+				throw new CustomException("已存在该年度系数");
+			}
+			coefficientDTO.setCreateTime(new Date());
+		}else {
+			coefficientDTO.setUpdateTime(new Date());
+		}
+		boolean b = super.saveOrUpdate(coefficientDTO);
+		if(!b){
+			throw new CustomException("年度系数保存失败");
+		}
+
+		if(null == coefficientDTO.getCoefficientList() || coefficientDTO.getCoefficientList().size()<=0){
+			throw new CustomException("年度系数明细为空");
+		}
+		for (YearOperatingCoefficient coefficient : coefficientDTO.getCoefficientList()){
+			coefficient.setYearGroupCoefficientId(coefficient.getId());
+			b =	yearOperatingCoefficientService.saveOrUpdate(coefficient);
+		}
+
+		return b;
+	}
+
+
+	@Transactional
+	@Override
+	public boolean saveOrUpdate(YearGroupCoefficient entity) {
+
+		QueryWrapper<YearGroupCoefficient> qw = new QueryWrapper<>();
+
+		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
+			if (StringUtils.isNotEmpty(entity.getYear())) {
+				qw.lambda().eq(YearGroupCoefficient::getYear, entity.getYear());
+			}
+			List<YearGroupCoefficient> list = baseMapper.selectList(qw);
+			if (null != list && list.size() > 0) {
+				throw new CustomException("已存在该年度系数");
+			}
+			entity.setCreateTime(new Date());
+		}else {
+			entity.setUpdateTime(new Date());
+		}
+		return super.saveOrUpdate(entity);
+	}
+
+
+
+
+	@Override
+	public boolean removeByIds(Collection<? extends Serializable> idList) {
+		return super.removeByIds(idList);
+	}
+}

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

@@ -0,0 +1,20 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.YearOperatingCoefficient;
+import com.ims.eval.dao.YearOperatingCoefficientMapper;
+import com.ims.eval.service.IYearOperatingCoefficientService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 年度经营业绩系数 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-03-17
+ */
+@Service
+public class YearOperatingCoefficientServiceImpl extends ServiceImpl<YearOperatingCoefficientMapper, YearOperatingCoefficient> implements IYearOperatingCoefficientService {
+
+}

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

@@ -23,5 +23,54 @@
     <sql id="Base_Column_List">
         id, organization_evaluation_id, indicator_id, indicator_dictionary_id, option_code, is_quantified, quantified_value, non_quantified_value, create_time, create_by, update_time, update_by, remark
     </sql>
+    <select id="selectListEvaluationInfoId"
+            resultType="com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO">
+
+        select
+        ei.id,
+        ei.indicator_id,
+        ei.is_quantified,
+        be.stage_name,
+        bn.section_name,
+        oer.organization_name,
+        dd.key_name deptName,
+        it.type_name,
+        i.indicator_name,
+        id.child_name,
+        id.option_name,
+        id.option_code,
+        ei.quantified_value,
+        ei.non_quantified_value,
+        i.unit
+        from
+        organization_evaluation_info ei
+        inner join organization_evaluation_rule oer on oer.id = ei.organization_evaluation_rule_id
+        inner join organization_evaluation oe on oe.id = ei.organization_evaluation_id
+        left join indicator i on ei.indicator_id = i.id
+        left join bin_stage be on i.bin_stage = be.id
+        left join bin_section bn on i.bin_section = bn.id
+        left join indicator_type it on i.indicator_type_id = it.id
+        left join indicator_dictionary id on ei.indicator_dictionary_id = id.id
+        inner join data_dictionary dd on dd.data_key = i.dept
+        <where>
+
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                and  ei.organization_evaluation_id  = #{organizationEvaluationId}
+            </if>
+
+            <if test="optionCode !=null and optionCode !=''">
+                and ei.option_code = #{optionCode}
+            </if>
+
+            <if test="dept !=null and dept !=''">
+                and  dd.key_name = #{dept}
+            </if>
+
+
+        </where>
+
+        order by ei.option_code desc
+
+    </select>
 
 </mapper>

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

@@ -24,6 +24,53 @@
         id, dept_responsibility_id, indicator_id, indicator_dictionary_id, option_code, is_quantified, quantified_value, non_quantified_value, create_time, create_by, update_time, update_by, remark
     </sql>
 
+<!--    <select id="listByresponsibilityId" resultType="com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO">-->
+
+<!--        select-->
+<!--        ri.id,-->
+<!--        ri.indicator_id,-->
+<!--        ri.is_quantified,-->
+<!--        be.stage_name,-->
+<!--        bn.section_name,-->
+<!--        dr.organization_name,-->
+<!--        dd.key_name deptName,-->
+<!--        it.type_name,-->
+<!--        i.indicator_name,-->
+<!--        id.child_name,-->
+<!--        id.option_name,-->
+<!--        id.option_code,-->
+<!--        ri.quantified_value,-->
+<!--        ri.non_quantified_value,-->
+<!--        i.unit-->
+<!--        from-->
+<!--            responsibility_indicator_info ri-->
+<!--            inner join dept_responsibility dr on dr.id = ri.dept_responsibility_id-->
+<!--            left join indicator i on ri.indicator_id = i.id-->
+<!--            left join bin_stage be on i.bin_stage = be.id-->
+<!--            left join bin_section bn on i.bin_section = bn.id-->
+<!--            left join indicator_type it on i.indicator_type_id = it.id-->
+<!--            left join indicator_dictionary id on ri.indicator_dictionary_id = id.id-->
+<!--            inner join data_dictionary dd on dd.data_key = i.dept-->
+<!--        <where>-->
+<!--            ri.dept_responsibility_id in  <foreach item="item" collection="deptResponsibilityIds" separator="," open="(" close=")" index="">'${item}'</foreach>-->
+
+<!--            <if test="optionCode !=null and optionCode !=''">-->
+<!--                and id.option_code = #{optionCode}-->
+<!--            </if>-->
+
+<!--            <if test="dept !=null and dept !=''">-->
+<!--                and  dd.key_name = #{dept}-->
+<!--            </if>-->
+
+
+<!--        </where>-->
+
+<!--            order by id.option_code desc-->
+
+<!--    </select>-->
+<!--    -->
+
+
     <select id="listByresponsibilityId" resultType="com.ims.eval.entity.dto.response.ResponsibilityIndicatorInfoResDTO">
 
         select
@@ -32,30 +79,27 @@
         ri.is_quantified,
         be.stage_name,
         bn.section_name,
-        dr.organization_name,
+        oer.organization_name,
         dd.key_name deptName,
         it.type_name,
         i.indicator_name,
-        id.child_name,
-        id.option_name,
-        id.option_code,
         ri.quantified_value,
         ri.non_quantified_value,
         i.unit
         from
-            responsibility_indicator_info ri
-            inner join dept_responsibility dr on dr.id = ri.dept_responsibility_id
-            left join indicator i on ri.indicator_id = i.id
-            left join bin_stage be on i.bin_stage = be.id
-            left join bin_section bn on i.bin_section = bn.id
-            left join indicator_type it on i.indicator_type_id = it.id
-            left join indicator_dictionary id on ri.indicator_dictionary_id = id.id
-            inner join data_dictionary dd on dd.data_key = i.dept
+        responsibility_indicator_info ri
+        inner join dept_responsibility dr on dr.id = ri.dept_responsibility_id
+        inner join organization_evaluation_rule oer on oer.id = ri.organization_evaluation_rule_id
+        left join indicator i on ri.indicator_id = i.id
+        left join bin_stage be on i.bin_stage = be.id
+        left join bin_section bn on i.bin_section = bn.id
+        left join indicator_type it on i.indicator_type_id = it.id
+        inner join data_dictionary dd on dd.data_key = i.dept
         <where>
             ri.dept_responsibility_id in  <foreach item="item" collection="deptResponsibilityIds" separator="," open="(" close=")" index="">'${item}'</foreach>
 
             <if test="optionCode !=null and optionCode !=''">
-                and id.option_code = #{optionCode}
+                and ri.option_code = #{optionCode}
             </if>
 
             <if test="dept !=null and dept !=''">
@@ -65,9 +109,9 @@
 
         </where>
 
-            order by id.option_code desc
-
+        order by ri.option_code desc
 
     </select>
 
+
 </mapper>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.YearGroupCoefficientMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.YearGroupCoefficient">
+        <id column="id" property="id" />
+        <result column="coefficient_code" property="coefficientCode" />
+        <result column="create_org_name" property="createOrgName" />
+        <result column="create_org_id" property="createOrgId" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="state" property="state" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_by" property="updateBy" />
+        <result column="remark" property="remark" />
+        <result column="des" property="des" />
+        <result column="order_num" property="orderNum" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, coefficient_code, create_org_name, create_org_id, year, month, state, create_time, update_time, create_by, update_by, remark, des, order_num
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.YearOperatingCoefficientMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ims.eval.entity.YearOperatingCoefficient">
+        <id column="id" property="id" />
+        <result column="organization_name" property="organizationName" />
+        <result column="organization_id" property="organizationId" />
+        <result column="bin_section" property="binSection" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="k" property="k" />
+        <result column="zzc" property="zzc" />
+        <result column="k1" property="k1" />
+        <result column="jzs" property="jzs" />
+        <result column="k2" property="k2" />
+        <result column="zmlrze" property="zmlrze" />
+        <result column="fdl" property="fdl" />
+        <result column="ddlr" property="ddlr" />
+        <result column="k3" property="k3" />
+        <result column="dy" property="dy" />
+        <result column="k4" property="k4" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="remark" property="remark" />
+        <result column="des" property="des" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, organization_name, organization_id, bin_section, year, month, k, zzc, k1, jzs, k2, zmlrze, fdl, ddlr, k3, dy, k4, create_time, create_by, update_time, update_by, remark, des
+    </sql>
+
+</mapper>

ims-service/sm-test/src/main/java/com/ims/eval/controller/DataDictionaryController.java

@@ -1,63 +0,0 @@
-package com.ims.eval.controller;
-
-
-import com.ims.eval.entity.DataDictionary;
-import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.entity.dto.result.R;
-import com.ims.eval.service.IDataDictionaryService;
-import com.ims.system.auth.ImsPreAuth;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 数据字典表 前端控制器
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@RestController
-@RequestMapping("//data-dictionary")
-public class DataDictionaryController {
-
-	@Autowired
-	private IDataDictionaryService dataDictionaryService;
-
-
-	//@ImsPreAuth("eval:dataDictionary:view")
-	@GetMapping(value = "list")
-	public R list(@RequestParam(value = "id", required = false) String id,
-									 @RequestParam(value = "dataKey", required = false) String dataKey,
-									 @RequestParam(value = "keyName", required = false) String keyName,
-									 @RequestParam(value = "superKey", required = false) String superKey ) {
-		List<DataDictionary> list = dataDictionaryService.list(id,dataKey,keyName,superKey);
-		return R.ok().data(list);
-	}
-
-
-	/**
-	 * 添加
-	 * @param dictionary
-	 * @return
-	 */
-
-//	@ImsPreAuth("eval:dataDictionary:edit")
-	@PostMapping(value = "/save")
-	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
-	public R addAll(@RequestBody DataDictionary dictionary) {
-
-		boolean b = dataDictionaryService.saveOrUpdate(dictionary);
-		if (b) {
-			return R.ok().data(b);
-		} else {
-			return R.error().data("保存失败！");
-		}
-	}
-
-
-
-}

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

@@ -1,123 +0,0 @@
-/**
- *
- */
-package com.ims.eval.controller;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.DeptResponsibility;
-import com.ims.eval.service.IDeptResponsibilityService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 部门目标责任Controller
- * @author wang
- * @version 2023-02-23
- */
-@Controller
-@RequestMapping(value = "/eval/ddeptResponsibility")
-public class DeptResponsibilityController extends WebController<IDeptResponsibilityService, DeptResponsibility> {
-
- 	//@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "list")
-	public String list(DeptResponsibility ddeptResponsibility, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "form")
-	public String form(DeptResponsibility ddeptResponsibility, Model model) {
-	    String formView = ddeptResponsibility.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityForm";
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "lov")
-	public String lov(DeptResponsibility ddeptResponsibility, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(DeptResponsibility ddeptResponsibility, MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(ddeptResponsibility,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(ddeptResponsibility,request,response );
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/controller/DeptResponsibilityTargetController.java

@@ -1,122 +0,0 @@
-/**
- *
- */
-package com.ims.eval.controller;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.DeptResponsibilityTarget;
-import com.ims.eval.service.IDeptResponsibilityTargetService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 目标责任书指标Controller
- * @author wang
- * @version 2023-02-23
- */
-@Controller
-@RequestMapping(value = "/eval/deptResponsibilityTarget")
-public class DeptResponsibilityTargetController extends WebController<IDeptResponsibilityTargetService, DeptResponsibilityTarget> {
-
- 	//@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "list")
-	public String list(DeptResponsibilityTarget deptResponsibilityTarget, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/deptResponsibilityTargetList";
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "form")
-	public String form(DeptResponsibilityTarget deptResponsibilityTarget, Model model) {
-	    String formView = deptResponsibilityTarget.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/deptResponsibilityTargetForm";
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "lov")
-	public String lov(DeptResponsibilityTarget deptResponsibilityTarget, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/deptResponsibilityTargetList";
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(DeptResponsibilityTarget deptResponsibilityTarget, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(DeptResponsibilityTarget deptResponsibilityTarget,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(deptResponsibilityTarget,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(deptResponsibilityTarget,request,response );
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/controller/EvaluateRuleController.java

@@ -1,122 +0,0 @@
-/**
- *
- */
-package com.ims.eval.controller;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.service.IEvaluateRuleService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 考评规则Controller
- * @author wang
- * @version 2023-02-23
- */
-@Controller
-@RequestMapping(value = "/eval/evaluateRule")
-public class EvaluateRuleController extends WebController<IEvaluateRuleService,EvaluateRule> {
-
- 	//@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "list")
-	public String list(EvaluateRule evaluateRule, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateRuleList";
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "form")
-	public String form(EvaluateRule evaluateRule, Model model) {
-	    String formView = evaluateRule.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateRuleForm";
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "lov")
-	public String lov(EvaluateRule evaluateRule, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateRuleList";
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(EvaluateRule evaluateRule, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(EvaluateRule evaluateRule,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(evaluateRule,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(evaluateRule,request,response );
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/controller/EvaluateScoreController.java

@@ -1,123 +0,0 @@
-/**
- *
- */
-package com.ims.eval.controller;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.EvaluateScore;
-import com.ims.eval.service.IEvaluateScoreService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 考评得分Controller
- * @author wang
- * @version 2023-02-23
- */
-@Controller
-@RequestMapping(value = "/eval/evaluateScore")
-public class EvaluateScoreController extends WebController<IEvaluateScoreService, EvaluateScore> {
-
- 	//@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "list")
-	public String list(EvaluateScore evaluateScore, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateScoreList";
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "form")
-	public String form(EvaluateScore evaluateScore, Model model) {
-	    String formView = evaluateScore.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateScoreForm";
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "lov")
-	public String lov(EvaluateScore evaluateScore, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateScoreList";
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(EvaluateScore evaluateScore, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(EvaluateScore evaluateScore,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(evaluateScore,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(evaluateScore,request,response );
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorController.java

@@ -1,20 +0,0 @@
-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-02-26
- */
-@RestController
-@RequestMapping("//indicator")
-public class IndicatorController {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorDictionaryController.java

@@ -1,41 +0,0 @@
-package com.ims.eval.controller;
-
-
-import com.ims.core.controller.WebController;
-import com.ims.eval.entity.Indicator;
-import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.entity.Report;
-import com.ims.eval.service.IIndicatorDictionaryService;
-import com.ims.eval.service.IReportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 指标字典表 前端控制器
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@RestController
-@RequestMapping("//indicator-dictionary")
-public class IndicatorDictionaryController  {
-
-
-	@Autowired
-	private IIndicatorDictionaryService indicatorDictionaryService;
-
-	//@ImsPreAuth("eval:indicator:view")
-	@RequestMapping(value = "list")
-	public List<IndicatorDictionary> list() {
-		List<IndicatorDictionary> list = indicatorDictionaryService.list();
-		return list;
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/controller/ReportController.java

@@ -1,134 +0,0 @@
-/**
- *
- */
-package com.ims.eval.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
-
-
-import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.Report;
-import com.ims.eval.service.IReportService;
-
-/**
- * 发布公告表Controller
- * @author wang
- * @version 2023-02-25
- */
-@Controller
-@RequestMapping(value = "/eval/report")
-public class ReportController extends WebController<IReportService,Report> {
-
- 	//@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "list")
-	public String list(Report report, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/reportList";
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "form")
-	public String form(Report report, Model model) {
-	    String formView = report.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/reportForm";
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "lov")
-	public String lov(Report report, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/reportList";
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(Report report, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(Report report, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(Report report, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(Report report, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(Report report,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(report,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(Report report, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(report,request,response );
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/DataDictionaryMapper.java

@@ -1,16 +0,0 @@
-package com.ims.eval.dao;
-
-import com.ims.eval.entity.DataDictionary;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 数据字典表 Mapper 接口
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/DdeptResponsibilityDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.DeptResponsibility;
-
-/**
- * 部门目标责任DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface DdeptResponsibilityDao extends CrudDao<DeptResponsibility> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/DeptResponsibilityTargetDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.DeptResponsibilityTarget;
-
-/**
- * 目标责任书指标DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface DeptResponsibilityTargetDao extends CrudDao<DeptResponsibilityTarget> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/EvaluateRuleDao.java

@@ -1,17 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.EvaluateRule;
-
-
-/**
- * 考评规则DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface EvaluateRuleDao extends CrudDao<EvaluateRule> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/EvaluateScoreDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.EvaluateScore;
-
-/**
- * 考评得分DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface EvaluateScoreDao extends CrudDao<EvaluateScore> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDictionaryMapper.java

@@ -1,18 +0,0 @@
-package com.ims.eval.dao;
-
-import com.ims.eval.entity.IndicatorDictionary;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 指标字典表 Mapper 接口
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@Mapper
-public interface IndicatorDictionaryMapper extends BaseMapper<IndicatorDictionary> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorMapper.java

@@ -1,16 +0,0 @@
-package com.ims.eval.dao;
-
-import com.ims.eval.entity.Indicator;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-public interface IndicatorMapper extends BaseMapper<Indicator> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/dao/ReportDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.Report;
-
-/**
- * 发布公告表DAO接口
- * @author wang
- * @version 2023-02-25
- */
-public interface ReportDao extends CrudDao<Report> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/entity/DataDictionary.java

@@ -1,74 +0,0 @@
-package com.ims.eval.entity;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 数据字典表
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class DataDictionary extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String id;
-
-
-	/**
-	 * 数据key
-	 */
-	private String dataKey;
-
-    /**
-     * 名称
-     */
-    private String keyName;
-
-    /**
-     * 对应值
-     */
-    private String keyValue;
-
-    /**
-     * 描述
-     */
-    private String des;
-
-    /**
-     * 父类key
-     */
-    private String superKey;
-
-    /**
-     * 创建时间
-     */
-    private LocalDate createTime;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDate updateTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-
-}

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

@@ -1,159 +0,0 @@
-/**
- *
- */
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-/**
- * 部门目标责任表Entity
- * @author wang
- * @version 2023-02-25
- */
-public class DeptResponsibility extends DataEntity<DeptResponsibility> {
-
-	private static final long serialVersionUID = 1L;
-	private String deptId;		// 部门ID
-	private String cycleUnit;		// 周期单位
-	private String checkCycle;		// 周期
-	private Date beginDate;		// 考核开始时间
-	private Date endDate;		// 考核截止时间
-	private String stage;		// 审批状态
-	private String des;		// 描述
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-	private String reviewPeople;		// 复审人
-	private Date reviewPeopleTime;		// 复审时间
-	private String reviewOpinion;		// 复审意见
-	private String finalReviewPeople;		// 终审人
-	private Date finalReviewPeopleTime;		// 终审时间
-	private String finalReviewOpinion;		// 终审意见
-	private String remark;		// 备注
-
-
-	public DeptResponsibility() {
-		super();
-	}
-
-	public DeptResponsibility(String id){
-		super(id);
-	}
-
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	public String getCycleUnit() {
-		return cycleUnit;
-	}
-
-	public void setCycleUnit(String cycleUnit) {
-		this.cycleUnit = cycleUnit;
-	}
-	public String getCheckCycle() {
-		return checkCycle;
-	}
-
-	public void setCheckCycle(String checkCycle) {
-		this.checkCycle = checkCycle;
-	}
-	public Date getBeginDate() {
-		return beginDate;
-	}
-
-	public void setBeginDate(Date beginDate) {
-		this.beginDate = beginDate;
-	}
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-	public String getStage() {
-		return stage;
-	}
-
-	public void setStage(String stage) {
-		this.stage = stage;
-	}
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	public String getReviewPeople() {
-		return reviewPeople;
-	}
-
-	public void setReviewPeople(String reviewPeople) {
-		this.reviewPeople = reviewPeople;
-	}
-	public Date getReviewPeopleTime() {
-		return reviewPeopleTime;
-	}
-
-	public void setReviewPeopleTime(Date reviewPeopleTime) {
-		this.reviewPeopleTime = reviewPeopleTime;
-	}
-	public String getReviewOpinion() {
-		return reviewOpinion;
-	}
-
-	public void setReviewOpinion(String reviewOpinion) {
-		this.reviewOpinion = reviewOpinion;
-	}
-	public String getFinalReviewPeople() {
-		return finalReviewPeople;
-	}
-
-	public void setFinalReviewPeople(String finalReviewPeople) {
-		this.finalReviewPeople = finalReviewPeople;
-	}
-	public Date getFinalReviewPeopleTime() {
-		return finalReviewPeopleTime;
-	}
-
-	public void setFinalReviewPeopleTime(Date finalReviewPeopleTime) {
-		this.finalReviewPeopleTime = finalReviewPeopleTime;
-	}
-	public String getFinalReviewOpinion() {
-		return finalReviewOpinion;
-	}
-
-	public void setFinalReviewOpinion(String finalReviewOpinion) {
-		this.finalReviewOpinion = finalReviewOpinion;
-	}
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/entity/DeptResponsibilityTarget.java

@@ -1,319 +0,0 @@
-/**
- *
- */
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-/**
- * 目标责任书指标Entity
- * @author wang
- * @version 2023-02-25
- */
-public class DeptResponsibilityTarget extends DataEntity<DeptResponsibilityTarget> {
-
-	private static final long serialVersionUID = 1L;
-	private String responsibilityId;		// 目标责任书ID
-	private String indicatorId;		// 指标ID
-	private BigDecimal quantizationTarget;		// 量化目标
-	private BigDecimal quantizationTargetActual;		// 量化目标完成值
-	private String evaluationTarget;		// 评价目标
-	private BigDecimal evaluationTargetActual;		// 评价目标完成值
-	private BigDecimal monthThreshold;		// 月度预警零界值
-	private BigDecimal seasonThreshold;		// 季度预警零界值
-	private BigDecimal yearThreshold;		// 年度预警零界值
-	private BigDecimal direction;		// 方向
-	private BigDecimal orderNum;		// 排序
-	private String remark;		// 备注
-	private BigDecimal target1;		// 一月目标
-	private BigDecimal actual1;		// 一月完成值
-	private BigDecimal target2;		// 二月目标
-	private BigDecimal actual2;		// 二月完值
-	private BigDecimal target3;		// 三月目标
-	private BigDecimal actual3;		// 三月完成值
-	private BigDecimal target4;		// 四月目标
-	private BigDecimal actual4;		// 四月完成值
-	private BigDecimal target5;		// 五月目标
-	private BigDecimal actual5;		// 五月完成值
-	private BigDecimal target6;		// 六月目标
-	private BigDecimal actual6;		// 六月完成值
-	private BigDecimal target7;		// 七月目标
-	private BigDecimal actual7;		// 七月完成值
-	private BigDecimal target8;		// 八月目标
-	private BigDecimal actual8;		// 八月完成值
-	private BigDecimal target9;		// 九月目标
-	private BigDecimal actual9;		// 九月完成值
-	private BigDecimal target10;		// 十月目标
-	private BigDecimal actual10;		// 十月完成值
-	private BigDecimal target11;		// 十一月目标
-	private BigDecimal actual11;		// 十一月完成值
-	private BigDecimal target12;		// 十二月目标
-	private BigDecimal actual12;		// 十二月完成值
-
-
-	public DeptResponsibilityTarget() {
-		super();
-	}
-
-	public DeptResponsibilityTarget(String id){
-		super(id);
-	}
-
-	public String getResponsibilityId() {
-		return responsibilityId;
-	}
-
-	public void setResponsibilityId(String responsibilityId) {
-		this.responsibilityId = responsibilityId;
-	}
-	public String getIndicatorId() {
-		return indicatorId;
-	}
-
-	public void setIndicatorId(String indicatorId) {
-		this.indicatorId = indicatorId;
-	}
-	public BigDecimal getQuantizationTarget() {
-		return quantizationTarget;
-	}
-
-	public void setQuantizationTarget(BigDecimal quantizationTarget) {
-		this.quantizationTarget = quantizationTarget;
-	}
-	public BigDecimal getQuantizationTargetActual() {
-		return quantizationTargetActual;
-	}
-
-	public void setQuantizationTargetActual(BigDecimal quantizationTargetActual) {
-		this.quantizationTargetActual = quantizationTargetActual;
-	}
-	public String getEvaluationTarget() {
-		return evaluationTarget;
-	}
-
-	public void setEvaluationTarget(String evaluationTarget) {
-		this.evaluationTarget = evaluationTarget;
-	}
-	public BigDecimal getEvaluationTargetActual() {
-		return evaluationTargetActual;
-	}
-
-	public void setEvaluationTargetActual(BigDecimal evaluationTargetActual) {
-		this.evaluationTargetActual = evaluationTargetActual;
-	}
-	public BigDecimal getMonthThreshold() {
-		return monthThreshold;
-	}
-
-	public void setMonthThreshold(BigDecimal monthThreshold) {
-		this.monthThreshold = monthThreshold;
-	}
-	public BigDecimal getSeasonThreshold() {
-		return seasonThreshold;
-	}
-
-	public void setSeasonThreshold(BigDecimal seasonThreshold) {
-		this.seasonThreshold = seasonThreshold;
-	}
-	public BigDecimal getYearThreshold() {
-		return yearThreshold;
-	}
-
-	public void setYearThreshold(BigDecimal yearThreshold) {
-		this.yearThreshold = yearThreshold;
-	}
-	public BigDecimal getDirection() {
-		return direction;
-	}
-
-	public void setDirection(BigDecimal direction) {
-		this.direction = direction;
-	}
-	public BigDecimal getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(BigDecimal orderNum) {
-		this.orderNum = orderNum;
-	}
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	public BigDecimal getTarget1() {
-		return target1;
-	}
-
-	public void setTarget1(BigDecimal target1) {
-		this.target1 = target1;
-	}
-	public BigDecimal getActual1() {
-		return actual1;
-	}
-
-	public void setActual1(BigDecimal actual1) {
-		this.actual1 = actual1;
-	}
-	public BigDecimal getTarget2() {
-		return target2;
-	}
-
-	public void setTarget2(BigDecimal target2) {
-		this.target2 = target2;
-	}
-	public BigDecimal getActual2() {
-		return actual2;
-	}
-
-	public void setActual2(BigDecimal actual2) {
-		this.actual2 = actual2;
-	}
-	public BigDecimal getTarget3() {
-		return target3;
-	}
-
-	public void setTarget3(BigDecimal target3) {
-		this.target3 = target3;
-	}
-	public BigDecimal getActual3() {
-		return actual3;
-	}
-
-	public void setActual3(BigDecimal actual3) {
-		this.actual3 = actual3;
-	}
-	public BigDecimal getTarget4() {
-		return target4;
-	}
-
-	public void setTarget4(BigDecimal target4) {
-		this.target4 = target4;
-	}
-	public BigDecimal getActual4() {
-		return actual4;
-	}
-
-	public void setActual4(BigDecimal actual4) {
-		this.actual4 = actual4;
-	}
-	public BigDecimal getTarget5() {
-		return target5;
-	}
-
-	public void setTarget5(BigDecimal target5) {
-		this.target5 = target5;
-	}
-	public BigDecimal getActual5() {
-		return actual5;
-	}
-
-	public void setActual5(BigDecimal actual5) {
-		this.actual5 = actual5;
-	}
-	public BigDecimal getTarget6() {
-		return target6;
-	}
-
-	public void setTarget6(BigDecimal target6) {
-		this.target6 = target6;
-	}
-	public BigDecimal getActual6() {
-		return actual6;
-	}
-
-	public void setActual6(BigDecimal actual6) {
-		this.actual6 = actual6;
-	}
-	public BigDecimal getTarget7() {
-		return target7;
-	}
-
-	public void setTarget7(BigDecimal target7) {
-		this.target7 = target7;
-	}
-	public BigDecimal getActual7() {
-		return actual7;
-	}
-
-	public void setActual7(BigDecimal actual7) {
-		this.actual7 = actual7;
-	}
-	public BigDecimal getTarget8() {
-		return target8;
-	}
-
-	public void setTarget8(BigDecimal target8) {
-		this.target8 = target8;
-	}
-	public BigDecimal getActual8() {
-		return actual8;
-	}
-
-	public void setActual8(BigDecimal actual8) {
-		this.actual8 = actual8;
-	}
-	public BigDecimal getTarget9() {
-		return target9;
-	}
-
-	public void setTarget9(BigDecimal target9) {
-		this.target9 = target9;
-	}
-	public BigDecimal getActual9() {
-		return actual9;
-	}
-
-	public void setActual9(BigDecimal actual9) {
-		this.actual9 = actual9;
-	}
-	public BigDecimal getTarget10() {
-		return target10;
-	}
-
-	public void setTarget10(BigDecimal target10) {
-		this.target10 = target10;
-	}
-	public BigDecimal getActual10() {
-		return actual10;
-	}
-
-	public void setActual10(BigDecimal actual10) {
-		this.actual10 = actual10;
-	}
-	public BigDecimal getTarget11() {
-		return target11;
-	}
-
-	public void setTarget11(BigDecimal target11) {
-		this.target11 = target11;
-	}
-	public BigDecimal getActual11() {
-		return actual11;
-	}
-
-	public void setActual11(BigDecimal actual11) {
-		this.actual11 = actual11;
-	}
-	public BigDecimal getTarget12() {
-		return target12;
-	}
-
-	public void setTarget12(BigDecimal target12) {
-		this.target12 = target12;
-	}
-	public BigDecimal getActual12() {
-		return actual12;
-	}
-
-	public void setActual12(BigDecimal actual12) {
-		this.actual12 = actual12;
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/entity/EvaluateRule.java

@@ -1,95 +0,0 @@
-/**
- *
- */
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-/**
- * 考评规则Entity
- * @author wang
- * @version 2023-02-25
- */
-public class EvaluateRule extends DataEntity<EvaluateRule> {
-
-	private static final long serialVersionUID = 1L;
-	private String des;		// 描述
-	private String indicatorId;		// 指标ID
-	private BigDecimal totalScore;		// 指标总分
-	private String evaluateMethod;		// 评分方式
-	private String evaluateFormula;		// 评分公式
-	private String mappingFunction;		// 隐射函数
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-
-
-	public EvaluateRule() {
-		super();
-	}
-
-	public EvaluateRule(String id){
-		super(id);
-	}
-
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public String getIndicatorId() {
-		return indicatorId;
-	}
-
-	public void setIndicatorId(String indicatorId) {
-		this.indicatorId = indicatorId;
-	}
-	public BigDecimal getTotalScore() {
-		return totalScore;
-	}
-
-	public void setTotalScore(BigDecimal totalScore) {
-		this.totalScore = totalScore;
-	}
-	public String getEvaluateMethod() {
-		return evaluateMethod;
-	}
-
-	public void setEvaluateMethod(String evaluateMethod) {
-		this.evaluateMethod = evaluateMethod;
-	}
-	public String getEvaluateFormula() {
-		return evaluateFormula;
-	}
-
-	public void setEvaluateFormula(String evaluateFormula) {
-		this.evaluateFormula = evaluateFormula;
-	}
-	public String getMappingFunction() {
-		return mappingFunction;
-	}
-
-	public void setMappingFunction(String mappingFunction) {
-		this.mappingFunction = mappingFunction;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/entity/EvaluateScore.java

@@ -1,127 +0,0 @@
-/**
- *
- */
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-/**
- * 考评得分Entity
- * @author wang
- * @version 2023-02-25
- */
-public class EvaluateScore extends DataEntity<EvaluateScore> {
-
-	private static final long serialVersionUID = 1L;
-	private String des;		// 描述
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-	private String evaluateCycle;		// 考评类型（年度考评，季度考评，月度考评）
-	private String evaluateType;		// 考评性质（0:预考评；1正式考评）
-	private String deptId;		// 部门ID
-	private String responsibilityId;		// 责任书ID
-	private BigDecimal sysScore;		// 系统评分
-	private BigDecimal reviewScore;		// 复审评分
-	private String reviewPeople;		// 复审人
-	private Date reviewPeopleTime;		// 复审时间
-	private String reviewOpinion;		// 复审意见
-
-
-	public EvaluateScore() {
-		super();
-	}
-
-	public EvaluateScore(String id){
-		super(id);
-	}
-
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	public String getEvaluateCycle() {
-		return evaluateCycle;
-	}
-
-	public void setEvaluateCycle(String evaluateCycle) {
-		this.evaluateCycle = evaluateCycle;
-	}
-	public String getEvaluateType() {
-		return evaluateType;
-	}
-
-	public void setEvaluateType(String evaluateType) {
-		this.evaluateType = evaluateType;
-	}
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	public String getResponsibilityId() {
-		return responsibilityId;
-	}
-
-	public void setResponsibilityId(String responsibilityId) {
-		this.responsibilityId = responsibilityId;
-	}
-	public BigDecimal getSysScore() {
-		return sysScore;
-	}
-
-	public void setSysScore(BigDecimal sysScore) {
-		this.sysScore = sysScore;
-	}
-	public BigDecimal getReviewScore() {
-		return reviewScore;
-	}
-
-	public void setReviewScore(BigDecimal reviewScore) {
-		this.reviewScore = reviewScore;
-	}
-	public String getReviewPeople() {
-		return reviewPeople;
-	}
-
-	public void setReviewPeople(String reviewPeople) {
-		this.reviewPeople = reviewPeople;
-	}
-	public Date getReviewPeopleTime() {
-		return reviewPeopleTime;
-	}
-
-	public void setReviewPeopleTime(Date reviewPeopleTime) {
-		this.reviewPeopleTime = reviewPeopleTime;
-	}
-	public String getReviewOpinion() {
-		return reviewOpinion;
-	}
-
-	public void setReviewOpinion(String reviewOpinion) {
-		this.reviewOpinion = reviewOpinion;
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/entity/IndicatorDictionary.java

@@ -1,74 +0,0 @@
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 指标字典表
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class IndicatorDictionary extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    private String id;
-
-    /**
-     * 指标ID
-     */
-    private String indicatorId;
-
-    /**
-     * 选项编码
-     */
-    private String optionCode;
-
-    /**
-     * 选项名称
-     */
-    private String optionName;
-
-    /**
-     * 选项顺序
-     */
-    private BigDecimal optionOrder;
-
-    /**
-     * 描述
-     */
-    private String des;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDate createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDate updateTime;
-
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/entity/Report.java

@@ -1,87 +0,0 @@
-/**
- *
- */
-package com.ims.eval.entity;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-/**
- * 发布公告表Entity
- * @author wang
- * @version 2023-02-25
- */
-public class Report extends DataEntity<Report> {
-
-	private static final long serialVersionUID = 1L;
-	private String reportTitle;		// 公告标题
-	private String des;		// 描述
-	private Date publishTime;		// 公告发布时间
-	private String reportPath;		// 报告保存路径
-	private String deptId;		// 发布公告部门
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-
-
-	public Report() {
-		super();
-	}
-
-	public Report(String id){
-		super(id);
-	}
-
-	public String getReportTitle() {
-		return reportTitle;
-	}
-
-	public void setReportTitle(String reportTitle) {
-		this.reportTitle = reportTitle;
-	}
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public Date getPublishTime() {
-		return publishTime;
-	}
-
-	public void setPublishTime(Date publishTime) {
-		this.publishTime = publishTime;
-	}
-	public String getReportPath() {
-		return reportPath;
-	}
-
-	public void setReportPath(String reportPath) {
-		this.reportPath = reportPath;
-	}
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/launch/LauncherServiceImpl.java

@@ -12,7 +12,7 @@ public class LauncherServiceImpl implements LauncherService {
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
 
 		//NACOS_ADDR=10.65.78.23:8848
-		Properties props = System.getProperties();
-		props.setProperty("spring.cloud.nacos.config.shared-dataids", "gddl_dbkp.yaml");
+//		Properties props = System.getProperties();
+//		props.setProperty("spring.cloud.nacos.config.shared-dataids", "gddl_dbkp.yaml");
 	}
 }

ims-service/sm-test/src/main/java/com/ims/eval/service/IDataDictionaryService.java

@@ -1,22 +0,0 @@
-package com.ims.eval.service;
-
-import com.ims.eval.entity.DataDictionary;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 数据字典表 服务类
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-public interface IDataDictionaryService extends IService<DataDictionary> {
-
-	List<DataDictionary> list(String id,String dataKey,String keyName,String superKey);
-
-
-
-}

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

@@ -1,18 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service;
-
-
-import com.ims.core.service.ICrudService;
-import com.ims.eval.entity.DeptResponsibility;
-
-/**
- * 部门目标责任Service
- * @author wang
- * @version 2023-02-23
- */
-
-public interface IDeptResponsibilityService extends ICrudService<DeptResponsibility> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/IDeptResponsibilityTargetService.java

@@ -1,18 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service;
-
-
-import com.ims.core.service.ICrudService;
-import com.ims.eval.entity.DeptResponsibilityTarget;
-
-/**
- * 目标责任书指标Service
- * @author wang
- * @version 2023-02-23
- */
-
-public interface IDeptResponsibilityTargetService extends ICrudService<DeptResponsibilityTarget> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/IEvaluateRuleService.java

@@ -1,18 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service;
-
-
-import com.ims.core.service.ICrudService;
-import com.ims.eval.entity.EvaluateRule;
-
-/**
- * 考评规则Service
- * @author wang
- * @version 2023-02-23
- */
-
-public interface IEvaluateRuleService extends ICrudService<EvaluateRule> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/IEvaluateScoreService.java

@@ -1,18 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service;
-
-
-import com.ims.core.service.ICrudService;
-import com.ims.eval.entity.EvaluateScore;
-
-/**
- * 考评得分Service
- * @author wang
- * @version 2023-02-23
- */
-
-public interface IEvaluateScoreService extends ICrudService<EvaluateScore> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorDictionaryService.java

@@ -1,20 +0,0 @@
-package com.ims.eval.service;
-
-import com.ims.eval.entity.IndicatorDictionary;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 指标字典表 服务类
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-public interface IIndicatorDictionaryService extends IService<IndicatorDictionary> {
-
-	List<IndicatorDictionary> list();
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorService.java

@@ -1,16 +0,0 @@
-package com.ims.eval.service;
-
-import com.ims.eval.entity.Indicator;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-public interface IIndicatorService extends IService<Indicator> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/IReportService.java

@@ -1,19 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service;
-
-
-import com.ims.core.service.ICrudService;
-import com.ims.eval.entity.Report;
-
-
-/**
- * 公告发布Service
- * @author wang
- * @version 2023-02-23
- */
-
-public interface IReportService extends ICrudService<Report> {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DataDictionaryServiceImpl.java

@@ -1,59 +0,0 @@
-package com.ims.eval.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ims.common.utils.StringUtils;
-import com.ims.eval.entity.DataDictionary;
-import com.ims.eval.dao.DataDictionaryMapper;
-import com.ims.eval.service.IDataDictionaryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 数据字典表 服务实现类
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@Service
-public class DataDictionaryServiceImpl extends ServiceImpl<DataDictionaryMapper, DataDictionary> implements IDataDictionaryService {
-
-	@Override
-	public List<DataDictionary> list(String id, String dataKey, String keyName, String superKey) {
-
-		QueryWrapper<DataDictionary> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(id)) {
-			qw.lambda().eq(DataDictionary::getId, id);
-		}
-		if (StringUtils.isNotEmpty(dataKey)) {
-			qw.lambda().eq(DataDictionary::getDataKey, dataKey);
-		}
-		if (StringUtils.isNotEmpty(keyName)) {
-			qw.lambda().like(DataDictionary::getKeyName, keyName);
-		}
-		if (StringUtils.isNotEmpty(superKey)) {
-			qw.lambda().eq(DataDictionary::getSuperKey, superKey);
-		}
-
-		List<DataDictionary> list = baseMapper.selectList(qw);
-		return list;
-	}
-
-
-	@Override
-	public boolean saveOrUpdate(DataDictionary entity) {
-
-		if (null != entity &&  (null == entity.getId() || "".equals(entity.getId().trim()))){
-			QueryWrapper<DataDictionary> qw = new QueryWrapper<>();
-			qw.lambda().eq(DataDictionary::getDataKey, entity.getDataKey());
-			List<DataDictionary> list = baseMapper.selectList(qw);
-			if (null !=list && list.size()>0){
-				throw  new RuntimeException("当前字典key已存在");
-			}
-		}
-		return super.saveOrUpdate(entity);
-	}
-}

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

@@ -1,75 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service.impl;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.DdeptResponsibilityDao;
-import com.ims.eval.entity.DeptResponsibility;
-import com.ims.eval.service.IDeptResponsibilityService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-/**
- * 部门目标责任Service
- * @author wang
- * @version 2023-02-23
- */
-@Service
-@Transactional(readOnly = true)
-public class DeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptResponsibilityDao, DeptResponsibility> implements IDeptResponsibilityService {
-
- 	public DeptResponsibility get(DeptResponsibility ddeptResponsibility) {
-		return super.get(ddeptResponsibility);
-	}
-
-    public List<DeptResponsibility> findList(DeptResponsibility ddeptResponsibility) {
-        return super.findList(ddeptResponsibility);
-    }
-
-	public List<DeptResponsibility> findAllListM(DeptResponsibility ddeptResponsibility, String dataFilter, String baseFilter, String key, String baseQuery, String specQuery) {
-	 	return super.findAllListM(ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<DeptResponsibility> findPageM(Page<DeptResponsibility> page, DeptResponsibility ddeptResponsibility, String dataFilter, String baseFilter, String key, String baseQuery, String specQuery) {
-		return super.findPageM(page, ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public DeptResponsibility initInsert(DeptResponsibility ddeptResponsibility)  {
-		return super.initInsert(ddeptResponsibility);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(DeptResponsibility ddeptResponsibility) {
-		super.checkSave(ddeptResponsibility);
-	}
-
-	@Transactional(readOnly = false)
-	public DeptResponsibility save(DeptResponsibility ddeptResponsibility, boolean isNewRecord){
-	    if(isNewRecord){
-	        ddeptResponsibility.setId(IdGen.uuid());
-	    }
-		return super.save(ddeptResponsibility,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<DeptResponsibility> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(DeptResponsibility ddeptResponsibility, String baseFilter){
-		super.checkRemove(ddeptResponsibility,baseFilter);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(DeptResponsibility ddeptResponsibility, String baseFilter) {
-		super.delete(ddeptResponsibility,baseFilter);
-	}
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DeptResponsibilityTargetServiceImpl.java

@@ -1,75 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service.impl;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.DeptResponsibilityTargetDao;
-import com.ims.eval.entity.DeptResponsibilityTarget;
-import com.ims.eval.service.IDeptResponsibilityTargetService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-/**
- * 目标责任书指标Service
- * @author wang
- * @version 2023-02-23
- */
-@Service
-@Transactional(readOnly = true)
-public class DeptResponsibilityTargetServiceImpl extends CrudServiceImpl<DeptResponsibilityTargetDao, DeptResponsibilityTarget> implements IDeptResponsibilityTargetService{
-
- 	public DeptResponsibilityTarget get(DeptResponsibilityTarget deptResponsibilityTarget) {
-		return super.get(deptResponsibilityTarget);
-	}
-
-    public List<DeptResponsibilityTarget> findList(DeptResponsibilityTarget deptResponsibilityTarget) {
-        return super.findList(deptResponsibilityTarget);
-    }
-
-	public List<DeptResponsibilityTarget> findAllListM(DeptResponsibilityTarget deptResponsibilityTarget,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(deptResponsibilityTarget,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<DeptResponsibilityTarget> findPageM(Page<DeptResponsibilityTarget> page, DeptResponsibilityTarget deptResponsibilityTarget,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, deptResponsibilityTarget,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public DeptResponsibilityTarget initInsert(DeptResponsibilityTarget deptResponsibilityTarget)  {
-		return super.initInsert(deptResponsibilityTarget);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(DeptResponsibilityTarget deptResponsibilityTarget) {
-		super.checkSave(deptResponsibilityTarget);
-	}
-
-	@Transactional(readOnly = false)
-	public DeptResponsibilityTarget save(DeptResponsibilityTarget deptResponsibilityTarget, boolean isNewRecord){
-	    if(isNewRecord){
-	        deptResponsibilityTarget.setId(IdGen.uuid());
-	    }
-		return super.save(deptResponsibilityTarget,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<DeptResponsibilityTarget> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(DeptResponsibilityTarget deptResponsibilityTarget,String baseFilter){
-		super.checkRemove(deptResponsibilityTarget,baseFilter);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(DeptResponsibilityTarget deptResponsibilityTarget,String baseFilter) {
-		super.delete(deptResponsibilityTarget,baseFilter);
-	}
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/EvaluateRuleServiceImpl.java

@@ -1,75 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service.impl;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.EvaluateRuleDao;
-import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.service.IEvaluateRuleService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-/**
- * 考评规则Service
- * @author wang
- * @version 2023-02-23
- */
-@Service
-@Transactional(readOnly = true)
-public class EvaluateRuleServiceImpl extends CrudServiceImpl<EvaluateRuleDao, EvaluateRule> implements IEvaluateRuleService{
-
- 	public EvaluateRule get(EvaluateRule evaluateRule) {
-		return super.get(evaluateRule);
-	}
-
-    public List<EvaluateRule> findList(EvaluateRule evaluateRule) {
-        return super.findList(evaluateRule);
-    }
-
-	public List<EvaluateRule> findAllListM(EvaluateRule evaluateRule,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(evaluateRule,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<EvaluateRule> findPageM(Page<EvaluateRule> page, EvaluateRule evaluateRule,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, evaluateRule,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public EvaluateRule initInsert(EvaluateRule evaluateRule)  {
-		return super.initInsert(evaluateRule);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(EvaluateRule evaluateRule) {
-		super.checkSave(evaluateRule);
-	}
-
-	@Transactional(readOnly = false)
-	public EvaluateRule save(EvaluateRule evaluateRule, boolean isNewRecord){
-	    if(isNewRecord){
-	        evaluateRule.setId(IdGen.uuid());
-	    }
-		return super.save(evaluateRule,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<EvaluateRule> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(EvaluateRule evaluateRule,String baseFilter){
-		super.checkRemove(evaluateRule,baseFilter);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(EvaluateRule evaluateRule,String baseFilter) {
-		super.delete(evaluateRule,baseFilter);
-	}
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/EvaluateScoreServiceImpl.java

@@ -1,75 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service.impl;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.EvaluateScoreDao;
-import com.ims.eval.entity.EvaluateScore;
-import com.ims.eval.service.IEvaluateScoreService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-/**
- * 考评得分Service
- * @author wang
- * @version 2023-02-23
- */
-@Service
-@Transactional(readOnly = true)
-public class EvaluateScoreServiceImpl extends CrudServiceImpl<EvaluateScoreDao, EvaluateScore> implements IEvaluateScoreService{
-
- 	public EvaluateScore get(EvaluateScore evaluateScore) {
-		return super.get(evaluateScore);
-	}
-
-    public List<EvaluateScore> findList(EvaluateScore evaluateScore) {
-        return super.findList(evaluateScore);
-    }
-
-	public List<EvaluateScore> findAllListM(EvaluateScore evaluateScore,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(evaluateScore,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<EvaluateScore> findPageM(Page<EvaluateScore> page, EvaluateScore evaluateScore,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, evaluateScore,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public EvaluateScore initInsert(EvaluateScore evaluateScore)  {
-		return super.initInsert(evaluateScore);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(EvaluateScore evaluateScore) {
-		super.checkSave(evaluateScore);
-	}
-
-	@Transactional(readOnly = false)
-	public EvaluateScore save(EvaluateScore evaluateScore, boolean isNewRecord){
-	    if(isNewRecord){
-	        evaluateScore.setId(IdGen.uuid());
-	    }
-		return super.save(evaluateScore,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<EvaluateScore> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(EvaluateScore evaluateScore,String baseFilter){
-		super.checkRemove(evaluateScore,baseFilter);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(EvaluateScore evaluateScore,String baseFilter) {
-		super.delete(evaluateScore,baseFilter);
-	}
-}

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

@@ -1,33 +0,0 @@
-package com.ims.eval.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.dao.IndicatorDictionaryMapper;
-import com.ims.eval.service.IIndicatorDictionaryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * <p>
- * 指标字典表 服务实现类
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@Service
-public class IndicatorDictionaryServiceImpl extends ServiceImpl<IndicatorDictionaryMapper, IndicatorDictionary> implements IIndicatorDictionaryService {
-
-
-	@Autowired
-	private IndicatorDictionaryMapper indicatorDictionaryMapper;
-	public  List<IndicatorDictionary>  list(){
-		QueryWrapper<IndicatorDictionary> qw = new QueryWrapper<>();
-		List<IndicatorDictionary> list = indicatorDictionaryMapper.selectList(qw);
-		return list;
-	}
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -1,20 +0,0 @@
-package com.ims.eval.service.impl;
-
-import com.ims.eval.entity.Indicator;
-import com.ims.eval.dao.IndicatorMapper;
-import com.ims.eval.service.IIndicatorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author wang
- * @since 2023-02-26
- */
-@Service
-public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator> implements IIndicatorService {
-
-}

ims-service/sm-test/src/main/java/com/ims/eval/service/impl/ReportServiceImpl.java

@@ -1,75 +0,0 @@
-/**
- *
- */
-package com.ims.eval.service.impl;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.ReportDao;
-import com.ims.eval.entity.Report;
-import com.ims.eval.service.IReportService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-
-/**
- * 公告发布Service
- * @author wang
- * @version 2023-02-23
- */
-@Service
-@Transactional(readOnly = true)
-public class ReportServiceImpl extends CrudServiceImpl<ReportDao, Report> implements IReportService{
-
- 	public Report get(Report report) {
-		return super.get(report);
-	}
-
-    public List<Report> findList(Report report) {
-        return super.findList(report);
-    }
-
-	public List<Report> findAllListM(Report report,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(report,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<Report> findPageM(Page<Report> page, Report report,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, report,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Report initInsert(Report report)  {
-		return super.initInsert(report);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(Report report) {
-		super.checkSave(report);
-	}
-
-	@Transactional(readOnly = false)
-	public Report save(Report report, boolean isNewRecord){
-	    if(isNewRecord){
-	        report.setId(IdGen.uuid());
-	    }
-		return super.save(report,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<Report> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(Report report,String baseFilter){
-		super.checkRemove(report,baseFilter);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(Report report,String baseFilter) {
-		super.delete(report,baseFilter);
-	}
-}

ims-service/sm-test/src/main/resources/mappings/sm/DeptResponsibilityDao.xml

@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.DeptResponsibilityDao">
-
-	<sql id="deptResponsibilityColumns">
-		a.id AS "id",
-		a.dept_id AS "deptId",
-		a.cycle_unit AS "cycleUnit",
-		a.check_cycle AS "checkCycle",
-		a.begin_date AS "beginDate",
-		a.end_date AS "endDate",
-		a.stage AS "stage",
-		a.des AS "des",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy",
-		a.review_people AS "reviewPeople",
-		a.review_people_time AS "reviewPeopleTime",
-		a.review_opinion AS "reviewOpinion",
-		a.final_review_people AS "finalReviewPeople",
-		a.final_review_people_time AS "finalReviewPeopleTime",
-		a.final_review_opinion AS "finalReviewOpinion",
-		a.remark AS "remark"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="DeptResponsibility">
-		SELECT
-			<include refid="deptResponsibilityColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="DeptResponsibility">
-		SELECT
-			<include refid="deptResponsibilityColumns"/>
-		FROM public.dept_responsibility a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="DeptResponsibility">
-		SELECT
-			<include refid="deptResponsibilityColumns"/>
-		FROM public.dept_responsibility a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        dept_id,
-	        cycle_unit,
-	        check_cycle,
-	        begin_date,
-	        end_date,
-	        stage,
-	        des,
-	        create_time,
-	        update_time,
-	        review_people,
-	        review_people_time,
-	        review_opinion,
-	        final_review_people,
-	        final_review_people_time,
-	        final_review_opinion,
-	        remark
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('dept_responsibility','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO dept_responsibility(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{deptId
-, jdbcType=VARCHAR
-
-},
-			#{cycleUnit
-, jdbcType=VARCHAR
-
-},
-			#{checkCycle
-, jdbcType=VARCHAR
-
-},
-			#{beginDate
-
-
-},
-			#{endDate
-
-
-},
-			#{stage
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-},
-			#{reviewPeople
-, jdbcType=VARCHAR
-
-},
-			#{reviewPeopleTime
-
-
-},
-			#{reviewOpinion
-, jdbcType=VARCHAR
-
-},
-			#{finalReviewPeople
-, jdbcType=VARCHAR
-
-},
-			#{finalReviewPeopleTime
-
-
-},
-			#{finalReviewOpinion
-, jdbcType=VARCHAR
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO dept_responsibility(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
-                    #{item.cycleUnit, jdbcType=VARCHAR} as "cycleUnit",
-                    #{item.checkCycle, jdbcType=VARCHAR} as "checkCycle",
-                    #{item.beginDate} as "beginDate",
-                    #{item.endDate} as "endDate",
-                    #{item.stage, jdbcType=VARCHAR} as "stage",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime",
-                    #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
-                    #{item.reviewPeopleTime} as "reviewPeopleTime",
-                    #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion",
-                    #{item.finalReviewPeople, jdbcType=VARCHAR} as "finalReviewPeople",
-                    #{item.finalReviewPeopleTime} as "finalReviewPeopleTime",
-                    #{item.finalReviewOpinion, jdbcType=VARCHAR} as "finalReviewOpinion",
-                    #{item.remark, jdbcType=VARCHAR} as "remark"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE dept_responsibility SET
-			id = #{id},
-			dept_id = #{deptId},
-			cycle_unit = #{cycleUnit},
-			check_cycle = #{checkCycle},
-			begin_date = #{beginDate},
-			end_date = #{endDate},
-			stage = #{stage},
-			des = #{des},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy},
-			review_people = #{reviewPeople},
-			review_people_time = #{reviewPeopleTime},
-			review_opinion = #{reviewOpinion},
-			final_review_people = #{finalReviewPeople},
-			final_review_people_time = #{finalReviewPeopleTime},
-			final_review_opinion = #{finalReviewOpinion},
-			remark = #{remark}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.dept_responsibility
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/sm-test/src/main/resources/mappings/sm/DeptResponsibilityTargetDao.xml

@@ -1,424 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.DeptResponsibilityTargetDao">
-
-	<sql id="deptResponsibilityTargetColumns">
-		a.id AS "id",
-		a.responsibility_id AS "responsibilityId",
-		a.indicator_id AS "indicatorId",
-		a.quantization_target AS "quantizationTarget",
-		a.quantization_target_actual AS "quantizationTargetActual",
-		a.evaluation_target AS "evaluationTarget",
-		a.evaluation_target_actual AS "evaluationTargetActual",
-		a.month_threshold AS "monthThreshold",
-		a.season_threshold AS "seasonThreshold",
-		a.year_threshold AS "yearThreshold",
-		a.direction AS "direction",
-		a.order_num AS "orderNum",
-		a.remark AS "remark",
-		a.target_1 AS "target1",
-		a.actual_1 AS "actual1",
-		a.target_2 AS "target2",
-		a.actual_2 AS "actual2",
-		a.target_3 AS "target3",
-		a.actual_3 AS "actual3",
-		a.target_4 AS "target4",
-		a.actual_4 AS "actual4",
-		a.target_5 AS "target5",
-		a.actual_5 AS "actual5",
-		a.target_6 AS "target6",
-		a.actual_6 AS "actual6",
-		a.target_7 AS "target7",
-		a.actual_7 AS "actual7",
-		a.target_8 AS "target8",
-		a.actual_8 AS "actual8",
-		a.target_9 AS "target9",
-		a.actual_9 AS "actual9",
-		a.target_10 AS "target10",
-		a.actual_10 AS "actual10",
-		a.target_11 AS "target11",
-		a.actual_11 AS "actual11",
-		a.target_12 AS "target12",
-		a.actual_12 AS "actual12"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="DeptResponsibilityTarget">
-		SELECT
-			<include refid="deptResponsibilityTargetColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="DeptResponsibilityTarget">
-		SELECT
-			<include refid="deptResponsibilityTargetColumns"/>
-		FROM public.dept_responsibility_target a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="DeptResponsibilityTarget">
-		SELECT
-			<include refid="deptResponsibilityTargetColumns"/>
-		FROM public.dept_responsibility_target a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        responsibility_id,
-	        indicator_id,
-	        quantization_target,
-	        quantization_target_actual,
-	        evaluation_target,
-	        evaluation_target_actual,
-	        month_threshold,
-	        season_threshold,
-	        year_threshold,
-	        direction,
-	        order_num,
-	        remark,
-	        target_1,
-	        actual_1,
-	        target_2,
-	        actual_2,
-	        target_3,
-	        actual_3,
-	        target_4,
-	        actual_4,
-	        target_5,
-	        actual_5,
-	        target_6,
-	        actual_6,
-	        target_7,
-	        actual_7,
-	        target_8,
-	        actual_8,
-	        target_9,
-	        actual_9,
-	        target_10,
-	        actual_10,
-	        target_11,
-	        actual_11,
-	        target_12,
-	        actual_12
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('dept_responsibility_target','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO dept_responsibility_target(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{responsibilityId
-, jdbcType=VARCHAR
-
-},
-			#{indicatorId
-, jdbcType=VARCHAR
-
-},
-			#{quantizationTarget
-
-
-},
-			#{quantizationTargetActual
-
-
-},
-			#{evaluationTarget
-, jdbcType=VARCHAR
-
-},
-			#{evaluationTargetActual
-
-
-},
-			#{monthThreshold
-
-
-},
-			#{seasonThreshold
-
-
-},
-			#{yearThreshold
-
-
-},
-			#{direction
-
-
-},
-			#{orderNum
-
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-},
-			#{target1
-
-
-},
-			#{actual1
-
-
-},
-			#{target2
-
-
-},
-			#{actual2
-
-
-},
-			#{target3
-
-
-},
-			#{actual3
-
-
-},
-			#{target4
-
-
-},
-			#{actual4
-
-
-},
-			#{target5
-
-
-},
-			#{actual5
-
-
-},
-			#{target6
-
-
-},
-			#{actual6
-
-
-},
-			#{target7
-
-
-},
-			#{actual7
-
-
-},
-			#{target8
-
-
-},
-			#{actual8
-
-
-},
-			#{target9
-
-
-},
-			#{actual9
-
-
-},
-			#{target10
-
-
-},
-			#{actual10
-
-
-},
-			#{target11
-
-
-},
-			#{actual11
-
-
-},
-			#{target12
-
-
-},
-			#{actual12
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO dept_responsibility_target(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.responsibilityId, jdbcType=VARCHAR} as "responsibilityId",
-                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.quantizationTarget} as "quantizationTarget",
-                    #{item.quantizationTargetActual} as "quantizationTargetActual",
-                    #{item.evaluationTarget, jdbcType=VARCHAR} as "evaluationTarget",
-                    #{item.evaluationTargetActual} as "evaluationTargetActual",
-                    #{item.monthThreshold} as "monthThreshold",
-                    #{item.seasonThreshold} as "seasonThreshold",
-                    #{item.yearThreshold} as "yearThreshold",
-                    #{item.direction} as "direction",
-                    #{item.orderNum} as "orderNum",
-                    #{item.remark, jdbcType=VARCHAR} as "remark",
-                    #{item.target1} as "target1",
-                    #{item.actual1} as "actual1",
-                    #{item.target2} as "target2",
-                    #{item.actual2} as "actual2",
-                    #{item.target3} as "target3",
-                    #{item.actual3} as "actual3",
-                    #{item.target4} as "target4",
-                    #{item.actual4} as "actual4",
-                    #{item.target5} as "target5",
-                    #{item.actual5} as "actual5",
-                    #{item.target6} as "target6",
-                    #{item.actual6} as "actual6",
-                    #{item.target7} as "target7",
-                    #{item.actual7} as "actual7",
-                    #{item.target8} as "target8",
-                    #{item.actual8} as "actual8",
-                    #{item.target9} as "target9",
-                    #{item.actual9} as "actual9",
-                    #{item.target10} as "target10",
-                    #{item.actual10} as "actual10",
-                    #{item.target11} as "target11",
-                    #{item.actual11} as "actual11",
-                    #{item.target12} as "target12",
-                    #{item.actual12} as "actual12"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE dept_responsibility_target SET
-			id = #{id},
-			responsibility_id = #{responsibilityId},
-			indicator_id = #{indicatorId},
-			quantization_target = #{quantizationTarget},
-			quantization_target_actual = #{quantizationTargetActual},
-			evaluation_target = #{evaluationTarget},
-			evaluation_target_actual = #{evaluationTargetActual},
-			month_threshold = #{monthThreshold},
-			season_threshold = #{seasonThreshold},
-			year_threshold = #{yearThreshold},
-			direction = #{direction},
-			order_num = #{orderNum},
-			remark = #{remark},
-			target_1 = #{target1},
-			actual_1 = #{actual1},
-			target_2 = #{target2},
-			actual_2 = #{actual2},
-			target_3 = #{target3},
-			actual_3 = #{actual3},
-			target_4 = #{target4},
-			actual_4 = #{actual4},
-			target_5 = #{target5},
-			actual_5 = #{actual5},
-			target_6 = #{target6},
-			actual_6 = #{actual6},
-			target_7 = #{target7},
-			actual_7 = #{actual7},
-			target_8 = #{target8},
-			actual_8 = #{actual8},
-			target_9 = #{target9},
-			actual_9 = #{actual9},
-			target_10 = #{target10},
-			actual_10 = #{actual10},
-			target_11 = #{target11},
-			actual_11 = #{actual11},
-			target_12 = #{target12},
-			actual_12 = #{actual12}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.dept_responsibility_target
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/sm-test/src/main/resources/mappings/sm/EvaluateRuleDao.xml

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.EvaluateRuleDao">
-
-	<sql id="evaluateRuleColumns">
-		a.id AS "id",
-		a.des AS "des",
-		a.indicator_id AS "indicatorId",
-		a.total_score AS "totalScore",
-		a.evaluate_method AS "evaluateMethod",
-		a.evaluate_formula AS "evaluateFormula",
-		a.mapping_function AS "mappingFunction",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="EvaluateRule">
-		SELECT
-			<include refid="evaluateRuleColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="EvaluateRule">
-		SELECT
-			<include refid="evaluateRuleColumns"/>
-		FROM public.evaluate_rule a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="EvaluateRule">
-		SELECT
-			<include refid="evaluateRuleColumns"/>
-		FROM public.evaluate_rule a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        des,
-	        indicator_id,
-	        total_score,
-	        evaluate_method,
-	        evaluate_formula,
-	        mapping_function,
-	        create_time,
-	        update_time
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('evaluate_rule','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO evaluate_rule(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{indicatorId
-, jdbcType=VARCHAR
-
-},
-			#{totalScore
-
-
-},
-			#{evaluateMethod
-, jdbcType=VARCHAR
-
-},
-			#{evaluateFormula
-, jdbcType=VARCHAR
-
-},
-			#{mappingFunction
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO evaluate_rule(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.totalScore} as "totalScore",
-                    #{item.evaluateMethod, jdbcType=VARCHAR} as "evaluateMethod",
-                    #{item.evaluateFormula, jdbcType=VARCHAR} as "evaluateFormula",
-                    #{item.mappingFunction, jdbcType=VARCHAR} as "mappingFunction",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE evaluate_rule SET
-			id = #{id},
-			des = #{des},
-			indicator_id = #{indicatorId},
-			total_score = #{totalScore},
-			evaluate_method = #{evaluateMethod},
-			evaluate_formula = #{evaluateFormula},
-			mapping_function = #{mappingFunction},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.evaluate_rule
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/sm-test/src/main/resources/mappings/sm/EvaluateScoreDao.xml

@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.EvaluateScoreDao">
-
-	<sql id="evaluateScoreColumns">
-		a.id AS "id",
-		a.des AS "des",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy",
-		a.evaluate_cycle AS "evaluateCycle",
-		a.evaluate_type AS "evaluateType",
-		a.dept_id AS "deptId",
-		a.responsibility_id AS "responsibilityId",
-		a.sys_score AS "sysScore",
-		a.review_score AS "reviewScore",
-		a.review_people AS "reviewPeople",
-		a.review_people_time AS "reviewPeopleTime",
-		a.review_opinion AS "reviewOpinion"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="EvaluateScore">
-		SELECT
-			<include refid="evaluateScoreColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="EvaluateScore">
-		SELECT
-			<include refid="evaluateScoreColumns"/>
-		FROM public.evaluate_score a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="EvaluateScore">
-		SELECT
-			<include refid="evaluateScoreColumns"/>
-		FROM public.evaluate_score a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        des,
-	        create_time,
-	        update_time,
-	        evaluate_cycle,
-	        evaluate_type,
-	        dept_id,
-	        responsibility_id,
-	        sys_score,
-	        review_score,
-	        review_people,
-	        review_people_time,
-	        review_opinion
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('evaluate_score','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO evaluate_score(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-},
-			#{evaluateCycle
-, jdbcType=VARCHAR
-
-},
-			#{evaluateType
-, jdbcType=VARCHAR
-
-},
-			#{deptId
-, jdbcType=VARCHAR
-
-},
-			#{responsibilityId
-, jdbcType=VARCHAR
-
-},
-			#{sysScore
-
-
-},
-			#{reviewScore
-
-
-},
-			#{reviewPeople
-, jdbcType=VARCHAR
-
-},
-			#{reviewPeopleTime
-
-
-},
-			#{reviewOpinion
-, jdbcType=VARCHAR
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO evaluate_score(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime",
-                    #{item.evaluateCycle, jdbcType=VARCHAR} as "evaluateCycle",
-                    #{item.evaluateType, jdbcType=VARCHAR} as "evaluateType",
-                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
-                    #{item.responsibilityId, jdbcType=VARCHAR} as "responsibilityId",
-                    #{item.sysScore} as "sysScore",
-                    #{item.reviewScore} as "reviewScore",
-                    #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
-                    #{item.reviewPeopleTime} as "reviewPeopleTime",
-                    #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE evaluate_score SET
-			id = #{id},
-			des = #{des},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy},
-			evaluate_cycle = #{evaluateCycle},
-			evaluate_type = #{evaluateType},
-			dept_id = #{deptId},
-			responsibility_id = #{responsibilityId},
-			sys_score = #{sysScore},
-			review_score = #{reviewScore},
-			review_people = #{reviewPeople},
-			review_people_time = #{reviewPeopleTime},
-			review_opinion = #{reviewOpinion}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.evaluate_score
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/sm-test/src/main/resources/mappings/sm/IndicatorDao.xml

@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.IndicatorDao">
-
-	<sql id="indicatorColumns">
-		a.id AS "id",
-		a.indicator_name AS "indicatorName",
-		a.indicator_cede AS "indicatorCede",
-		a.unit AS "unit",
-		a.is_quantified AS "isQuantified",
-		a.is_additional AS "isAdditional",
-		a.des AS "des",
-		a.bin_section AS "binSection",
-		a.bin_stage AS "binStage",
-		a.dept AS "dept",
-		a.company AS "company",
-		a.enable AS "enable",
-		a.create_time AS "createTime",
-		a.update_time AS "updateTime",
-		a.create_by AS "createBy",
-		a.update_by AS "updateBy",
-		a.remark AS "remark",
-		a.order_num AS "orderNum"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="Indicator">
-		SELECT
-			<include refid="indicatorColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="Indicator">
-		SELECT
-			<include refid="indicatorColumns"/>
-		FROM public.indicator a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="Indicator">
-		SELECT
-			<include refid="indicatorColumns"/>
-		FROM public.indicator a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        indicator_name,
-	        indicator_cede,
-	        unit,
-	        is_quantified,
-	        is_additional,
-	        des,
-	        bin_section,
-	        bin_stage,
-	        dept,
-	        company,
-	        enable,
-	        create_time,
-	        update_time,
-	        remark,
-	        order_num
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('indicator','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO indicator(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{indicatorName
-, jdbcType=VARCHAR
-
-},
-			#{indicatorCede
-, jdbcType=VARCHAR
-
-},
-			#{unit
-, jdbcType=VARCHAR
-
-},
-			#{isQuantified
-, jdbcType=VARCHAR
-
-},
-			#{isAdditional
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{binSection
-, jdbcType=VARCHAR
-
-},
-			#{binStage
-, jdbcType=VARCHAR
-
-},
-			#{dept
-, jdbcType=VARCHAR
-
-},
-			#{company
-, jdbcType=VARCHAR
-
-},
-			#{enable
-, jdbcType=VARCHAR
-
-},
-			#{createTime, jdbcType=TIMESTAMP
-
-
-},
-			#{updateTime, jdbcType=TIMESTAMP
-
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-},
-			#{orderNum
-, jdbcType=VARCHAR
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO indicator(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.indicatorName, jdbcType=VARCHAR} as "indicatorName",
-                    #{item.indicatorCede, jdbcType=VARCHAR} as "indicatorCede",
-                    #{item.unit, jdbcType=VARCHAR} as "unit",
-                    #{item.isQuantified, jdbcType=VARCHAR} as "isQuantified",
-                    #{item.isAdditional, jdbcType=VARCHAR} as "isAdditional",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.binSection, jdbcType=VARCHAR} as "binSection",
-                    #{item.binStage, jdbcType=VARCHAR} as "binStage",
-                    #{item.dept, jdbcType=VARCHAR} as "dept",
-                    #{item.company, jdbcType=VARCHAR} as "company",
-                    #{item.enable, jdbcType=VARCHAR} as "enable",
-                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
-                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime",
-                    #{item.remark, jdbcType=VARCHAR} as "remark",
-                    #{item.orderNum, jdbcType=VARCHAR} as "orderNum"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE indicator SET
-			id = #{id},
-			indicator_name = #{indicatorName},
-			indicator_cede = #{indicatorCede},
-			unit = #{unit},
-			is_quantified = #{isQuantified},
-			is_additional = #{isAdditional},
-			des = #{des},
-			bin_section = #{binSection},
-			bin_stage = #{binStage},
-			dept = #{dept},
-			company = #{company},
-			enable = #{enable},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy},
-			remark = #{remark},
-			order_num = #{orderNum}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.indicator
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/sm-test/src/main/resources/mappings/sm/IndicatorDictionaryDao.xml

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.IndicatorDictionaryDao">
-
-	<sql id="indicatorDictionaryColumns">
-		a.id AS "id",
-		a.indicator_id AS "indicatorId",
-		a.option_code AS "optionCode",
-		a.option_name AS "optionName",
-		a.option_order AS "optionOrder",
-		a.des AS "des",
-		a.create_by AS "createBy",
-		a.create_time AS "createTime",
-		a.update_by AS "updateBy",
-		a.update_time AS "updateTime"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="IndicatorDictionary">
-		SELECT
-			<include refid="indicatorDictionaryColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="IndicatorDictionary">
-		SELECT
-			<include refid="indicatorDictionaryColumns"/>
-		FROM public.indicator_dictionary a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="IndicatorDictionary">
-		SELECT
-			<include refid="indicatorDictionaryColumns"/>
-		FROM public.indicator_dictionary a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        indicator_id,
-	        option_code,
-	        option_name,
-	        option_order,
-	        des,
-	        create_time,
-	        update_time
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('indicator_dictionary','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO indicator_dictionary(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{indicatorId
-, jdbcType=VARCHAR
-
-},
-			#{optionCode
-, jdbcType=VARCHAR
-
-},
-			#{optionName
-, jdbcType=VARCHAR
-
-},
-			#{optionOrder
-
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO indicator_dictionary(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.optionCode, jdbcType=VARCHAR} as "optionCode",
-                    #{item.optionName, jdbcType=VARCHAR} as "optionName",
-                    #{item.optionOrder} as "optionOrder",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE indicator_dictionary SET
-			id = #{id},
-			indicator_id = #{indicatorId},
-			option_code = #{optionCode},
-			option_name = #{optionName},
-			option_order = #{optionOrder},
-			des = #{des},
-			create_time = #{createTime},
-			update_by = #{updateBy},
-			update_time = #{updateTime}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.indicator_dictionary
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

ims-service/sm-test/src/main/resources/mappings/sm/ReportDao.xml

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ims.eval.dao.ReportDao">
-
-	<sql id="reportColumns">
-		a.id AS "id",
-		a.report_title AS "reportTitle",
-		a.des AS "des",
-		a.publish_time AS "publishTime",
-		a.report_path AS "reportPath",
-		a.dept_id AS "deptId",
-		a.create_time AS "createTime",
-		a.create_by AS "createBy",
-		a.update_time AS "updateTime",
-		a.update_by AS "updateBy"
-	</sql>
-
-
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-			  )
-			</if>
-		    <!-- 高级查询dataFilter -->
-			<if test="sqlMap.df != null and  sqlMap.df  != ''">
-			   AND ( ${sqlMap.df} )
-			</if>
-		    <!-- 默认查询baseFilter -->
-			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
-			   AND ( ${sqlMap.bf} )
-			</if>
-		    <!-- 基本Query查询 -->
-			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
-			   AND ( ${sqlMap.baseQuery} )
-			</if>
-		    <!-- 特定Query查询 -->
-			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
-			   AND ( ${sqlMap.specQuery} )
-			</if>
-			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
-				AND (${sqlMap.dsf})
-			</if>
-    </sql>
-
-	<select id="get" resultType="Report">
-		SELECT
-			<include refid="reportColumns"/>
-		FROM public.{table.name} a
-
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="Report">
-		SELECT
-			<include refid="reportColumns"/>
-		FROM public.report a
-
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="Report">
-		SELECT
-			<include refid="reportColumns"/>
-		FROM public.report a
-
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        report_title,
-	        des,
-	        publish_time,
-	        report_path,
-	        dept_id,
-	        create_time,
-	        update_time
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('report','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO report(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{reportTitle
-, jdbcType=VARCHAR
-
-},
-			#{des
-, jdbcType=VARCHAR
-
-},
-			#{publishTime
-
-
-},
-			#{reportPath
-, jdbcType=VARCHAR
-
-},
-			#{deptId
-, jdbcType=VARCHAR
-
-},
-			#{createTime
-
-
-},
-			#{updateTime
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-		INSERT INTO report(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id, jdbcType=VARCHAR} as "id",
-                    #{item.reportTitle, jdbcType=VARCHAR} as "reportTitle",
-                    #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.publishTime} as "publishTime",
-                    #{item.reportPath, jdbcType=VARCHAR} as "reportPath",
-                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
-                    #{item.createTime} as "createTime",
-                    #{item.updateTime} as "updateTime"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE report SET
-			id = #{id},
-			report_title = #{reportTitle},
-			des = #{des},
-			publish_time = #{publishTime},
-			report_path = #{reportPath},
-			dept_id = #{deptId},
-			create_time = #{createTime},
-			update_time = #{updateTime},
-			update_by = #{updateBy}
-		WHERE id = #{id, jdbcType=VARCHAR}
-	</update>
-
-	<update id="delete">
-		DELETE FROM public.report
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id, jdbcType=VARCHAR}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>