考评报告修改 优化

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

@@ -63,9 +63,9 @@ public class 	EvaluationScoreCount extends Model {
 	private String  remark;
 
 	/**
-	 * 板块code；
+	 * 阶段；
 	 */
-	private String stageCode;
+	private String binStage;
 
 	/**
 	 * 基准分标记
@@ -74,4 +74,10 @@ public class 	EvaluationScoreCount extends Model {
 
 
 
+	/**
+	 * 阶段；
+	 */
+	private String binSection;
+
+
 }

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

@@ -23,7 +23,7 @@ public interface IEvaluationScoreCountService extends IService<EvaluationScoreCo
 	Map<String, Object> evaluationList(String binSection, String binStage, String type, String condition, String date);
 
 
-	List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId,String organizationEvaluationRuleId,String indicatorId);
+	List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId,String organizationEvaluationRuleId,String indicatorId,String binSection);
 
 	List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId,String organizationEvaluationRuleId,List<String> indicatorIds);
 

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

@@ -195,9 +195,17 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 
 				StringBuilder remark = new StringBuilder();
 				//生产95%基建5%前期0%
-				remark.append("生产").append(rule.getScjyWeight() * 100).append("%");
-				remark.append("基建").append(rule.getJjWeight() * 100).append("%");
-				remark.append("前期").append(rule.getQqWeight() * 100).append("%");
+				if (rule.getScjyWeight() > 0) {
+					remark.append("生产").append(DoubleUtils.getRoundingNum(rule.getScjyWeight() * 100, 2)).append("%");
+				}
+				if (rule.getJjWeight() > 0) {
+					remark.append("基建").append(DoubleUtils.getRoundingNum(rule.getJjWeight() * 100,2)).append("%");
+				}
+				if (rule.getQqWeight() > 0) {
+					remark.append("前期").append(DoubleUtils.getRoundingNum(rule.getQqWeight() * 100,2)).append("%");
+				}
+
+
 
 
 				//存储多块牌子数据

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

@@ -8,7 +8,6 @@ import com.ims.eval.cache.CacheContext;
 import com.ims.eval.dao.EvaluationScoreCountMapper;
 import com.ims.eval.entity.EvaluationScoreCount;
 import com.ims.eval.service.IEvaluationScoreCountService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -100,7 +99,7 @@ public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScor
 
 
 	@Override
-	public List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId, String organizationEvaluationRuleId, String indicatorId) {
+	public List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId, String organizationEvaluationRuleId, String indicatorId,String binSection) {
 
 
 		QueryWrapper<EvaluationScoreCount> qw = new QueryWrapper();
@@ -117,6 +116,10 @@ public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScor
 			qw.lambda().eq(EvaluationScoreCount::getIndicatorId,indicatorId);
 		}
 
+		if (StringUtils.isNotEmpty(binSection)) {
+			qw.lambda().eq(EvaluationScoreCount::getBinSection,binSection);
+		}
+
 		List<EvaluationScoreCount> list = baseMapper.selectList(qw);
 		return list;
 	}

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

@@ -291,7 +291,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 											scoreCount.setOrganizationEvaluationId(dto.getOrganizationEvaluationId());
 											scoreCount.setOrganizationEvaluationRuleId(dto.getOrganizationEvaluationRuleId());
 											scoreCount.setIndicatorId(dto.getIndicatorId());
