Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/controller/ProjectController.java

@@ -134,23 +134,23 @@ public class ProjectController {
             pro.setProjectHead(projectHead.getId());
         }
 
-        if(StringUtils.isNotBlank(projectDTO.getEvaluationPersonOne())){
+        /*if(StringUtils.isNotBlank(projectDTO.getEvaluationPersonOne())){
 
             UserDTO evaluationPersonOne = userService.get(projectDTO.getEvaluationPersonOne());
             if(null == evaluationPersonOne || StringUtils.isBlank(evaluationPersonOne.getId())){
                 return ResponseEntity.badRequest().body("签字评估师1不存在，请重新输入");
             }
             pro.setEvaluationPersonOne(evaluationPersonOne.getId());
-        }
+        }*/
 
-        if(StringUtils.isNotBlank(projectDTO.getEvaluationPersonTwo())){
+        /*if(StringUtils.isNotBlank(projectDTO.getEvaluationPersonTwo())){
 
             UserDTO evaluationPersonTwo = userService.get(projectDTO.getEvaluationPersonTwo());
             if(null == evaluationPersonTwo || StringUtils.isBlank(evaluationPersonTwo.getId())){
                 return ResponseEntity.badRequest().body("签字评估师2不存在，请重新输入");
             }
             pro.setEvaluationPersonTwo(evaluationPersonTwo.getId());
-        }
+        }*/
 
         if(StrUtil.isEmpty(projectDTO.getId())){
 
@@ -341,23 +341,23 @@ public class ProjectController {
                 }
             }
 
-            if(StrUtil.isNotEmpty(project.getEvaluationPersonOne())){
+            /*if(StrUtil.isNotEmpty(project.getEvaluationPersonOne())){
                 String id = userService.getUserIdByName(project.getEvaluationPersonOne());
                 if(ObjectUtil.isNotEmpty(id)){
                     project.setEvaluationPersonOne(id);
                 }else{
                     return "文件中有签字评估师无法找到，请修改为在档人员，或者不填写";
                 }
-            }
+            }*/
 
-            if(StrUtil.isNotEmpty(project.getEvaluationPersonTwo())){
+            /*if(StrUtil.isNotEmpty(project.getEvaluationPersonTwo())){
                 String id = userService.getUserIdByName(project.getEvaluationPersonTwo());
                 if(ObjectUtil.isNotEmpty(id)){
                     project.setEvaluationPersonTwo(id);
                 }else{
                     return "文件中有签字评估师无法找到，请修改为在档人员，或者不填写";
                 }
-            }
+            }*/
 
             //文号的问题
             if(StrUtil.isNotEmpty(project.getDocumentNum())) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/mapper/xml/ProjectMapper.xml

@@ -114,8 +114,10 @@
     select
     <include refid="to_list"></include>,
     su1.id as projectHead,
-    su2.id as evaluationPersonOne,
-    su3.id as evaluationPersonTwo
+    pr.evaluation_person_one,
+    pr.evaluation_person_two
+--     su2.id as evaluationPersonOne,
+--     su3.id as evaluationPersonTwo
     from project_records pr
     left join sys_user su1 on pr.project_head = su1.id
     left join sys_user su2 on pr.evaluation_person_one = su2.id
@@ -128,8 +130,10 @@
     <include refid="to_list"></include>,
     su1.name as projectHead,
     su1.id as projectHeadId,
-    su2.name as evaluationPersonOne,
-    su3.name as evaluationPersonTwo
+    pr.evaluation_person_one,
+    pr.evaluation_person_two
+--     su2.name as evaluationPersonOne,
+--     su3.name as evaluationPersonTwo
     from project_records pr
     left join sys_user su1 on pr.project_head = su1.id
     left join sys_user su2 on pr.evaluation_person_one = su2.id
@@ -154,8 +158,10 @@
     <include refid="to_list"></include>,
     su1.name as projectHead,
     su1.id as projectHeadId,
-    su2.name as evaluationPersonOne,
-    su3.name as evaluationPersonTwo
+    pr.evaluation_person_one,
+    pr.evaluation_person_two
+--     su2.name as evaluationPersonOne,
+--     su3.name as evaluationPersonTwo
     from project_records pr
     left join sys_user su on pr.create_by = su.id
     left join sys_user su1 on pr.project_head = su1.id