员工工号在归档后生成

zjugis-business/src/main/java/com/zjugis/business/constants/DictConstants.java

@@ -89,4 +89,8 @@ public class DictConstants {
      * 紧急联系人关系
      */
     public static final String contact_type="contact_type";
+    /**
+     * 民族
+     */
+    public static final String nation_type="nation_type";
 }

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

@@ -171,6 +171,7 @@ public class StaffServiceImpl implements StaffService {
         res.add(DictConstants.xl_type);
         res.add(DictConstants.td_type);
         res.add(DictConstants.contact_type);
+        res.add(DictConstants.nation_type);
         return res;
     }
 

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

@@ -15,7 +15,9 @@ styles=[ '/flow/css/formCommon.css' ]>
         </div>
         <div class="jbxx-box jbxx-box-flex">
             <table class="jbxx-table-info">
+
                 <tr>
+
                     <td class="th">
                         <div class="form-label">员工名称：</div>
                     </td>
@@ -29,14 +31,30 @@ styles=[ '/flow/css/formCommon.css' ]>
                         </div>
                     </td>
 
+<#--                    <td class="th">-->
+<#--                        <div class="form-label">员工工号：</div>-->
+<#--                    </td>-->
+<#--                    <td>-->
+<#--                        <div class="form-group">-->
+<#--                            <div class="form-item btns-form-box">-->
+<#--                                <div class="z-comp-input z-readonly" name="createReqVO$loginName">-->
+<#--                                    <input type="text" value="${formEntity.loginName!}">-->
+<#--                                    <div id="generateSerial" style="width: 50px; " name="generateSerial">-->
+<#--                                        <div class="btn btn-sm btn-primary">生成</div>-->
+<#--                                    </div>-->
+<#--                                </div>-->
+<#--                            </div>-->
+<#--                        </div>-->
+<#--                    </td>-->
+
                     <td class="th">
-                        <div class="form-label">性别：</div>
+                        <div class="form-label">状态：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$sex" data='${sex_type!}'
-                                     value="${formEntity.sex!}">
+                                <div class="z-comp-select" name="createReqVO$state" data='${staff_state_type!}'
+                                     value="${formEntity.state!}">
                                     <div class="z-inputselect-bar">
                                         <span></span><i></i>
                                     </div>
@@ -57,19 +75,21 @@ styles=[ '/flow/css/formCommon.css' ]>
                             </div>
                         </div>
                     </td>
-                </tr>
 
 
                 <tr>
 
+
+
+
                     <td class="th">
-                        <div class="form-label">状态：</div>
+                        <div class="form-label">性别：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$state" data='${staff_state_type!}'
-                                     value="${formEntity.state!}">
+                                <div class="z-comp-select" name="createReqVO$sex" data='${sex_type!}'
+                                     value="${formEntity.sex!}">
                                     <div class="z-inputselect-bar">
                                         <span></span><i></i>
                                     </div>
@@ -80,45 +100,49 @@ styles=[ '/flow/css/formCommon.css' ]>
 
 
                     <td class="th">
-                        <div class="form-label">在职岗位：</div>
+                        <div class="form-label">民族：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$drzw">
-                                    <input type="text" value="${formEntity.drzw!}">
+                                <div class="z-comp-select" name="createReqVO$nation"
+                                     data='${nation_type!}' value="${formEntity.nation!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </td>
 
-
                     <td class="th">
-                        <div class="form-label">民族：</div>
+                        <div class="form-label">出生日期：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$nation">
-                                    <input type="text" value="${formEntity.nation!}">
+                                <div class="z-comp-date" name="createReqVO$birthday">
+                                    <input type="text" value="${(formEntity.birthday?date)!}">
                                 </div>
                             </div>
                         </div>
                     </td>
                 </tr>
 
-
                 <tr>
+
+
+
                     <td class="th">
-                        <div class="form-label">员工工号：</div>
+                        <div class="form-label">婚姻状况：</div>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="form-item btns-form-box">
-                                <div class="z-comp-input z-readonly" name="createReqVO$loginName">
-                                    <input type="text" value="${formEntity.loginName!}">
-                                    <div id="generateSerial" style="width: 50px; " name="generateSerial">
-                                        <div class="btn btn-sm btn-primary">生成</div>
+                            <div class="form-item">
+                                <div class="z-comp-select" name="createReqVO$hyzk"
+                                     data='${hy_type!}' value="${formEntity.hyzk!}">
+                                    <div class="z-inputselect-bar">
+                                        <span>${formEntity.hyzk!}</span><i></i>
                                     </div>
                                 </div>
                             </div>
@@ -127,126 +151,129 @@ styles=[ '/flow/css/formCommon.css' ]>
 
 
                     <td class="th">
-                        <div class="form-label">所属部门：</div>
+                        <div class="form-label">户口性质：</div>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="z-comp-selecttree" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptName!}</span><i></i>
+                            <div class="form-item">
+                                <div class="z-comp-select" name="createReqVO$hkxz"
+                                     data='${hk_type!}' value="${formEntity.hkxz!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </td>
 
-
                     <td class="th">
