Merge remote-tracking branch 'origin/master'

client/src/api/oa/staffRecords/index.ts

@@ -14,3 +14,7 @@ export const getRecordsPage = (params) => {
 export const editRecordsDetail = (params) => {
   return request.post({ url: '/adm/staff-records/update', data: params })
 }
+//生成员工工号
+export const generateStaffNum = () => {
+  return request.post({ url: '/adm/staff-records/generateNum' })
+}

client/src/views/OaSystem/personnelManagement/ygdaPage/index.ts

@@ -50,7 +50,18 @@ export const formConfigList = [
       },
       {
         name: 'drzw',
-        title: '在岗职位'
+        title: '在岗职位',
+        type: 'select',
+        options: [
+          {
+            value: '1',
+            label: 'JAVA工程师'
+          },
+          {
+            value: '2',
+            label: '前端工程师'
+          }
+        ]
       },
       {
         name: 'nation',
@@ -58,7 +69,8 @@ export const formConfigList = [
       },
       {
         name: 'loginName',
-        title: '员工工号'
+        title: '员工工号',
+        type: 'button'
       },
       {
         name: 'deptName',
@@ -195,9 +207,14 @@ export const formConfigList = [
       },
       {
         name: 'htdqs',
-        title: '合同时间',
+        title: '合同到期时间',
         type: 'time'
       }
+      // {
+      //   name: 'htdqs',
+      //   title: '合同时间',
+      //   type: 'timerange'
+      // }
     ]
   },
   {

client/src/views/OaSystem/personnelManagement/ygdaPage/staffDetail.vue

@@ -2,7 +2,7 @@
 defineOptions({ name: 'StaffDetail' })
 
 import { useQuery, useMutation } from '@tanstack/vue-query'
-import { getRecordsDetail, editRecordsDetail } from '@/api/oa/staffRecords'
+import { getRecordsDetail, editRecordsDetail, generateStaffNum } from '@/api/oa/staffRecords'
 import { formConfigList } from './index'
 import { ElRow, FormInstance } from 'element-plus'
 import TechCertificate from './TechCertificate.vue'
@@ -47,6 +47,22 @@ const { mutate: addUserMutate } = useMutation({
   }
 })
 
+/**生成工号 */
+const { mutate: generateStaffNumber } = useMutation({
+  mutationFn: async () => {
+    return await generateStaffNum()
+  },
+  onSuccess(res) {
+    formData.value['loginName'] = res
+  },
+  onError() {
+    ElMessage({
+      message: '工号生成失败！',
+      type: 'error'
+    })
+  }
+})
+
 /**表单保存 */
 const submitForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return
@@ -114,6 +130,16 @@ const isEdit = computed(() => {
                     v-model="formData[child?.name]"
                     placeholder=""
                   />
+                  <div v-if="child?.type === 'button'" class="generate-num">
+                    <el-input v-model="formData[child?.name]" placeholder="" />
+                    <ElButton
+                      v-if="isEdit"
+                      type="primary"
+                      style="width: 70px; height: 30px; margin-left: 10px"
+                      @click="generateStaffNumber()"
+                      >生成工号</ElButton
+                    >
+                  </div>
                 </el-form-item>
               </li>
               <li></li>
@@ -254,4 +280,9 @@ const isEdit = computed(() => {
     }
   }
 }
+
+.generate-num {
+  display: flex;
+  width: 100%;
+}
 </style>

zjugis-business/src/main/java/com/zjugis/business/flow/jobTransfer/event/JobTransferEvent.java

@@ -19,6 +19,7 @@ import com.zjugis.module.adm.api.staff.dto.StaffStateDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -88,6 +89,7 @@ public class JobTransferEvent extends BaseController {
      * @param triggerFinishActivityInstance 触发归档的结束活动实例
      * @return
      */
+    @Transactional
     @PostMapping("/flowArchingEvent")
     public String flowArchingEvent(@ParamModel Map flowInstance, @ParamModel Map triggerFinishActivityInstance) {
         try {
@@ -97,13 +99,13 @@ public class JobTransferEvent extends BaseController {
                 entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDateTime.now());
                 jobTransferDAO.updateById(entity);
-                //归档事件入库 修改员工的部门
+                //归档事件入库 修改员工的部门和岗位
                 StaffDeptPostDTO dto = new StaffDeptPostDTO();
                 dto.setUserId(entity.getUserId());
                 dto.setDeptName(entity.getDeptTransferName());
                 dto.setDeptId(entity.getDeptTransferId());
                 dto.setPostName(entity.getTransferPost());
-                staffApi.updateDeptPost(dto);
+                staffApi.updateDeptPost(dto).getCheckedData();
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");

zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/controller/OfficialSealOuterController.java

@@ -38,8 +38,8 @@ public class OfficialSealOuterController extends BaseController{
      * @throws Exception
      */
     @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
-    @GetMapping("/apply")
-    public String apply(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
+    @GetMapping("/index")
+    public String index(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
         Map<String, Object> map = officialSealUseService.getFormParams(flowInstanceId, userId);
         return resultPage(map);
     }

zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/controller/OfficialSeaUseController.java → zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/controller/OfficialSealUseController.java

@@ -24,7 +24,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/officialSealUse")
 @Validated
-public class OfficialSeaUseController extends BaseController{
+public class OfficialSealUseController extends BaseController{
 
     @Resource
     private OfficialSealUseService officialSealUseService;
@@ -39,8 +39,8 @@ public class OfficialSeaUseController extends BaseController{
      * @throws Exception
      */
     @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
-    @GetMapping("/apply")
-    public String apply(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
+    @GetMapping("/index")
+    public String index(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
         Map<String, Object> map = officialSealUseService.getFormParams(flowInstanceId, userId);
         return resultPage(map);
     }

zjugis-business/src/main/java/com/zjugis/business/flow/regular/controller/vo/RegularPageReqVO.java

@@ -77,7 +77,7 @@ public class RegularPageReqVO extends PageParam {
     /**
      * 填写时间
      */
-    private LocalDateTime ttsj;
+    private LocalDateTime txsj;
 
     /**
      * 指导人ID
@@ -88,4 +88,15 @@ public class RegularPageReqVO extends PageParam {
      * 指导人名称
      */
     private String zdrmc;
+
+    /**
+     * 指导人部门
+     */
+    private String zdrDeptName;
+    private String zdrDeptId;
+
+    /**
+     * 指导人岗位
+     */
+    private String zdrPost;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/regular/entity/RegularDO.java

@@ -81,7 +81,7 @@ public class RegularDO extends BaseEntity {
     /**
      * 填写时间
      */
-    private LocalDateTime ttsj;
+    private LocalDateTime txsj;
 
     /**
      * 指导人ID
@@ -93,6 +93,17 @@ public class RegularDO extends BaseEntity {
      */
     private String zdrmc;
 
+    /**
+     * 指导人部门
+     */
+    private String zdrDeptName;
+    private String zdrDeptId;
+
+    /**
+     * 指导人岗位
+     */
+    private String zdrPost;
+
     /**
      * 员工工号
      */

zjugis-business/src/main/resources/templates/OfficialSealUse/apply.ftl

@@ -1,157 +0,0 @@
-<@w.workFlow javascripts=['/OfficialSealUse/js/index.js','/js/moment.js','/flow/js/formCommon.js']>
-  <div class="z-position form-boss ow-tabs" name="createReqVO">
-    <div class="z-form-row" style="display: none;">
-      <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
-      <input type="text" value="${formEntity.id!}" name="createReqVO$id">
-    </div>
-    <ul class="ow-tab-nav oa_tabBox">
-      <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
-      <#if WORKFLOW.OPINION! !="">
-        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
-      </#if>
-    </ul>
-    <div class="ow-tab-scroll">
-      <div class="ow-tab-content" name="jbxx">
-      <div class="form-title" style="margin-top: 0px;">
-        <div class="form-icon">
-          <img src="/imgs/titleIcon.png" alt="">
-          <span>基本信息</span>
-        </div>
-        <div class="form-btn">
-        </div>
-      </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="form-item">
-                  <div class="z-comp-input" name="createReqVO$userNickname">
-                    <input type="text" value="${formEntity.userNickname!}">
-                  </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$deptName">
-                    <input type="text" value="${formEntity.deptName!}">
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">申请时间：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                    <input type="text" value="${(formEntity.createTime?date)!}">
-                  </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$officialSealApplyNo">
-                    <input type="text" value="${formEntity.officialSealApplyNo!}">
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">申请事由：</div>
-            </td>
-            <td colspan="3">
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="contract$officialSealApplyReason">
-                    <input type="text" value="${formEntity.officialSealApplyReason!}">
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">用章类型：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="form-item">
-                    <div class="z-comp-select" name="contract$officialSealUseType"
-                         data='${sealTypeList!}' value="${formEntity.officialSealUseType!}">
-                      <div class="z-inputselect-bar">
-                        <span> ${officialSealUseType!} </span><i></i>
-                      </div>
-                    </div>
-                  </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-select" name="contract$secondType"
-                       data='${sealNameList!}' value="${formEntity.officialSealName!}">
-                    <div class="z-inputselect-bar">
-                      <span> ${officialSealName!} </span><i></i>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
-      </div>
-    </div>
-    <div class="ow-tab-content" name="yj">
-      <#if WORKFLOW.OPINION! !="">
-        <div class="form-title">
-          <div class="form-icon">
-            <img src="/imgs/titleIcon.png" alt="">
-            <span>审批意见</span>
-          </div>
-          <div class="form-btn">
-          </div>
-        </div>
-        <div class="qjsjxx-box">
-          <div class="z-form-wrap" name="opinionsDiv">
-            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
-          </div>
-        </div>
-      </#if>
-    </div>
-  </div>
-  <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
-  <script language="javascript">
-  ;
-  (function() {})();
-  </script>
-  <style type="text/css">
-    .qjsjxx-box .form-table-info tr:nth-child(1){
-      height: 63px;
-    }
-  </style>
-</@w.workFlow>

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

@@ -0,0 +1,153 @@
+<@w.workFlow javascripts=['/OfficialSealUse/js/index.js','/js/moment.js','/flow/js/formCommon.js']
+styles=[ '/flow/css/formCommon.css' ]>
+    <div class="z-position form-boss" name="createReqVO">
+        <div class="z-form-row" style="display: none;">
+            <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+            <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+        </div>
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content" name="jbxx">
+                <div class="form-title" style="margin-top: 0px;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>基本信息</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </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="form-item">
+                                        <div class="z-comp-input  z-readonly" name="createReqVO$userNickname">
+                                            <input type="text" value="${formEntity.userNickname!}">
+                                        </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  z-readonly" name="createReqVO$deptName">
+                                            <input type="text" value="${formEntity.deptName!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">申请时间：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                                            <input type="text" value="${(formEntity.createTime?date)!}">
+                                        </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  z-readonly" name="createReqVO$officialSealApplyNo">
+                                            <input type="text" value="${formEntity.officialSealApplyNo!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">申请事由：</div>
+                            </td>
+                            <td colspan="3">
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$officialSealApplyReason">
+                                            <input type="text" value="${formEntity.officialSealApplyReason!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">用章类型：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="form-item">
+                                            <div class="z-comp-select" name="createReqVO$officialSealUseType"
+                                                 data='${sealTypeList!}' value="${formEntity.officialSealUseType!}">
+                                                <div class="z-inputselect-bar">
+                                                    <span> ${officialSealUseType!} </span><i></i>
+                                                </div>
+                                            </div>
+                                        </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-select" name="createReqVO$secondType"
+                                             data='${sealNameList!}' value="${formEntity.officialSealName!}">
+                                            <div class="z-inputselect-bar">
+                                                <span> ${officialSealName!} </span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="ow-tab-content" name="yj">
+            <#if WORKFLOW.OPINION! !="">
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>审批意见</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <div class="z-form-wrap" name="opinionsDiv">
+                        <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                    </div>
+                </div>
+            </#if>
+        </div>
+    </div>
+    <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
+    <script language="javascript">
+        ;
+        (function () {
+        })();
+    </script>
+    <style type="text/css">
+        .qjsjxx-box .form-table-info tr:nth-child(1) {
+            height: 63px;
+        }
+    </style>
+</@w.workFlow>

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

@@ -10,14 +10,19 @@
     }
 
     function submit(all, istransfer) {
-        var postData = z.ui.form.getFormFields("[name=flow-form]", { validatorRequired: istransfer });
+        var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
+        console.log(postData)
         if (postData === false) {
             all({ success: false });
             return;
         }
+        console.log(JSON.stringify(postData.createReqVO))
         z.ui.ajax({
-            url: z.ui.comm.getEntranceUrl("/officialSealUse/update"),
-            data: z.ui.form.childStringify(postData),
+            type: "post",
+            url: "/officialSealUse/update",
+            data: JSON.stringify(postData.createReqVO),
+
+            contentType: "application/json",
             success: function () {
                 all({ success: true });
             },

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

@@ -0,0 +1,202 @@
+<@w.workFlow javascripts=['/RegularStaff/js/index.js','/js/moment.js','/flow/js/formCommon.js']
+styles=[ '/flow/css/formCommon.css' ]>
+    <div class="z-position form-boss" name="createReqVO">
+        <div class="z-form-row" style="display: none;">
+            <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+            <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+        </div>
+        <div class="form-title" style="margin-top: 0;">
+            <div class="form-icon">
+                <img src="/imgs/titleIcon.png" alt="">
+                <span>基本信息</span>
+            </div>
+            <div class="form-btn">
+            </div>
+        </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="form-item">
+                                <div class="z-comp-input" name="createReqVO$nickname">
+                                    <label>
+                                        <input type="text" value="${formEntity.nickname!}">
+                                    </label>
+                                </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-select z-readonly" name="createReqVO$post"
+                                     data='${post_type!}' value="${formEntity.post!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
+
+                </tr>
+
+
+                <tr>
+                    <td class="th">
+                        <div class="form-label">部门：</div>
+                    </td>
+                    <td>
+                        <div class="form-group">
+                            <div class="z-comp-selecttree z-readonly" 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>
+
+
+                    <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$sysj">
+                                    <input type="number" value="${formEntity.sysj!}">
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
+
+                </tr>
+
+                <tr>
+
+                    <td class="th">
+                        <div class="form-label">入职时间：</div>
+                    </td>
+                    <td>
+                        <div class="form-group">
+                            <div class="form-item">
+                                <div class="z-comp-date z-readonly" name="createReqVO$rgssj">
+                                    <input type="text" value="${(formEntity.rgssj?date)!}">
+                                </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-date" name="createReqVO$zzsj">
+                                    <input type="text" value="${(formEntity.zzsj?date)!}">
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
+                </tr>
+
+
+                <tr>
+
+                    <td class="th">
+                        <div class="form-label">填写时间：</div>
+                    </td>
+                    <td>
+                        <div class="form-group">
+                            <div class="form-item">
+                                <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                                    <input type="text" value="${(formEntity.createTime?date)!}">
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
+
+                    <td class="th">
+                        <div class="form-label">指导人姓名：</div>
+                    </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>
+                        </div>
+                    </td>
+
+                </tr>
+
+
+                <tr>
+
+
+
+                    <td class="th">
+                        <div class="form-label">指导人所属部门：</div>
+                    </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>
+                        </div>
+                    </td>
+
+
+                    <td class="th">
+                        <div class="form-label">指导人岗位：</div>
+                    </td>
+                    <td>
+                        <div class="form-group">
+                            <div class="form-item">
+                                <div class="z-comp-select" name="createReqVO$zdrPost"
+                                     data='${post_type!}' value="${formEntity.zdrPost!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+
+
+            </table>
+        </div>
+    </div>
+    <script language="javascript">
+        ;
+        (function () {
+        })();
+    </script>
+    <style type="text/css">
+    </style>
+</@w.workFlow>

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

@@ -0,0 +1,72 @@
+(function () {
+    window.onload = function (ex) {
+        initDept();//所有部门列表查询
+        bindEvents();
+    }
+
+
+    //注册业务保存事件
+    function bindEvents() {
+        z.workflow.saveBtn.addListener("onSaveClick", saveForm);
+    }
+
+
+    /**
+     * 部门列表查询
+     */
+    function initDept() {
+        z.ui.ajax({
+            type: "get",
+            url: "/common/dept-tree",
+            data: {},
+            success: function (res) {
+                if (res && res.length > 0) {
+                    selecttree("[name='deptTransferName']", res, clickDeptTransferName)
+                }
+            },
+            error: function () {
+            }
+        })
+    }
+
+    /*
+  * all 工作流js传递到业务的参数 success执行的方法
+  * istransfer 工作流js传递到业务的参数 是否转件
+  * */
+    function saveForm(all, istransfer) {
+        var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
+        if (postData === false) return;
+
+        //将string类型的时间转换成时间戳
+        for (let key of Object.keys(postData)) {
+            let mealName = postData[key];
+            mealName.dgsj = Date.parse(mealName.dgsj + "");
+            postData.createReqVO = mealName;
+        }
+
+        z.ui.ajax({
+            type: "post",
+            url: "/transfer/update",
+            data: JSON.stringify(postData.createReqVO),
+            contentType: "application/json",
+            success: function (res) {
+                if (res && !(res.code === 0)) {
+                    z.ui.alertWarning(res.msg);
+
+                }
+            },
+
+            error: function () {
+            }
+        })
+    }
+
+
+    //调任部门
+    function clickDeptTransferName(even, treeId, treeNode) {
+        $("[name='createReqVO$deptTransferName']").val(treeNode.name);
+        $("[name='createReqVO$deptId']").val(treeNode.id);
+    }
+
+}());
+

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

@@ -125,12 +125,10 @@ public class RecordsServiceImpl implements RecordsService {
     @Override
     @Transactional
     public String updateStaff(RecordsRespVO vo) {
-        validExists(vo.getId());
+        validExistsByUserId(vo.getUserId());
 
         StaffRecordSDO staffRecordSDO = RecordsConvert.INSTANCE.convertDetail(vo);
-        staffRecordSDO.setUpdateTime(LocalDateTime.now());
-        staffRecordSDO.setUpdater(WebFrameworkUtils.getLoginUserId());
-        recordsMapper.update(staffRecordSDO, new LambdaQueryWrapperX<StaffRecordSDO>().eq(StaffRecordSDO::getId, vo.getId()));
+        recordsMapper.update(staffRecordSDO, new LambdaQueryWrapperX<StaffRecordSDO>().eq(StaffRecordSDO::getUserId, vo.getUserId()));
 
 
         //远程更新部门 若该员工的修改状态为离职则关闭其账号 其余关联关系保持不变