优化员工考核功能

java110-bean/src/main/java/com/java110/dto/userQuestionAnswer/UserQuestionAnswerDto.java

@@ -20,6 +20,7 @@ public class UserQuestionAnswerDto extends PageDto implements Serializable {
     private String objId;
     private String userQaId;
     private String personId;
+    private String personName;
     private String state;
     private String objType;
     private String qaId;
@@ -163,4 +164,12 @@ public class UserQuestionAnswerDto extends PageDto implements Serializable {
     public void setQaTypes(String[] qaTypes) {
         this.qaTypes = qaTypes;
     }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
 }

java110-db/src/main/resources/mapper/user/UserQuestionAnswerServiceDaoImplMapper.xml

@@ -31,10 +31,12 @@
             uqa.evaluation_score evaluationScore,
             uqa.user_qa_id userQaId,
             uqa.person_id personId,
+            uu.name personName,
             uqa.state
         FROM
             question_answer t
             LEFT JOIN user_question_answer uqa ON t.qa_id = uqa.qa_id AND t.obj_type = uqa.obj_type AND t.obj_id = uqa.obj_id AND uqa.status_cd = '0'
+            left join u_user uu on uqa.person_id = uu.user_id and uu.status_cd = '0'
             LEFT JOIN t_dict td ON td.status_cd = t.qa_type AND td.table_name = 'question_answer' AND td.table_columns = 'qa_type'
         WHERE
         <if test="personId !=null and personId != ''">

service-user/src/main/java/com/java110/user/api/UserQuestionAnswerApi.java

@@ -114,11 +114,13 @@ public class UserQuestionAnswerApi {
                                                           @RequestHeader(value = "user-id") String userId,
                                                           @RequestParam(value = "communityId", required = false) String communityId,
                                                           @RequestParam(value = "roleCd") String roleCd,
+                                                          @RequestParam(value = "state") String state,
                                                           @RequestParam(value = "page") int page,
                                                           @RequestParam(value = "row") int row) {
         UserQuestionAnswerDto userQuestionAnswerDto = new UserQuestionAnswerDto();
         userQuestionAnswerDto.setPage(page);
         userQuestionAnswerDto.setRow(row);
+        userQuestionAnswerDto.setState(state);
         if ("owner".equals(roleCd)) {
             userQuestionAnswerDto.setObjType(QuestionAnswerDto.QA_TYPE_COMMUNITY);
             userQuestionAnswerDto.setObjId(communityId);