Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiRuleDTO.java

@@ -64,6 +64,11 @@ public class KpiRuleDTO implements Serializable {
 	 */
 	private String kpiCycle;
 
+	/**
+	 * 考核部门类别
+	 */
+	private String deptTypeKey;
+
 	/**
 	 * 乐观锁
 	 */

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.form;
 import com.elink.esua.epdc.dto.KpiRuleParamDTO;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -23,16 +24,19 @@ public class KpiRuleSaveOrUpdateFormDTO implements Serializable {
 	/**
 	 * 考核规则名称
 	 */
+	@NotBlank(message = "考核规则名称不能为空")
 	private String ruleName;
 
 	/**
 	 * 考核规则编码
 	 */
+	@NotBlank(message = "考核规则编码不能为空")
 	private String ruleCode;
 
 	/**
 	 * 规则生成方式(0-元公式，1-手工打分，2-投票)
 	 */
+	@NotBlank(message = "规则生成方式不能为空")
 	private String ruleMode;
 
 	/**
@@ -43,8 +47,15 @@ public class KpiRuleSaveOrUpdateFormDTO implements Serializable {
 	/**
 	 * 考核周期(字典值)
 	 */
+	@NotBlank(message = "考核周期不能为空")
 	private String kpiCycle;
 
+	/**
+	 * 考核部门类别
+	 */
+	@NotBlank(message = "考核部门类别不能为空")
+	private String deptTypeKey;
+
 	/**
 	 * 乐观锁
 	 */

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiRuleQueryResultDTO.java

@@ -45,6 +45,11 @@ public class KpiRuleQueryResultDTO implements Serializable {
 	 */
 	private String kpiCycle;
 
+	/**
+	 * 考核部门类别
+	 */
+	private String deptTypeKey;
+
 	/**
 	 * 乐观锁
 	 */

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java

@@ -128,6 +128,7 @@ public class KpiRuleController {
 	 **/
 	@PostMapping("saveOrUpdate")
 	public Result add(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) {
+		ValidatorUtils.validateEntity(dto);
 		return kpiRuleService.add(dto);
 	}
 
@@ -140,6 +141,7 @@ public class KpiRuleController {
 	 **/
 	@PutMapping("saveOrUpdate")
 	public Result edit(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) {
+		ValidatorUtils.validateEntity(dto);
 		return kpiRuleService.edit(dto);
 	}
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiRuleEntity.java

@@ -63,4 +63,9 @@ public class KpiRuleEntity extends BaseEpdcEntity {
      */
 	private String kpiCycle;
 
+	/**
+	 * 考核部门类别
+	 */
+	private String deptTypeKey;
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java

@@ -167,12 +167,12 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
 			return checkResult;
 		}
 		KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class);
-		logger.info("考核规则表id=" + entity.getId());
 		insert(entity);
 		List<KpiRuleParamDTO> ruleParamList = dto.getRuleParamList();
 		for (KpiRuleParamDTO kpiRuleParamDTO : ruleParamList) {
 			kpiRuleParamDTO.setRuleId(entity.getId());
-			kpiRuleParamService.save(kpiRuleParamDTO);
+			KpiRuleParamEntity kpiRuleParamEntity = ConvertUtils.sourceToTarget(kpiRuleParamDTO, KpiRuleParamEntity.class);
+			kpiRuleParamDao.insert(kpiRuleParamEntity);
 		}
 		return new Result();
 	}
@@ -195,7 +195,6 @@ public class KpiRuleServiceImpl extends BaseServiceImpl<KpiRuleDao, KpiRuleEntit
 		updateById(entity);
 		//全部删除参数记录表
 		int deleteResultNum = kpiRuleParamDao.deleteByRuleId(entity.getId());
-		logger.info("删除了" + deleteResultNum + "条记录");
 		List<KpiRuleParamDTO> ruleParamList = dto.getRuleParamList();
 		for (KpiRuleParamDTO kpiRuleParamDTO : ruleParamList) {
 			kpiRuleParamDTO.setId(null);

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml

@@ -27,6 +27,7 @@
             ekr.rule_mode as ruleMode,
             ekr.reference_id as referenceId,
             ekr.kpi_cycle as kpiCycle,
+            ekr.dept_type_key as deptTypeKey,
             ekr.revision as revision,
             ekr.CREATED_BY as createdBy,
             ekr.CREATED_TIME as createdTime,
@@ -47,7 +48,7 @@
         ORDER BY
             ekr.CREATED_TIME DESC
     </select>
-    
+
     <resultMap type="com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO" id="KpiRuleQueryResultDTOMap">
         <result property="id" column="id"/>
         <result property="ruleName" column="rule_name"/>
@@ -55,6 +56,7 @@
         <result property="ruleMode" column="rule_mode"/>
         <result property="referenceId" column="reference_id"/>
         <result property="kpiCycle" column="kpi_cycle"/>
+        <result property="deptTypeKey" column="dept_type_key"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
@@ -107,6 +109,7 @@
             ekr.rule_mode,
             ekr.reference_id,
             ekr.kpi_cycle,
+            ekr.dept_type_key,
             ekr.revision,
             ekr.CREATED_BY,
             ekr.CREATED_TIME,