修改问题

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

@@ -1,5 +1,6 @@
 package com.ims.eval.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.common.utils.StringUtils;
@@ -206,7 +207,7 @@ public class DeptAssessmentDeclarationController {
 					deptAssessmentDeclarationContent.setAssessmentDeclarationId(str[1]);
 					deptAssessmentDeclarationContent.setEmployeeId(str[2]);
 					deptAssessmentDeclarationContent.setEmployeeName(str[3]);
-					deptAssessmentDeclarationContent.setSerialNumber(str[4]);
+					deptAssessmentDeclarationContent.setSerialNumber(Convert.toInt(str[4]));
 					deptAssessmentDeclarationContent.setSuggestedValue(str[5]);
 					deptAssessmentDeclarationContentList.add(deptAssessmentDeclarationContent);
 				}

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

@@ -20,9 +20,11 @@ public class DeptAssessmentDeclarationContent extends Model {
 	//考核申报主键
 	private String assessmentDeclarationId;
 	//序号
-	private String serialNumber;
+	private Integer serialNumber;
 	//员工主键
 	private String employeeId;
+	//员工编号
+	private String employeeNo;
 	//员工名称
 	private String employeeName;
 	//建议值

ims-service/ims-eval/src/main/java/com/ims/eval/entity/dto/request/UserDTO.java

@@ -12,6 +12,7 @@ public class UserDTO {
 
 	private String id;
 
-	private String name;
+	private String no;
 
+	private String name;
 }

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

@@ -67,15 +67,15 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = new ArrayList<>();
 		JSONObject jsonArr = userService.pageList(1, 500, deptAssessmentDeclaration.getDeptId(), "", "", "", "", "", request);
 		JSONObject jsonArr1 = (JSONObject) jsonArr.get("data");
-		System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>--------------------------------------------------" + jsonArr1);
-		System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + jsonArr1.get("records"));
-		JSONArray array = JSONUtil.parseArray(jsonArr.get("records"));
+		JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
+		System.out.println(array);
 		List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
 		for (int i = 0; i < userList.size(); i++) {
 			DeptAssessmentDeclarationContent deptAssessmentDeclarationContent = new DeptAssessmentDeclarationContent();
 			deptAssessmentDeclarationContent.setAssessmentDeclarationId(id);
-			deptAssessmentDeclarationContent.setSerialNumber(Convert.toStr(i + 1));
+			deptAssessmentDeclarationContent.setSerialNumber(i + 1);
 			deptAssessmentDeclarationContent.setEmployeeId(userList.get(i).getId());
+			deptAssessmentDeclarationContent.setEmployeeNo(userList.get(i).getNo());
 			deptAssessmentDeclarationContent.setEmployeeName(userList.get(i).getName());
 			deptAssessmentDeclarationContent.setSuggestedValue("1");
 			deptAssessmentDeclarationContentList.add(deptAssessmentDeclarationContent);
@@ -93,9 +93,9 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		for (String id : ids) {
 			DeptAssessmentDeclaration deptAssessmentDeclaration = super.getById(id);
 			if ("流程未启动".equals(deptAssessmentDeclaration.getStage()) || "流程已结束".equals(deptAssessmentDeclaration.getStage())) {
-				b = super.removeById(id);
+				b = deptAssessmentDeclarationContentService.removeByAssessmentDeclarationId(id);
 				if (b) {
-					deptAssessmentDeclarationContentService.removeByAssessmentDeclarationId(id);
+					super.removeById(id);
 				}
 			} else {
 				return b;

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

@@ -8,6 +8,7 @@
         <result column="assessment_declaration_id" property="assessmentDeclarationId"/>
         <result column="serial_number" property="serialNumber"/>
         <result column="employee_id" property="employeeId"/>
+        <result column="employee_no" property="employeeNo"/>
         <result column="employee_name" property="employeeName"/>
         <result column="suggested_value" property="suggestedValue"/>
     </resultMap>
@@ -18,6 +19,7 @@
                assessment_declaration_id,
                serial_number,
                employee_id,
+               employee_no,
                employee_name,
                suggested_value
         from dept_assessment_declaration_content