转正页面

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/StaffController.java

@@ -102,7 +102,7 @@ public class StaffController extends BaseController {
     @GetMapping("/getStaff")
     @Operation(summary = "根据用户id获取职工详情")
     public CommonResult<StaffDeptPostDTO> getStaff(@RequestParam("userId") String userId) {
-        return staffService.getStaff(userId);
+        return CommonResult.success(staffService.getStaff(userId));
     }
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/staff/service/StaffService.java

@@ -49,5 +49,5 @@ public interface StaffService {
 
     String generateNum();
 
-    CommonResult<StaffDeptPostDTO> getStaff(String userId);
+    StaffDeptPostDTO getStaff(String userId);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/staff/service/impl/StaffServiceImpl.java

@@ -122,8 +122,18 @@ public class StaffServiceImpl implements StaffService {
     }
 
     @Override
-    public CommonResult<StaffDeptPostDTO> getStaff(String userId) {
-        return staffApi.getUser(userId);
+    public StaffDeptPostDTO getStaff(String userId) {
+        CommonResult<StaffDeptPostDTO> user = staffApi.getUser(userId);
+        StaffDeptPostDTO dto = user.getCheckedData();
+        //查该用户的指导人相关信息
+        if (dto.getZdr() != null) {
+            CommonResult<StaffDeptPostDTO> r = staffApi.getUser(dto.getZdr());
+            StaffDeptPostDTO zdr = r.getCheckedData();
+            dto.setZdrPost(zdr.getPostName());
+            dto.setZdrDeptId(zdr.getDeptId());
+            dto.setZdrDeptName(zdr.getDeptName());
+        }
+        return dto;
     }
 
     private PageResult<StaffVO> encapsulatePage(PageResult<StaffDO> page) {

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

@@ -24,10 +24,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                     <td>
                         <div class="form-group">
                             <div class="z-comp-selecttree" name="nickname">
-                                <input type="hidden" name="createReqVO$nickname" value="${formEntity.nickname!}">
+                                <input type="hidden" name="createReqVO$nickname"
+                                       value="${formEntity.nickname!}">
                                 <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}">
                                 <div class="z-inputselect-bar">
-                                    <span> </span><i></i>
+                                    <span>${formEntity.nickname!}</span><i></i>
                                 </div>
                             </div>
                         </div>
@@ -155,12 +156,10 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="z-comp-selecttree" name="zdrDept">
-                                <input type="hidden" name="createReqVO$zdrDeptName" value="${formEntity.zdrDeptName!}">
-                                <input type="hidden" name="createReqVO$zdrDeptId" value="${formEntity.zdrDeptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span></span><i></i>
-                                </div>
+                            <div class="z-comp-input" name="createReqVO$zdrDeptName">
+                                <input type="text" value="${formEntity.zdrDeptName!}">
+                                <input type="hidden" name="createReqVO$zdrDeptId"
+                                       value="${formEntity.zdrDeptId!}">
                             </div>
                         </div>
                     </td>

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

@@ -44,13 +44,15 @@
         //将string类型的时间转换成时间戳
         for (let key of Object.keys(postData)) {
             let mealName = postData[key];
-            mealName.dgsj = Date.parse(mealName.dgsj + "");
+            mealName.rgssj = Date.parse(mealName.rgssj + "");
+            mealName.zzsj = Date.parse(mealName.zzsj + "");
+            mealName.createTime = Date.parse(mealName.createTime + "");
             postData.createReqVO = mealName;
         }
 
         z.ui.ajax({
             type: "post",
-            url: "/transfer/update",
+            url: "/regular/update",
             data: JSON.stringify(postData.createReqVO),
             contentType: "application/json",
             success: function (res) {
@@ -87,11 +89,14 @@
 
 
                 z.ui.input("[name='createReqVO$deptName']").setValue(staff.deptName); //部门
+                z.ui.input("[name='createReqVO$deptId']").setValue(staff.deptName);//部门id
                 z.ui.select("[name='createReqVO$drzw']").setValue(staff.postName); //岗位
                 z.ui.laydate("[name='createReqVO$rgssj']").setValue(moment(staff.rgssj).format('YYYY-MM-DD HH:mm:ss')); //入职时间
-                // z.ui.input("[name='createReqVO$totalAmount']").setValue(jeSum);
-                // z.ui.input("[name='createReqVO$totalAmount']").setValue(jeSum);
-                // z.ui.input("[name='createReqVO$totalAmount']").setValue(jeSum);
+                z.ui.input("[name='createReqVO$zdrmc']").setValue(staff.zdrmc); //指导人姓名
+                z.ui.input("[name='createReqVO$zdr']").setValue(staff.zdr); //指导人id
+                z.ui.input("[name='createReqVO$zdrDeptName']").setValue(staff.zdrDeptName); //指导人部门
+                z.ui.input("[name='createReqVO$zdrDeptId']").setValue(staff.zdrDeptId); //指导人部门id
+                z.ui.select("[name='createReqVO$zdrPost']").setValue(staff.zdrPost); //指导人岗位
             });
         }
     }

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffDeptPostDTO.java

@@ -34,4 +34,10 @@ public class StaffDeptPostDTO {
      * 指导人岗位
      */
     private String zdrPost;
+
+    /**
+     * 指导人部门
+     */
+    private String zdrDeptId;
+    private String zdrDeptName;
 }