-                        <div class="form-label">签订公司：</div>
+                        <div class="form-label">政治面貌：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$qdgs">
-                                    <input type="text" value="${formEntity.qdgs!}">
+                                <div class="z-comp-select" name="createReqVO$zzmm"
+                                     data='${polity_type!}' value="${formEntity.zzmm!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </td>
-                </tr>
 
+                </tr>
 
                 <tr>
+
                     <td class="th">
-                        <div class="form-label">出生日期：</div>
+                        <div class="form-label">户口所在地：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-date" name="createReqVO$birthday">
-                                    <input type="text" value="${(formEntity.birthday?date)!}">
+                                <div class="z-comp-input" name="createReqVO$hkszd">
+                                    <input type="text" value="${formEntity.hkszd!}">
                                 </div>
                             </div>
                         </div>
                     </td>
 
-
                     <td class="th">
-                        <div class="form-label">婚姻状况：</div>
+                        <div class="form-label">现居住地址：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$hyzk" data='${hy_type!}'
-                                     value="${formEntity.hyzk!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
+                                <div class="z-comp-input" name="createReqVO$xjzdz">
+                                    <input type="text" value="${formEntity.xjzdz!}">
                                 </div>
                             </div>
                         </div>
                     </td>
 
 
+                </tr>
+
+                <tr>
+
                     <td class="th">
-                        <div class="form-label">户口性质：</div>
+                        <div class="form-label">签订公司：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$hkxz"
-                                     data='${hk_type!}' value="${formEntity.hkxz!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
+                                <div class="z-comp-input" name="createReqVO$qdgs">
+                                    <input type="text" value="${formEntity.qdgs!}">
                                 </div>
                             </div>
                         </div>
                     </td>
-                </tr>
-
 
-                <tr>
                     <td class="th">
-                        <div class="form-label">政治面貌：</div>
+                        <div class="form-label">所属部门：</div>
                     </td>
                     <td>
                         <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$zzmm"
-                                     data='${polity_type!}' value="${formEntity.zzmm!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
+                            <div class="z-comp-selecttree" name="deptName">
+                                <input type="hidden" name="createReqVO$deptName" 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>
 
+                </tr>
+
+
+                <tr>
 
                     <td class="th">
-                        <div class="form-label">现居住地址：</div>
+                        <div class="form-label">在职岗位：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$xjzdz">
-                                    <input type="text" value="${formEntity.xjzdz!}">
+                                <div class="z-comp-input" name="createReqVO$drzw">
+                                    <input type="text" value="${formEntity.drzw!}">
                                 </div>
                             </div>
                         </div>
                     </td>
 
-
                     <td class="th">
-                        <div class="form-label">户口所在地：</div>
+                        <div class="form-label">是否已调档</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$hkszd">
-                                    <input type="text" value="${formEntity.hkszd!}">
+                                <div class="z-comp-select" name="createReqVO$sfytd"
+                                     data='${td_type!}' value="${formEntity.sfytd!}">
+                                    <div class="z-inputselect-bar">
+                                        <span>${formEntity.sfytd!}</span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -255,79 +282,93 @@ styles=[ '/flow/css/formCommon.css' ]>
 
 
                 <tr>
+
                     <td class="th">
-                        <div class="form-label">入职时间：</div>
+                        <div class="form-label">参加工作时间：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-date" name="createReqVO$rgssj">
-                                    <input type="text" value="${(formEntity.rgssj?date)!}">
+                                <div class="z-comp-date" name="createReqVO$cjgzsj">
+                                    <input type="text" value="${(formEntity.cjgzsj?date)!}">
                                 </div>
                             </div>
                         </div>
                     </td>
 
-
                     <td class="th">
-                        <div class="form-label">参加工作时间：</div>
+                        <div class="form-label">合同签订时间：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-date" name="createReqVO$cjgzsj">
-                                    <input type="text" value="${(formEntity.cjgzsj?date)!}">
+                                <div class="z-comp-date" name="createReqVO$htqdsj">
+                                    <input type="text" value="${(formEntity.htqdsj?date)!}">
                                 </div>
                             </div>
                         </div>
                     </td>
 
-
                     <td class="th">
-                        <div class="form-label">初始司领：</div>
+                        <div class="form-label">合同到期时间：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$cssl">
-                                    <input type="number" value="${formEntity.cssl!}">
+                                <div class="z-comp-date" name="createReqVO$htdqs">
+                                    <input type="text" value="${(formEntity.htdqs?date)!}">
                                 </div>
                             </div>
                         </div>
                     </td>
+
+
                 </tr>
 
 
                 <tr>
                     <td class="th">
-                        <div class="form-label">年假：</div>
+                        <div class="form-label">入职时间：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$nj">
-                                    <input type="number" value="${formEntity.nj!}">
+                                <div class="z-comp-date" name="createReqVO$rgssj">
+                                    <input type="text" value="${(formEntity.rgssj?date)!}">
                                 </div>
                             </div>
                         </div>
                     </td>
 
+
                     <td class="th">
