转正前端

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/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/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()));
 
 
         //远程更新部门 若该员工的修改状态为离职则关闭其账号 其余关联关系保持不变