录用审批新增面试官

zjugis-business/src/main/java/com/zjugis/business/flow/interview/controller/vo/InterviewPageVO.java

@@ -264,4 +264,14 @@ public class InterviewPageVO extends PageParam {
      */
     private String zhpj;
 
+    /**
+     * 面试官id
+     */
+    private String msgid;
+
+    /**
+     * 面试官姓名
+     */
+    private String msgxm;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/interview/controller/vo/InterviewVO.java

@@ -266,4 +266,14 @@ public class InterviewVO {
      */
     private String zhpj;
 
+    /**
+     * 面试官id
+     */
+    private String msgid;
+
+    /**
+     * 面试官姓名
+     */
+    private String msgxm;
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/interview/entity/InterviewDO.java

@@ -269,5 +269,20 @@ public class InterviewDO extends BaseEntity {
      */
     private String zhpj;
 
+    /**
+     * 面试官id
+     */
+    private String msgid;
+
+    /**
+     * 面试官姓名
+     */
+    private String msgxm;
+
+
+    /**
+     * 报道邀请是否发送
+     */
+    private String report;
 
 }

zjugis-business/src/main/resources/templates/Interview/index.ftl

@@ -397,6 +397,26 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                 </div>
                 <div class="jbxx-box jbxx-box-flex">
                     <table class="jbxx-table-info">
+
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">面试官：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-selecttree" name="msg">
+                                        <input type="hidden" name="createReqVO$msgid"
+                                               value="${formEntity.msgid!}">
+                                        <input type="hidden" name="createReqVO$msgxm" value="${formEntity.msgid!}">
+                                        <div class="z-inputselect-bar">
+                                            <span>${formEntity.msgxm!}</span><i></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+
                         <tr>
                             <td class="th">
                                 <div class="form-label">业务及技术：</div>
@@ -405,7 +425,8 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 <div class="form-group">
                                     <div class="form-item">
                                         <div class="z-comp-textarea" name="createReqVO$ywjs">
-                                            <textarea placeholder="本专业技术和业务 / 其他专业或IT能力">${formEntity.ywjs!}</textarea>
+                                            <textarea
+                                                    placeholder="本专业技术和业务 / 其他专业或IT能力">${formEntity.ywjs!}</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -421,7 +442,8 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 <div class="form-group">
                                     <div class="form-item">
                                         <div class="z-comp-textarea" name="createReqVO$xmnl">
-                                            <textarea placeholder="承担角色 / 所做项目的类型或大小 / 数据导入工具使用等">${formEntity.xmnl!}</textarea>
+                                            <textarea
+                                                    placeholder="承担角色 / 所做项目的类型或大小 / 数据导入工具使用等">${formEntity.xmnl!}</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -452,7 +474,8 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 <div class="form-group">
                                     <div class="form-item">
                                         <div class="z-comp-textarea" name="createReqVO$zhpj">
-                                            <textarea placeholder="如可以承担何种项目及角色">${formEntity.zhpj!}</textarea>
+                                            <textarea
+                                                    placeholder="如可以承担何种项目及角色">${formEntity.zhpj!}</textarea>
                                         </div>
 
                                     </div>

zjugis-business/src/main/resources/templates/Interview/js/index.js

@@ -1,6 +1,7 @@
 (function () {
     window.onload = function (ex) {
 
+        initStaff();
         initData();
         initDept();//所有部门列表查询
         backPerson();//离职员工重新入职直接返回已有数据
@@ -14,6 +15,23 @@
     }
 
 
+    //面试官查询
+    function initStaff() {
+        z.ui.ajax({
+            type: "get",
+            url: "/common/user-tree",
+            data: {},
+            success: function (res) {
+                if (res && res.length > 0) {
+                    selecttree("[name='msg']", res, clickMSG)
+                }
+            },
+            error: function () {
+            }
+        })
+    }
+
+
     function initData() {
 
         let inps1 = $("[name='createReqVO$syjbyx']")[0].children[0]; //基本试用工资
@@ -86,7 +104,6 @@
         });
 
 
-
     }
 
     //部门列表查询
@@ -162,17 +179,18 @@
                     }
                 });
 
+
                 //根据用户id 获取用户的详情 并赋值到前端
                 selectStaffResign(userId, function (staff) {
-
                     $("[name='createReqVO$loginName']").val(staff.loginName);
                     $("[name='createReqVO$userId']").val(staff.userId);
+                    z.ui.select("[name='createReqVO$ypgw']").setValue(staff.ypgw + "");
                     z.ui.select("[name='createReqVO$sex']").setValue(staff.sex + "");
-                    z.ui.input("[name='createReqVO$sfzh']").setValue(staff.cardid);
+                    z.ui.input("[name='createReqVO$sfzh']").setValue(staff.sfzh);
                     z.ui.selecttree("[name='deptName']").setValue(staff.deptId)
                     $("[name='createReqVO$deptName']").val(staff.deptName);
                     $("[name='createReqVO$deptId']").val(staff.deptId);
-                    z.ui.input("[name='createReqVO$mobile']").setValue(staff.mobilePhone);
+                    z.ui.input("[name='createReqVO$mobile']").setValue(staff.mobile);
 
                 });
             }
@@ -203,9 +221,9 @@
     }
 
 
-    function clickZDR(even, treeId, treeNode) {
-        $("[name='createReqVO$zdr']").val(treeNode.id);
-        $("[name='createReqVO$zdrmc']").val(treeNode.name);
+    function clickMSG(even, treeId, treeNode) {
+        $("[name='createReqVO$msgid']").val(treeNode.id);
+        $("[name='createReqVO$msgxm']").val(treeNode.name);
     }
 
     function clickCompany(even, treeId, treeNode) {

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/api/staff/StaffApiImpl.java

@@ -69,7 +69,13 @@ public class StaffApiImpl implements StaffApi {
 
     @Override
     public CommonResult<StaffRecordsDTO> getStaffResign(String userId) {
-        return success(RecordsConvert.INSTANCE.convertDetailResign(recordsService.getRecordDetail(userId)));
+        RecordsRespVO vo = recordsService.getRecordDetail(userId);
+        StaffRecordsDTO dto=RecordsConvert.INSTANCE.convertDetailResign(vo);
+        dto.setYpgw(vo.getDrzw());
+        dto.setSfzh(vo.getCardid());
+        dto.setMobile(vo.getMobilePhone());
+
+        return success(dto);
     }
 
     @Override
@@ -90,6 +96,6 @@ public class StaffApiImpl implements StaffApi {
 
     @Override
     public CommonResult<String> createStaff(StaffReportDTO dto) {
-        return success( recordsService.report(dto));
+        return success(recordsService.report(dto));
     }
 }