-                        <div class="form-label">是否已调档</div>
+                        <div class="form-label">初始司龄：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$sfytd"
-                                     data='${td_type!}' value="${formEntity.sfytd!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
+                                <div class="z-comp-input" name="createReqVO$cssl">
+                                    <input type="number" value="${formEntity.cssl!}">
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
+                    <td class="th">
+                        <div class="form-label">年假：</div>
+                    </td>
+                    <td>
+                        <div class="form-group">
+                            <div class="form-item">
+                                <div class="z-comp-input" name="createReqVO$nj">
+                                    <input type="number" value="${formEntity.nj!}">
                                 </div>
                             </div>
                         </div>
                     </td>
                 </tr>
+
+
             </table>
         </div>
 
@@ -376,7 +417,9 @@ styles=[ '/flow/css/formCommon.css' ]>
         </div>
         <div class="jbxx-box jbxx-box-flex">
             <table class="jbxx-table-info">
+
                 <tr>
+
                     <td class="th">
                         <div class="form-label">毕业院校：</div>
                     </td>
@@ -389,6 +432,8 @@ styles=[ '/flow/css/formCommon.css' ]>
                             </div>
                         </div>
                     </td>
+
+
                     <td class="th">
                         <div class="form-label">毕业时间：</div>
                     </td>
@@ -401,36 +446,42 @@ styles=[ '/flow/css/formCommon.css' ]>
                             </div>
                         </div>
                     </td>
+
+                </tr>
+
+                <tr>
+
                     <td class="th">
-                        <div class="form-label">最高学历：</div>
+                        <div class="form-label">专业：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$zgxl"
-                                     data='${xl_type!}' value="${formEntity.zgxl!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
+                                <div class="z-comp-input" name="createReqVO$major">
+                                    <input type="text" value="${formEntity.major!}">
                                 </div>
                             </div>
                         </div>
                     </td>
-                </tr>
-                <tr>
+
                     <td class="th">
-                        <div class="form-label">专业：</div>
+                        <div class="form-label">最高学历：</div>
                     </td>
                     <td>
                         <div class="form-group">
                             <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$major">
-                                    <input type="text" value="${formEntity.major!}">
+                                <div class="z-comp-select" name="createReqVO$zgxl"
+                                     data='${xl_type!}' value="${formEntity.zgxl!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </td>
+
                 </tr>
+
             </table>
         </div>
         <div class="form-title">

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

@@ -1,7 +1,7 @@
 (function () {
     window.onload = function (ex) {
         initDept();//所有部门列表查询
-        generateLoginName();//生成工号按钮
+        // generateLoginName();//生成工号按钮
         backPerson();//离职员工重新入职直接返回已有数据
         bindEvents();
     }
@@ -43,6 +43,8 @@
             mealName.bysj = Date.parse(mealName.bysj + "");
             mealName.cjgzsj = Date.parse(mealName.cjgzsj + "");
             mealName.rgssj = Date.parse(mealName.rgssj + "");
+            mealName.htqdsj = Date.parse(mealName.htqdsj + "");
+            mealName.htdqs = Date.parse(mealName.htdqs + "");
             postData.createReqVO = mealName;
         }
 
@@ -67,30 +69,30 @@
     /**
      * 生成工号
      */
-    function generateLoginName() {
-        $("#generateSerial").on("click", function () {
-            var loginName = $("[name='createReqVO$loginName'] input").val();
-            if (loginName != null && loginName !== "") {
-                z.ui.alertWarning("该员工已有工号，请勿重复生成！");
-                return;
-            }
-            z.ui.ajax({
-                type: "post",
-                contentType: "application/json",
-                url: "/staff/generateNum",
-                data: {},
-                success: function (res) {
-                    if (res && res.code === 0) {
-                        $("[name='createReqVO$loginName'] input").val(res.data)
-                    } else {
-                        z.ui.alertWarning(res.msg);
-                    }
-                },
-                error: function () {
-                }
-            })
-        })
-    }
+    // function generateLoginName() {
+    //     $("#generateSerial").on("click", function () {
+    //         var loginName = $("[name='createReqVO$loginName'] input").val();
+    //         if (loginName != null && loginName !== "") {
+    //             z.ui.alertWarning("该员工已有工号，请勿重复生成！");
+    //             return;
+    //         }
+    //         z.ui.ajax({
+    //             type: "post",
+    //             contentType: "application/json",
+    //             url: "/staff/generateNum",
+    //             data: {},
+    //             success: function (res) {
+    //                 if (res && res.code === 0) {
+    //                     $("[name='createReqVO$loginName'] input").val(res.data)
+    //                 } else {
+    //                     z.ui.alertWarning(res.msg);
+    //                 }
+    //             },
+    //             error: function () {
+    //             }
+    //         })
+    //     })
+    // }
 
     /**
      * 离职员工回归

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -167,6 +167,8 @@ public class RecordsServiceImpl implements RecordsService {
             BeanUtil.copyProperties(staffRecordSDO, ex);
             recordsMapper.updateById(ex);
         } else {
+            //生成员工工号
+            staffRecordSDO.setLoginName(generateNum());
             staffRecordSDO.setUserId(UUID.randomUUID().toString());
             staffRecordSDO.setDeleted(false);
             recordsMapper.insert(staffRecordSDO);