入职办理+转正

zjugis-business/src/main/java/com/zjugis/business/flow/regular/service/impl/RegularServiceImpl.java

@@ -60,21 +60,8 @@ public class RegularServiceImpl implements RegularService {
             if (Objects.isNull(entity)) {
                 entity = new RegularDO();
                 entity.setInstanceId(flowInstanceId);
-                entity.setUserId(userId);
                 entity.setCreateTime(LocalDateTime.now());
                 entity.setFlowStatus(FlowStatusConstants.FLOW_NOT_START);
-                CommonResult<StaffDeptPostDTO> result = staffApi.getUser(userId);
-                StaffDeptPostDTO dto = result.getCheckedData();
-                if (result.isSuccess()) {
-                    entity.setNickname(dto.getNickname());
-                    entity.setDeptId(dto.getDeptId());
-                    entity.setDeptName(dto.getDeptName());
-                    entity.setRgssj(dto.getRgssj());
-                    entity.setDrzw(dto.getPostName());
-                    entity.setZdr(dto.getZdr());
-                    entity.setZdrmc(dto.getZdrmc());
-                    entity.setZdrPost(dto.getZdrPost());
-                }
                 regularDAO.insert(entity);
             }
             return createMap(flowInstanceId, entity, userId);

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

@@ -7,6 +7,7 @@ import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.workflow.WorkFlow;
+import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -98,4 +99,10 @@ public class StaffController extends BaseController {
         return CommonResult.success(staffService.generateNum());
     }
 
+    @GetMapping("/getStaff")
+    @Operation(summary = "根据用户id获取职工详情")
+    public CommonResult<StaffDeptPostDTO> getStaff(@RequestParam("userId") String userId) {
+        return staffService.getStaff(userId);
+    }
+
 }

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

@@ -4,7 +4,9 @@ import com.zjugis.business.flow.staff.controller.dto.StaffPageDTO;
 import com.zjugis.business.flow.staff.controller.vo.StaffPageVO;
 import com.zjugis.business.flow.staff.controller.vo.StaffVO;
 import com.zjugis.business.flow.staff.entity.StaffDO;
+import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
+import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 
 import java.util.Map;
 
@@ -46,4 +48,6 @@ public interface StaffService {
     PageResult<StaffVO> getPage(StaffPageDTO dto);
 
     String generateNum();
+
+    CommonResult<StaffDeptPostDTO> getStaff(String userId);
 }

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

@@ -7,22 +7,19 @@ import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.converter.common.SelectConvert;
 import com.zjugis.business.converter.staff.StaffConvert;
 import com.zjugis.business.flow.staff.controller.dto.StaffPageDTO;
-import com.zjugis.business.flow.staff.controller.vo.StaffPageVO;
 import com.zjugis.business.flow.staff.controller.vo.StaffVO;
 import com.zjugis.business.flow.staff.dao.StaffDAO;
 import com.zjugis.business.flow.staff.entity.StaffDO;
 import com.zjugis.business.flow.staff.service.StaffService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
-import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
-import com.zjugis.framework.workflow.utils.Select;
 import com.zjugis.module.adm.api.staff.StaffApi;
+import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
-import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -124,6 +121,11 @@ public class StaffServiceImpl implements StaffService {
         return staffApi.generateNum().getData();
     }
 
+    @Override
+    public CommonResult<StaffDeptPostDTO> getStaff(String userId) {
+        return staffApi.getUser(userId);
+    }
+
     private PageResult<StaffVO> encapsulatePage(PageResult<StaffDO> page) {
         return StaffConvert.INSTANCE.convertList(page);
     }

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

@@ -23,7 +23,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="z-comp-selectsearch" name="nickname">
+                            <div class="z-comp-selecttree" name="nickname">
                                 <input type="hidden" name="createReqVO$nickname" value="${formEntity.nickname!}">
                                 <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}">
                                 <div class="z-inputselect-bar">
@@ -60,12 +60,9 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="z-comp-selecttree z-readonly" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                            <div class="z-comp-input z-readonly" name="createReqVO$deptName">
+                                <input type="text" value="${formEntity.deptName!}">
                                 <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptName!}</span><i></i>
-                                </div>
                             </div>
                         </div>
                     </td>
