代码优化

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

@@ -63,6 +63,11 @@ public class OrganizationEvaluationInfoResDTO {
 	private String organizationName;
 
 	/**
+	 *考评组织名称（简称）
+	 */
+	private String organizationShortName;
+
+	/**
 	 * 责任部门
 	 */
 	private String deptName;

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

@@ -29,4 +29,6 @@ public interface IOrganizationEvaluationRuleService extends IService<Organizatio
 
 	List<OrganizationEvaluationRule> getOrganizationRuleId(String evalOrRespId, String type);
 
+	OrganizationEvaluationRule getByIdIsCheck(String id,Boolean isCheck,Boolean delFlag);
+
 }

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

@@ -13,10 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -131,6 +128,7 @@ public class IndicatorDictionaryServiceImpl extends ServiceImpl<IndicatorDiction
 		if (StringUtils.isNotEmpty(optionName)) {
 			qw.lambda().like(IndicatorDictionary::getOptionName, optionName);
 		}
+		qw.lambda().orderByAsc(IndicatorDictionary::getOptionOrder);
 
 		List<IndicatorDictionary> list = baseMapper.selectList(qw);
 

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

@@ -171,12 +171,14 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 						throw new CustomException("当前属性code已存在");
 					}
 					i.setIndicatorId(dto.getId());
+					i.setOptionOrder(i.getOptionOrder());
 					i.setChildCode(dto2.getChildCode());
 					i.setChildName(dto2.getChildName());
 					i.setCreateTime(new Date());
 					i.setOptionName(null == CacheContext.ddNameMap.get(i.getOptionCode()) ? "未知属性" : CacheContext.ddNameMap.get(i.getOptionCode()));
 				} else {
 					i.setIndicatorId(dto.getId());
+					i.setOptionOrder(i.getOptionOrder());
 					i.setChildCode(dto2.getChildCode());
 					i.setChildName(dto2.getChildName());
 					i.setOptionName(null == CacheContext.ddNameMap.get(i.getOptionCode()) ? "未知属性" : CacheContext.ddNameMap.get(i.getOptionCode()));

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

@@ -216,6 +216,22 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		return list;
 	}
 
+	@Override
+	public OrganizationEvaluationRule getByIdIsCheck(String id,Boolean isCheck,Boolean delFlag) {
+
+		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(id)) {
+			qw.lambda().eq(OrganizationEvaluationRule::getId, id);
+		}
+		qw.lambda().eq(OrganizationEvaluationRule::getIsCheck, isCheck);
+		qw.lambda().eq(OrganizationEvaluationRule::getDelFlag, delFlag);
+		List<OrganizationEvaluationRule> list  = baseMapper.selectList(qw);
+		if(null != list && list.size()>0){
+			return list.get(0);
+		}
+		return null;
+	}
+
 
 	@Transactional
 	@Override

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

@@ -301,7 +301,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 			for (String ruleId : evaluationRuleIds) {
 
 				//获取指定部门的规则
-				OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getById(ruleId);
+				OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getByIdIsCheck(ruleId,true,false);
 				if (null == evaluationRule) {
 					throw new CustomException("不存在此单位规则权重配置");
 				}
@@ -390,8 +390,8 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 
 				//获取指定部门的规则
 				OrganizationEvaluationRule evaluationRule = organizationEvaluationRuleService.getById(ruleId);
-				if (null == evaluationRule) {
-					throw new CustomException("不存在此单位规则权重配置");
+				if (null == evaluationRule|| evaluationRule.getDelFlag().equals(true)) {
+					throw new CustomException(evaluationRule.getOrganizationShortName()+"不存在此单位规则权重配置");
 				}
 				//获取对应的考评规（至少存在一条）
 				List<String> evaluateRuleIds = Arrays.asList(evaluationRule.getEvaluateRuleId().split(","));

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -71,6 +72,9 @@ public class OrganizationStructureServiceImpl extends ServiceImpl<OrganizationSt
 		if (CollectionUtil.isEmpty(source)) {
 			return new ArrayList<>();
 		}
+		Map<String ,OrganizationStructure> map = source.stream().collect(Collectors.toMap(OrganizationStructure::getId, structure -> structure));
+
+
 		List<OrganizationStructure> result = new ArrayList<>();
 		List<String> idList = new ArrayList<>();
 		if (null == id || id.length() <= 0) {
@@ -85,7 +89,7 @@ public class OrganizationStructureServiceImpl extends ServiceImpl<OrganizationSt
 			}
 		} else {
 //			List<OrganizationStructure> list =baseMapper.selectById(id);
-			result.add(this.baseMapper.selectById(id));
+			result.add(map.get(id));
 
 		}
 

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

@@ -68,7 +68,7 @@
         d.child_code
         FROM
         evaluate_rule_info ri
-        LEFT JOIN INDICATOR i.id = ri.indicator_id
+        LEFT JOIN INDICATOR i on i.id = ri.indicator_id
         LEFT JOIN indicator_dictionary d ON i.ID = d.indicator_id
         <where>
             AND ri.id in

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

@@ -84,6 +84,8 @@
 
         </where>
 
+        order by  i.order_num asc
+
     </select>
 
 

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

@@ -37,6 +37,7 @@
         bn.section_name,
         oer.id organizationEvaluationRuleId,
         oer.organization_name,
+        oer.organization_short_name,
         dd.key_name deptName,
         it.type_name,
         i.indicator_name,
@@ -52,7 +53,7 @@
         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  evaluate_rule_info ri on ri.indicator_id = i.id
+        left join  evaluate_rule_info ri on ri.indicator_id = i.id and ei.evaluate_rule_info_id = ri.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
@@ -76,10 +77,10 @@
                 and  oer.organization_id = #{organizationId}
             </if>
 
-            and id.option_code not in ('CZ','CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN')
+            and id.option_code not in ('CZ','CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','WCLDF','LRGXKHMAX','LRGXKHMIN')
         </where>
 
-        order by oer.organization_id, bn.order_num,ri.order_num,id.child_code,id.option_code asc
+        order by be.order_num,oer.organization_short_name,bn.order_num,ri.order_num,id.child_code,id.option_code,id.order_num asc
 
     </select>