Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/controller/RecruitDemandController.java

@@ -3,6 +3,7 @@ package com.zjugis.business.flow.recruit.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.flow.recruit.controller.vo.*;
 import com.zjugis.business.flow.recruit.service.RecruitDemandService;
+import com.zjugis.business.flow.recruit.service.RecruitDetailService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.workflow.model.BaseController;
@@ -33,6 +34,9 @@ public class RecruitDemandController extends BaseController {
     @Resource
     private RecruitDemandService recruitDemandService;
 
+    @Resource
+    private RecruitDetailService recruitDetailService;
+
     /**
      * 招聘需求表单生成
      */
@@ -73,10 +77,10 @@ public class RecruitDemandController extends BaseController {
     }
 
     /**
-     * 更新招聘需求
+     * 更新招聘需求-工作流专用
      */
     @PostMapping("/update")
-    @Operation(summary = "更新招聘需求")
+    @Operation(summary = "更新招聘需求-工作流")
     public String updateRecruit(@Valid @RequestBody RecruitReqVO updateReqVO) {
         recruitDemandService.updateRecruit(updateReqVO);
         return success(true);
@@ -92,4 +96,16 @@ public class RecruitDemandController extends BaseController {
         recruitDemandService.deleteRecruit(id);
         return success(true);
     }
+
+    /**
+     * 更新招聘需求-后台专用
+     */
+    @PostMapping("/updateADM")
+    @Operation(summary = "更新招聘需求-后台")
+    public CommonResult<String> updateADM(@Valid @RequestBody RecruitPageReqVO vo) {
+        recruitDetailService.updateADM(vo);
+        return CommonResult.success("更新成功");
+    }
+
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/service/RecruitDemandService.java

@@ -47,4 +47,6 @@ public interface RecruitDemandService {
     PageRecruitVO getPage(RecruitPageVO pageReqVO);
 
     RecruitPageReqVO detail(String id);
+
+
 }

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/service/RecruitDetailService.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.flow.recruit.service;
 
+import com.zjugis.business.flow.recruit.controller.vo.RecruitPageReqVO;
 import com.zjugis.business.flow.recruit.entity.RecruitDetailDO;
 
 import java.util.List;
@@ -7,4 +8,6 @@ import java.util.List;
 public interface RecruitDetailService {
 
     List<RecruitDetailDO> getDetailListById(String id);
+
+    void updateADM(RecruitPageReqVO vo);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/service/impl/RecruitDemandServiceImpl.java

@@ -179,6 +179,8 @@ public class RecruitDemandServiceImpl implements RecruitDemandService {
     }
 
 
+
+
     private Map<String, Object> createMap(String flowInstanceId, RecruitDO entity, String userId) {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", entity);

zjugis-business/src/main/java/com/zjugis/business/flow/recruit/service/impl/RecruitDetailServiceImpl.java

@@ -1,5 +1,7 @@
 package com.zjugis.business.flow.recruit.service.impl;
 
+import com.zjugis.business.converter.recruit.RecruitConvert;
+import com.zjugis.business.flow.recruit.controller.vo.RecruitPageReqVO;
 import com.zjugis.business.flow.recruit.dao.RecruitDetailDAO;
 import com.zjugis.business.flow.recruit.entity.RecruitDetailDO;
 import com.zjugis.business.flow.recruit.service.RecruitDetailService;
@@ -9,6 +11,9 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 
+import static com.zjugis.business.enums.ErrorCodeConstants.RECRUIT_DEMAND_NOT_EXISTS;
+import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
+
 /**
  * @author jzh
  * @since 2024/2/27 10:26
@@ -22,4 +27,13 @@ public class RecruitDetailServiceImpl implements RecruitDetailService {
     public List<RecruitDetailDO> getDetailListById(String id) {
         return recruitDetailDAO.selectList(new LambdaQueryWrapperX<RecruitDetailDO>().eq(RecruitDetailDO::getRecruitId, id));
     }
+
+    @Override
+    public void updateADM(RecruitPageReqVO vo) {
+        if (recruitDetailDAO.selectById(vo.getId()) == null) {
+            throw exception(RECRUIT_DEMAND_NOT_EXISTS);
+        }
+        RecruitDetailDO detailDO = RecruitConvert.INSTANCE.convert(vo);
+        recruitDetailDAO.updateById(detailDO);
+    }
 }

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

@@ -9,6 +9,5 @@ import lombok.Data;
 @Data
 public class StaffDictDTO {
     private String value;  //对应的真实值
-    private String text;  //显示值
     private String userId;
 }

zjugis-business/src/main/java/com/zjugis/business/mybatis/handler/MybatisFieldHandler.java

@@ -2,6 +2,7 @@ package com.zjugis.business.mybatis.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import com.zjugis.framework.web.core.util.WebFrameworkUtils;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.context.annotation.Primary;
@@ -48,6 +49,30 @@ public class MybatisFieldHandler implements MetaObjectHandler {
                 baseEntity.setLatestModifyWorker(userId);
             }
         }
+
+        if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseNotLogicEntity) {
+            BaseNotLogicEntity baseEntity = (BaseNotLogicEntity) metaObject.getOriginalObject();
+
+            LocalDateTime current = LocalDateTime.now();
+
+            if (Objects.isNull(baseEntity.getCreateTime())) {
+                baseEntity.setCreateTime(current);
+            }
+
+            if (Objects.isNull(baseEntity.getLatestModifyTime())) {
+                baseEntity.setLatestModifyTime(current);
+            }
+
+            String userId = WebFrameworkUtils.getLoginUserId();
+
+            if (Objects.nonNull(userId) && Objects.isNull(baseEntity.getCreateWorker())) {
+                baseEntity.setCreateWorker(userId);
+            }
+
+            if (Objects.nonNull(userId) && Objects.isNull(baseEntity.getLatestModifyWorker())) {
+                baseEntity.setLatestModifyWorker(userId);
+            }
+        }
     }
 
     @Override

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

@@ -33,11 +33,11 @@ styles=[ '/flow/css/formCommon.css' ]>
                             </div>-->
 
                            <div class="z-form-control">
-                                <div class="z-comp-inputsearch" name="createReqVO$nickname"  data='${resign!}'>
+                                <div class="z-comp-inputsearch" name="createReqVO$nickname"  data='${resign!}' >
                                     <div class="z-inputselect-bar">
-                                        <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}"><i></i>
                                         <input type="text" placeholder="文本搜索" value="${formEntity.nickname!}"><i></i>
                                     </div>
+                                    <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}"><i></i>
                                 </div>
                             </div>
                     </td>
@@ -132,7 +132,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                                 <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>
+                                        <span></span><i></i>
                                     </div>
                                 </div>
                             </div>
@@ -285,7 +285,7 @@ styles=[ '/flow/css/formCommon.css' ]>
                                 <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>
+                                        <span></span><i></i>
                                     </div>
                                 </div>
                             </div>

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

@@ -1,11 +1,11 @@
 (function () {
     window.onload = function (ex) {
-        bindEvents();
+
         initDept();//所有部门列表查询
         initCompany();//公司列表查询
         initUser();//员工列表查询
         backPerson();//离职员工重新入职直接返回已有数据
-
+        bindEvents();
     }
 
 
@@ -31,8 +31,6 @@
     }
 
 
-
-
     function initUser() {
         z.ui.ajax({
             type: "get",
@@ -69,7 +67,6 @@
   * istransfer 工作流js传递到业务的参数 是否转件
   * */
     function saveForm(all, istransfer) {
-        debugger
         var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
         if (postData === false) {
             all({success: false});
@@ -118,7 +115,7 @@
                 var userId = null;
                 // 遍历 data 列表
                 $.each(data, function (index, item) {
-                    if (item.text === value) {
+                    if (item.value === value) {
                         userId = item.userId;
                         return false; // 结束循环
                     }
@@ -127,7 +124,8 @@
                 //根据用户id 获取用户的详情 并赋值到前端
                 selectStaffResign(userId, function (staff) {
 
-                    z.ui.input("[name='createReqVO$userId']").setValue(staff.userId);
+                    $("[name='createReqVO$userId']").val(staff.userId);
+                    z.ui.inputsearch("[name='createReqVO$nickname']").setValue(staff.nickname);
                     z.ui.input("[name='createReqVO$cardid']").setValue(staff.cardid);
                     z.ui.input("[name='createReqVO$mobilePhone']").setValue(staff.mobilePhone);
                     z.ui.select("[name='createReqVO$sex']").setValue(staff.sex + "");
@@ -139,7 +137,7 @@
                     z.ui.input("[name='createReqVO$hkszd']").setValue(staff.hkszd);
                     z.ui.input("[name='createReqVO$xjzdz']").setValue(staff.xjzdz);
                     z.ui.select("[name='createReqVO$drzw']").setValue(staff.drzw + "");
-                    z.ui.select("[name='createReqVO$state']").setValue(staff.state + "");
+                    // z.ui.select("[name='createReqVO$state']").setValue(staff.state + "");
                     z.ui.select("[name='createReqVO$sfytd']").setValue(staff.sfytd + "");
                     z.ui.laydate("[name='createReqVO$cjgzsj']").setValue(moment(staff.cjgzsj).format('YYYY-MM-DD'));
                     z.ui.laydate("[name='createReqVO$htqdsj']").setValue(moment(staff.htqdsj).format('YYYY-MM-DD'));
@@ -158,16 +156,16 @@
                     z.ui.select("[name='createReqVO$jjlxrgx']").setValue(staff.jjlxrgx + "");
 
                     z.ui.selecttree("[name='qdgs']").setValue(staff.qdgsid)
-                    z.ui.input("[name='createReqVO$qdgsid']").setValue(staff.qdgsid);
-                    z.ui.input("[name='createReqVO$qdgs']").setValue(staff.qdgs);
+                    $("[name='createReqVO$qdgsid']").val(staff.qdgsid);
+                    $("[name='createReqVO$qdgs']").val(staff.qdgs);
 
                     z.ui.selecttree("[name='deptName']").setValue(staff.deptId)
-                    z.ui.input("[name='createReqVO$deptName']").setValue(staff.deptName);
-                    z.ui.input("[name='createReqVO$deptId']").setValue(staff.deptId);
+                    $("[name='createReqVO$deptName']").val(staff.deptName);
+                    $("[name='createReqVO$deptId']").val(staff.deptId);
 
                     z.ui.selecttree("[name='zdr']").setValue(staff.zdr)
-                    z.ui.input("[name='createReqVO$zdr']").setValue(staff.zdr);
-                    z.ui.input("[name='createReqVO$zdrmc']").setValue(staff.zdrmc);
+                    $("[name='createReqVO$zdr']").val(staff.zdr);
+                    $("[name='createReqVO$zdrmc']").val(staff.zdrmc);
                 });
             }
         });

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

@@ -165,8 +165,8 @@ public class RecordsServiceImpl implements RecordsService {
             if (ex == null) {
                 throw exception(STAFF_NOT_EXISTS);
             }
-            BeanUtil.copyProperties(staffRecordSDO, ex);
-            recordsMapper.updateById(ex);
+            staffRecordSDO.setId(ex.getId());
+            recordsMapper.updateById(staffRecordSDO);
         } else {
             //生成员工工号
             staffRecordSDO.setLoginName(generateNum());
@@ -188,10 +188,10 @@ public class RecordsServiceImpl implements RecordsService {
 
     @Override
     public List<StaffStateDTO> getResignStaffList() {
-        List<StaffStateDTO>res=new ArrayList<>();
+        List<StaffStateDTO> res = new ArrayList<>();
         List<StaffRecordSDO> staff = recordsMapper.selectList(new LambdaQueryWrapperX<StaffRecordSDO>().eq(StaffRecordSDO::getState, 4));
-        if(CollectionUtil.isNotEmpty(staff)){
-          res=  RecordsConvert.INSTANCE.convertList(staff);
+        if (CollectionUtil.isNotEmpty(staff)) {
+            res = RecordsConvert.INSTANCE.convertList(staff);
         }
         return res;
     }