入职办理添加指导人

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

@@ -105,6 +105,7 @@ public class StaffServiceImpl implements StaffService {
                 entity.setInstanceId(flowInstanceId);
                 entity.setCreateTime(LocalDateTime.now());
                 entity.setFlowStatus(FlowStatusConstants.FLOW_NOT_START);
+                entity.setState(2);//默认为试用
                 staffDAO.insert(entity);
             }
             return createMap(entity);

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

@@ -384,6 +384,24 @@ styles=[ '/flow/css/formCommon.css' ]>
                 </tr>
 
 
+                <tr>
+                    <td class="th">
+                        <div class="form-label">指导人：</div>
+                    </td>
+                    <td>
+                        <div class="form-group ">
+                            <div class="z-comp-selecttree" name="zdr" style="width: 175px;">
+                                <input type="hidden" name="createReqVO$zdr" value="${formEntity.zdr!}">
+                                <input type="hidden" name="createReqVO$zdrmc" value="${formEntity.zdrmc!}">
+                                <div class="z-inputselect-bar">
+                                    <span>${formEntity.zdrmc!}</span><i></i>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+
+
             </table>
         </div>
 

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

@@ -3,6 +3,7 @@
         initDept();//所有部门列表查询
         // generateLoginName();//生成工号按钮
         backPerson();//离职员工重新入职直接返回已有数据
+        initUser();
         bindEvents();
     }
 
@@ -28,6 +29,22 @@
         })
     }
 
+
+    function initUser() {
+        z.ui.ajax({
+            type: "get",
+            url: "/common/user-tree",
+            data: {},
+            success: function (res) {
+                if (res && res.length > 0) {
+                    selecttree("[name='zdr']", res, clickZDR)
+                }
+            },
+            error: function () {
+            }
+        })
+    }
+
     /*
   * all 工作流js传递到业务的参数 success执行的方法
   * istransfer 工作流js传递到业务的参数 是否转件
@@ -112,5 +129,10 @@
         $("[name='createReqVO$deptId']").val(treeNode.id);
     }
 
+
+    function clickZDR(even, treeId, treeNode) {
+        $("[name='createReqVO$zdr']").val(treeNode.id);
+        $("[name='createReqVO$zdrmc']").val(treeNode.name);
+    }
 }());
 

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/user/AdminUserServiceImpl.java

@@ -550,7 +550,11 @@ public class AdminUserServiceImpl implements AdminUserService {
             userDeptDO.setDeptId(dto.getDeptId());
             userDeptMapper.insert(userDeptDO);
         }
+
+
+        //更新用户表的部门
         user.setDeptId(dto.getDeptId());
+        user.setDeptName(deptService.getDept(dto.getDeptId()).getName());
         userMapper.updateById(user);
     }