@@ -100,6 +97,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                                 </div>
                             </div>
                         </div>
+                        `
                     </td>
 
                     <td class="th">
@@ -139,12 +137,9 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="z-comp-selecttree" name="zdrName">
-                                <input type="hidden" name="createReqVO$zdr" value="${formEntity.zdr!}">
-                                <input type="hidden" name="createReqVO$zdrmc" value="${formEntity.zdrmc!}">
-                                <div class="z-inputselect-bar">
-                                    <span></span><i></i>
-                                </div>
+                            <div class="z-comp-input" name="createReqVO$zdrmc">
+                                <input type="text" value="${formEntity.zdrmc!}">
+                                <input type="hidden" name="createReqVO$zdr">
                             </div>
                         </div>
                     </td>

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

@@ -1,14 +1,8 @@
 (function () {
     window.onload = function (ex) {
 
-        z.ui.selectsearch("[name=selectsearch]").bindEvents({
-            onAfterSelect: function (value, data) {
-                console.log(data)
-                console.log(value)
-            }
-        });
-
         initStaff();//获取所有员工
+        getStaff();
         bindEvents();
     }
 
@@ -23,11 +17,11 @@
     function initStaff() {
         z.ui.ajax({
             type: "get",
-            url: "/staff/page",
-            data: {"state": 1, "status": 90},
+            url: "/common/user-tree",
+            data: {},
             success: function (res) {
                 if (res && res.length > 0) {
-
+                    selecttree("[name='nickname']", res, clickUser)
                 }
             },
             error: function () {
@@ -35,6 +29,7 @@
         })
     }
 
+
     /*
   * all 工作流js传递到业务的参数 success执行的方法
   * istransfer 工作流js传递到业务的参数 是否转件
@@ -73,14 +68,49 @@
         })
     }
 
+
     function clickUser(even, treeId, treeNode) {
         $("[name='createReqVO$nickname']").val(treeNode.name);
         $("[name='createReqVO$userId']").val(treeNode.id);
+        getStaff();
     }
 
-    function clickZDR(even, treeId, treeNode) {
-        $("[name='createReqVO$zdrmc']").val(treeNode.name);
-        $("[name='createReqVO$zdr']").val(treeNode.id);
+
+    function getStaff() {
+        var userId = $("input[name='createReqVO$userId']").val();
+        if (userId) {
+            selectUser(userId, function (userData) {
+                var staff = userData.data;
+                // 在成功获取到用户数据后，将用户名赋值给 createReqVO$nickname
+
+                console.log(staff);
+
+
+                z.ui.input("[name='createReqVO$deptName']").setValue(staff.deptName); //部门
+                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);
+            });
+        }
+    }
+
+
+    function selectUser(userId, callback) {
+        $.ajax({
+            type: "GET",
+            url: "/staff/getStaff",
+            data: {userId: userId}, // 请求参数应该以对象形式传递
+            contentType: "application/json",
+            success: function (res) {
+                // 在这里处理成功获取到的数据，你可以根据需要调用回调函数
+                callback(res);
+            },
+            error: function () {
+
+            }
+        });
     }
 
 }());

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

@@ -217,8 +217,9 @@ styles=[ '/flow/css/formCommon.css' ]>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="z-comp-selecttree" name="createReqVO$qdgs">
+                            <div class="z-comp-selecttree" name="qdgs">
                                 <input type="hidden" name="createReqVO$qdgsid" value="${formEntity.qdgsid!}">
+                                <input type="hidden" name="createReqVO$qdgs" value="${formEntity.qdgs!}">
                                 <div class="z-inputselect-bar">
                                     <span> ${formEntity.qdgs!} </span><i></i>
                                 </div>

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

@@ -54,7 +54,7 @@
             data: {},
             success: function (res) {
                 if (res && res.data.length > 0) {
-                    selecttree("[name='createReqVO$qdgs']", res.data, clickCompany)
+                    selecttree("[name='qdgs']", res.data, clickCompany)
                 }
             },
             error: function () {
@@ -154,6 +154,7 @@
 
     function clickCompany(even, treeId, treeNode) {
         $("[name='createReqVO$qdgsid']").val(treeNode.id);
+        $("[name='createReqVO$qdgs']").val(treeNode.name);
     }
 }());