1.审批记录加面试评价

2.审批列表查询个人声明没有用户输入
3.AGMS审批列表缺少审批状态和审批时间

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -187,6 +187,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         records.setApproveStepName(step.getStepName());
         records.setApprovingPractitionerId(loginPractitionerId);
         records.setApprovingStatus(requestVO.getApprovingStatus());
+        records.setInterviewAssessment(requestVO.getInterviewAssessment());
         records.setRejectNote(requestVO.getRejectNote());
         records.setIsActive(1);
         records.setCreatedAt(new Date());

yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringApproveRequestVO.java

@@ -24,6 +24,10 @@ public class PractitionerHiringApproveRequestVO {
      * 备注，驳回原因
      */
     private String rejectNote;
+    /**
+     * 面试评价
+     */
+    private String interviewAssessment;
 
 
     /**
@@ -126,4 +130,12 @@ public class PractitionerHiringApproveRequestVO {
                 ", rejectNote='" + rejectNote + '\'' +
                 '}';
     }
+
+    public String getInterviewAssessment() {
+        return interviewAssessment;
+    }
+
+    public void setInterviewAssessment(String interviewAssessment) {
+        this.interviewAssessment = interviewAssessment;
+    }
 }

yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringListInfo.java

@@ -48,6 +48,10 @@ public class PractitionerHiringListInfo {
      * 审批状态
      */
     private String status;
+    /**
+     * 审批状态
+     */
+    private String approvingTime;
 
     /**
      * 获取 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
@@ -241,4 +245,12 @@ public class PractitionerHiringListInfo {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getApprovingTime() {
+        return approvingTime;
+    }
+
+    public void setApprovingTime(String approvingTime) {
+        this.approvingTime = approvingTime;
+    }
 }

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringApproveRecords.java

@@ -44,6 +44,11 @@ public class AclPractitionerHiringApproveRecords {
     private String rejectNote;
 
     /**
+     * 面试评价
+     */
+    private String interviewAssessment;
+
+    /**
     * 0=No, 1=Yes
     */
     private Integer isActive;

yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml

@@ -83,6 +83,7 @@
     <select id="findPractitionerHiringPersonalStatementsList"
             resultType="com.yd.dal.entity.agms.hiring.PractitionerHiringPersonalStatements">
         select md_drop_option_name                                personalStatements,
+               user_input userInput,
                if(status is null, null, if(status = 1, '有', '无')) status
         from ag_acl_practitioner_hiring_personal_statements
         where is_active = 1
@@ -134,6 +135,7 @@
         <result column="branch" jdbcType="VARCHAR" property="branch"/>
         <result column="applicationTime" jdbcType="VARCHAR" property="applicationTime"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="approvingTime" jdbcType="VARCHAR" property="approvingTime"/>
     </resultMap>
     <select id="practitionerHiringList" resultMap="practitionerHiringListInfo">
         select b.id                                           hiringBasicInfoId,
@@ -145,14 +147,15 @@
                m.subsystem                                    subsystem,
                m.branch                                       branch,
                date_format(b.created_at, '%Y-%m-%d %H:%i:%s') applicationTime,
-               r.approving_status                             status
+               r.approving_status                             status,
+               r.created_at                                   approvingTime
         from ag_acl_practitioner_hiring_basic_info b
                      left join ag_acl_practitioner_hiring_membership m on b.id = m.hiring_basic_info_id
                      left join ag_acl_practitioner_subordinate_system sys on sys.id = m.subsystem_id
                      left join
                      (
                         select
-                        a.hiring_basic_info_id, a.approving_status
+                        a.hiring_basic_info_id, a.approving_status, a.created_at
                         from
                         ag_acl_practitioner_hiring_approve_records a
                         left join

yd-api/src/main/resources/mapper/customer/AclPractitionerHiringApproveRecordsMapper.xml

@@ -11,6 +11,7 @@
     <result column="approving_practitioner_id" jdbcType="BIGINT" property="approvingPractitionerId" />
     <result column="approving_status" jdbcType="BIGINT" property="approvingStatus" />
     <result column="reject_note" jdbcType="VARCHAR" property="rejectNote" />
+    <result column="interview_assessment" jdbcType="VARCHAR" property="interviewAssessment" />
     <result column="is_active" jdbcType="INTEGER" property="isActive" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
@@ -20,7 +21,8 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, hiring_basic_info_id, approve_step_id, approve_step_name, approving_practitioner_id, 
-    approving_status, reject_note, is_active, created_at, created_by, updated_at, updated_by
+    approving_status, reject_note, is_active, created_at, created_by, updated_at, updated_by,
+    interview_assessment
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -38,12 +40,12 @@
     <!--@mbg.generated-->
     insert into ag_acl_practitioner_hiring_approve_records (hiring_basic_info_id, approve_step_id, 
       approve_step_name, approving_practitioner_id, 
-      approving_status, reject_note, is_active, 
+      approving_status, reject_note, interview_assessment, is_active,
       created_at, created_by, updated_at, 
       updated_by)
     values (#{hiringBasicInfoId,jdbcType=BIGINT}, #{approveStepId,jdbcType=VARCHAR}, 
       #{approveStepName,jdbcType=VARCHAR}, #{approvingPractitionerId,jdbcType=BIGINT}, 
-      #{approvingStatus,jdbcType=BIGINT}, #{rejectNote,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, 
+      #{approvingStatus,jdbcType=BIGINT}, #{rejectNote,jdbcType=VARCHAR}, #{interviewAssessment,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER},
       #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
       #{updatedBy,jdbcType=BIGINT})
   </insert>