问题修改

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

@@ -168,6 +168,7 @@ public class DepartmentPerformanceAppraisalRatingController {
 					evaluationDeptRating.setDece(str[25]);
 					evaluationDeptRating.setDeceContent(str[26]);
 					evaluationDeptRating.setAcount(str[27]);
+					evaluationDeptRating.setCcount(str[28]);
 					if (null == str[0] || "".equals(str[0])) {
 						evaluationDeptRating.setCreateTime(DateUtil.date());
 					} else {

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

@@ -3,7 +3,6 @@ package com.ims.eval.entity;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.poi.ss.formula.functions.Count;
 
 import java.util.Date;
 
@@ -66,6 +65,8 @@ public class EvaluationDeptRating extends Model {
 
 	//A级总数
 	private String acount;
+	//C级总数
+	private String ccount;
 	//创建时间
 	private Date createTime;
 	//创建者

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

@@ -47,44 +47,82 @@ public class EvaluationDeptRatingServiceImpl extends ServiceImpl<EvaluationDeptR
 				return false;
 			}
 		}
-		int count = 0;
+		int countA = 0;
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getJan()) && "A".equals(evaluationDeptRating.getJan())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getFeb()) && "A".equals(evaluationDeptRating.getFeb())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getMar()) && "A".equals(evaluationDeptRating.getMar())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getApr()) && "A".equals(evaluationDeptRating.getApr())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getMay()) && "A".equals(evaluationDeptRating.getMay())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getJun()) && "A".equals(evaluationDeptRating.getJun())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getJul()) && "A".equals(evaluationDeptRating.getJul())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getAug()) && "A".equals(evaluationDeptRating.getAug())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getSep()) && "A".equals(evaluationDeptRating.getSep())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getOct()) && "A".equals(evaluationDeptRating.getOct())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getNov()) && "A".equals(evaluationDeptRating.getNov())){
-			count += 1;
+			countA += 1;
 		}
 		if (StringUtils.isNotEmpty(evaluationDeptRating.getDece()) && "A".equals(evaluationDeptRating.getDece())){
-			count += 1;
+			countA += 1;
 		}
-		evaluationDeptRating.setAcount(Convert.toStr(count));
+		evaluationDeptRating.setAcount(Convert.toStr(countA));
+		int countC = 0;
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getJan()) && "C".equals(evaluationDeptRating.getJan())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getFeb()) && "C".equals(evaluationDeptRating.getFeb())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getMar()) && "C".equals(evaluationDeptRating.getMar())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getApr()) && "C".equals(evaluationDeptRating.getApr())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getMay()) && "C".equals(evaluationDeptRating.getMay())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getJun()) && "C".equals(evaluationDeptRating.getJun())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getJul()) && "C".equals(evaluationDeptRating.getJul())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getAug()) && "C".equals(evaluationDeptRating.getAug())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getSep()) && "C".equals(evaluationDeptRating.getSep())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getOct()) && "C".equals(evaluationDeptRating.getOct())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getNov()) && "C".equals(evaluationDeptRating.getNov())){
+			countC += 1;
+		}
+		if (StringUtils.isNotEmpty(evaluationDeptRating.getDece()) && "C".equals(evaluationDeptRating.getDece())){
+			countC += 1;
+		}
+		evaluationDeptRating.setCcount(Convert.toStr(countC));
 		return super.saveOrUpdate(evaluationDeptRating);
 	}
 

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

@@ -33,6 +33,7 @@
         <result column="nov_content" property="novContent"/>
         <result column="dece_content" property="deceContent"/>
         <result column="acount" property="acount"/>
+        <result column="ccount" property="ccount"/>
         <result column="create_time" property="createTime"/>
         <result column="create_by" property="createBy"/>
         <result column="create_name" property="createName"/>
@@ -71,6 +72,7 @@
                nov_content,
                dece_content,
                acount,
+               ccount,
                create_time,
                create_by,
                create_name,