增加业绩指标计划会签流程详情修改

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

@@ -242,7 +242,7 @@ public class DepartmentalPerformanceIndicatorAssessmentController {
 					evaluationDeptBusinessContent.setBusinessPlanId(id);
 					evaluationDeptBusinessContent.setDeptId(str[0]);
 					evaluationDeptBusinessContent.setDeptName(str[1]);
-					evaluationDeptBusinessContent.setSerialNumber(str[2]);
+					evaluationDeptBusinessContent.setSerialNumber(Integer.valueOf(str[2]));
 					evaluationDeptBusinessContent.setTargetName(str[3]);
 					evaluationDeptBusinessContent.setTargetValue(str[4]);
 					evaluationDeptBusinessContent.setEvaluationCriteria(str[5]);

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

@@ -288,7 +288,7 @@ public class DepartmentalPerformanceIndicatorPlanController {
 					evaluationDeptBusinessContent.setBusinessPlanId(id);
 					evaluationDeptBusinessContent.setDeptId(str[0]);
 					evaluationDeptBusinessContent.setDeptName(str[1]);
-					evaluationDeptBusinessContent.setSerialNumber(str[2]);
+					evaluationDeptBusinessContent.setSerialNumber(Integer.valueOf(str[2]));
 					evaluationDeptBusinessContent.setTargetName(str[3]);
 					evaluationDeptBusinessContent.setTargetValue(str[4]);
 					evaluationDeptBusinessContent.setEvaluationCriteria(str[5]);

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

@@ -41,7 +41,7 @@ public class EvaluationDeptBusinessContent extends Model {
 	/**
 	 * 序号
 	 */
-	private String serialNumber;
+	private Integer serialNumber;
 
 	/**
 	 * 指标名称

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

@@ -55,7 +55,7 @@
         <include refid="selectEvaluationDeptBusinessContentVo"/>
         where
         <if test="deptId != null and deptId != ''">
-            AND dept_id = #{deptId}
+            dept_id = #{deptId} AND
         </if>
         business_plan_id = #{businessPlanId} order by dept_name asc, serial_number asc
     </select>