-											scoreCount.setStageCode(dto.getStageCode());
+											scoreCount.setBinStage(dto.getBinStage());
+											scoreCount.setBinSection(dto.getBinSection());
 
 											for (OrganizationEvaluationInfoResDTO f : indicator){
 												if(f.getOptionCode().endsWith("MIN") || f.getOptionCode().endsWith("MAX")){
@@ -336,7 +337,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 									scoreCount.setObversionScore(totalScore);
 									scoreCount.setIsQuantified("1");
 
-									List<EvaluationScoreCount>  listcount = iEvaluatioinScoreCountService.getEvaluationScoreCountList(scoreCount.getOrganizationEvaluationId(),scoreCount.getOrganizationEvaluationRuleId(),scoreCount.getIndicatorId());
+									List<EvaluationScoreCount>  listcount = iEvaluatioinScoreCountService.getEvaluationScoreCountList(scoreCount.getOrganizationEvaluationId(),scoreCount.getOrganizationEvaluationRuleId(),scoreCount.getIndicatorId(),scoreCount.getBinSection());
 									if(null  != listcount && listcount.size() >0){
 										List<String> ids = listcount.stream().map(EvaluationScoreCount::getId).collect(Collectors.toList());
 										boolean cod = iEvaluatioinScoreCountService.removeByIds(ids);

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

@@ -637,7 +637,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 					for (EvaluationScoreInfoResDTO dto : listdto) {
 						//综合得分
 						if(zhdfflg && (childNameMap.size()>1 || dto.getChildName().equals("净利润"))){
-							List<EvaluationScoreCount> scoreCounts = evaluationScoreCountService.getEvaluationScoreCountList(id,dto.getOrganizationEvaluationRuleId(),dto.getIndicatorId());
+							List<EvaluationScoreCount> scoreCounts = evaluationScoreCountService.getEvaluationScoreCountList(id,dto.getOrganizationEvaluationRuleId(),dto.getIndicatorId(),binSection);
 							opmap.put("zhdf",scoreCounts.get(0).getObversionScore());
 							zhdfflg = false;
 						}
@@ -732,7 +732,7 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 
 					for (EvaluationScoreInfoResDTO dto : indicatorIdEntry.getValue()) {
 						if(iChildCodeMap.size()>1 && dto.getOptionCode().equals("DF")){
-							List<EvaluationScoreCount> scoreCounts = evaluationScoreCountService.getEvaluationScoreCountList(id,dto.getOrganizationEvaluationRuleId(),dto.getIndicatorId());
+							List<EvaluationScoreCount> scoreCounts = evaluationScoreCountService.getEvaluationScoreCountList(id,dto.getOrganizationEvaluationRuleId(),dto.getIndicatorId(),binSection);
 							opmap.put(dto.getChildCode()+"_"+dto.getOptionCode(),scoreCounts.get(0).getObversionScore());
 						}else {
 							opmap.put(dto.getChildCode()+"_"+dto.getOptionCode(),dto.getQuantifiedValue());
@@ -740,17 +740,26 @@ public class OrganizationEvaluationServiceImpl extends ServiceImpl<OrganizationE
 
 						//综合得分
 						if(zhdfflg2 && (dto.getChildName().equals("净利润"))){
-							List<EvaluationScoreCount> scoreCounts = evaluationScoreCountService.getEvaluationScoreCountList(id,dto.getOrganizationEvaluationRuleId(),dto.getIndicatorId());
-							opmap.put(dto.getChildCode()+"_zhdf",scoreCounts.get(0).getObversionScore());
+							List<EvaluationScoreCount> scoreCounts = evaluationScoreCountService.getEvaluationScoreCountList(id,dto.getOrganizationEvaluationRuleId(),dto.getIndicatorId(),binSection);
+							if (null != scoreCounts && scoreCounts.size() > 0) {
+								opmap.put(dto.getChildCode()+"_zhdf",scoreCounts.get(0).getObversionScore());
+							}else {
+								opmap.put(dto.getChildCode()+"_zhdf",0.00);
+							}
+
 							zhdfflg2 = false;
 						}
 					}
 				}
-				List<EvaluationScoreCount> scoreCounts2 = evaluationScoreCountService.getEvaluationScoreCountList(id,organizationScoreEntry.getValue().get(0).getOrganizationEvaluationRuleId(),"");
-				Double scoresum =  scoreCounts2.stream().mapToDouble(EvaluationScoreCount::getObversionScore).sum();
+				List<EvaluationScoreCount> scoreCounts2 = evaluationScoreCountService.getEvaluationScoreCountList(id, organizationScoreEntry.getValue().get(0).getOrganizationEvaluationRuleId(), "", binSection);
+				if (null != scoreCounts2 && scoreCounts2.size() > 0) {
+					Double scoresum = scoreCounts2.stream().mapToDouble(EvaluationScoreCount::getObversionScore).sum();
 
+					opmap.put("zhdf", new BigDecimal(scoresum).setScale(2, RoundingMode.HALF_UP).doubleValue());
+				} else {
+					opmap.put("zhdf", 0.00);
+				}
 
-				opmap.put("zhdf",new BigDecimal(scoresum).setScale(2, RoundingMode.HALF_UP).doubleValue());
 				bodylist2.add(opmap);
 			}
 

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

@@ -63,6 +63,7 @@
             </if>
 
         </where>
+            order by r.year,r.month desc
     </select>
     <select id="selectList" resultType="com.ims.eval.entity.dto.response.EvaluateReportInfoResDTO">