dept_id

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

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 
 @Data
-public class CalculateIndicatorItemInfo extends Model {
+public class CalculateIndicatorItemInfo extends Model implements Cloneable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -68,4 +68,14 @@ public class CalculateIndicatorItemInfo extends Model {
 
 
 
+
+	@Override
+	public Object clone(){
+		try {
+			return super.clone();
+		} catch (CloneNotSupportedException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
 }

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

@@ -109,10 +109,11 @@ public class CalculateIndicatorItemInfoServiceImpl extends ServiceImpl<Calculate
 					}
 				});
 
-				CalculateIndicatorItemInfo maxNum = listEntry.getValue().get(listEntry.getValue().size()-1);
+				CalculateIndicatorItemInfo maxNum =  (CalculateIndicatorItemInfo)listEntry.getValue().get(listEntry.getValue().size()-1).clone();
 				maxNum.setMark("1");
 
-				CalculateIndicatorItemInfo minNum = listEntry.getValue().get(0);
+				CalculateIndicatorItemInfo minNum  = (CalculateIndicatorItemInfo)listEntry.getValue().get(0).clone();
+
 				minNum.setMark("0");
 
 

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

@@ -144,9 +144,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 		}
 
-//		OrganizationEvaluationInfo organizationEvaluationInfo = baseMapper.selectById(organizationEvaluationInfoList.get(0).getId());
+		OrganizationEvaluationInfo organizationEvaluationInfo = baseMapper.selectById(organizationEvaluationInfoList.get(0).getId());
 		//查询本次考评所有考评指标明细
-		List<OrganizationEvaluationInfo> organizationEvaluationInfos = baseMapper.selectByEvaluationInfoId(organizationEvaluationInfoList.get(0).getOrganizationEvaluationId());
+		List<OrganizationEvaluationInfo> organizationEvaluationInfos = baseMapper.selectByEvaluationInfoId(organizationEvaluationInfo.getOrganizationEvaluationId());
 
 		//调用需要计算指标项的方法
 		boolean calculate = calculateIdicatorItem(organizationEvaluationInfos);

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

@@ -74,7 +74,7 @@
                 AND i.bin_stage = #{binStage}
             </if>
 
-            <if test="dept_id !=null and dept_id !=''">
+            <if test="dept !=null and dept !=''">
                 AND i.dept_id = #{dept}
             </if>
 
@@ -157,7 +157,7 @@
                 AND i.bin_stage = #{binStage}
             </if>
 
-            <if test="dept_id !=null and dept_id !=''">
+            <if test="dept !=null and dept !=''">
                 AND i.dept_id = #{dept}
             </if>