考评报告修改

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

@@ -30,10 +30,16 @@ public interface EvaluateReportMapper extends BaseMapper<EvaluateReport> {
 		 @Param("month")String month);
 
 
+
 	 List<EvaluateReportInfoResDTO> selectList(@Param("binSection")String binSection,
 											   @Param("organizationEvaluationId") String organizationEvaluationId,
 											   @Param("checkCycle")String checkCycle,
 											   @Param("year")String year,
 											   @Param("month")String month);
 
+
+
+	List<EvaluateReport> selectListAll(@Param("organizationEvaluationId") String organizationEvaluationId,
+									   @Param("binSection")String binSection);
+
 }

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

@@ -87,7 +87,7 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 		for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> childCodeGropListEntry : childCodeGropList.entrySet()){
 			//对指标id进行分组
 			for (OrganizationEvaluationInfoResDTO r : childCodeGropListEntry.getValue()){
-				if (r.getOptionCode().equals("CZ") ||  r.getOptionCode().equals("LRGXKH")|| r.getOptionCode().equals("LRGXL") || r.getOptionCode().equals("DWQWLR")) {
+				if (r.getOptionCode().equals("LRZE") || r.getOptionCode().equals("CZ") ||  r.getOptionCode().equals("LRGXKH")|| r.getOptionCode().equals("LRGXL") || r.getOptionCode().equals("DWQWLR")) {
 					CalculateIndicatorItemInfo calculateIndicatorItemInfo = new CalculateIndicatorItemInfo();
 					calculateIndicatorItemInfo.setIndicatorId(r.getIndicatorId());
 					calculateIndicatorItemInfo.setOptionCode(r.getOptionCode());
@@ -158,6 +158,7 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 						maxNum.setOptionCode("CZMAX");
 						minNum.setOptionCode("CZMIN");
 					}else if (listEntry.getKey().equals("LRGXL")){
+						//利润贡献
 						maxNum.setOptionCode("LRGXLMAX");
 						minNum.setOptionCode("LRGXLMIN");
 					}else if (listEntry.getKey().equals("DWQWLR")){
@@ -166,13 +167,13 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 					}else if (listEntry.getKey().equals("LRGXKH")){
 						maxNum.setOptionCode("LRGXKHMAX");
 						minNum.setOptionCode("LRGXKHMIN");
+					}else if (listEntry.getKey().equals("LRZE")){
+						maxNum.setOptionCode("LRZEMAX");
+						minNum.setOptionCode("LRZEMIN");
 					}
 
-
-					int insert = calculateIndicatorItemInfoMapper.insert(maxNum);
-
-					int insert1 = calculateIndicatorItemInfoMapper.insert(minNum);
-					System.out.println(insert1);
+					calculateIndicatorItemInfoMapper.insert(maxNum);
+					calculateIndicatorItemInfoMapper.insert(minNum);
 				}
 			}
 

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

@@ -329,14 +329,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 
 	@Override
 	public List<EvaluateReport> list(String organizationEvaluationId, String binSection) {
-		QueryWrapper<EvaluateReport> qw = new QueryWrapper<>();
-		if (StringUtils.isNotEmpty(organizationEvaluationId)) {
-			qw.lambda().eq(EvaluateReport::getOrganizationEvaluationId, organizationEvaluationId);
-		}
-		if (StringUtils.isNotEmpty(binSection)) {
-			qw.lambda().eq(EvaluateReport::getBinSection, binSection);
-		}
-		List<EvaluateReport> list = baseMapper.selectList(qw);
+		List<EvaluateReport> list = baseMapper.selectListAll(organizationEvaluationId,binSection);
 		return list;
 	}
 

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

@@ -52,7 +52,7 @@
             </if>
 
             <if test="checkCycle !=null and checkCycle !=''">
-                AND r.checkCycle = #{checkCycle}
+                AND r.check_cycle = #{checkCycle}
             </if>
 
             <if test="year !=null and year !=''">
@@ -98,5 +98,21 @@
 
         </where>
     </select>
+    <select id="selectListAll" resultType="com.ims.eval.entity.EvaluateReport">
+
+        select r.*
+        from  evaluate_report r
+
+        <where>
+            <if test="binSection !=null and binSection !=''">
+                AND r.bin_section = #{binSection}
+            </if>
+
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                AND r.organization_evaluation_id = #{organizationEvaluationId}
+            </if>
+         </where>
+
+    </select>
 
 </mapper>