Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/StaffRecordsController.java

@@ -58,9 +58,6 @@ public class StaffRecordsController {
 
     /**
      * 档案编辑
-     *
-     * @param vo
-     * @return
      */
     @PostMapping("/update")
     @Operation(summary = "档案编辑")
@@ -68,11 +65,14 @@ public class StaffRecordsController {
         return success(recordsService.updateStaff(vo));
     }
 
-//    @GetMapping("/detail")
-//    @Operation(summary = "档案编辑")
-//    public CommonResult<RecordsBaseVO> getStuffDetail(@Valid RecordsPageReqVO reqVO) {
-//        return success(RecordsConvert.INSTANCE.convertDetail(recordsService.getRecordDetail(userId)));
-//    }
 
+    /**
+     * 生成工号
+     */
+    @PostMapping("/generateNum")
+    @Operation(summary = "生成工号")
+    public CommonResult<String> generateNum() {
+        return success(recordsService.generateNum());
+    }
 
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/mysql/staff/RecordsMapper.java

@@ -34,4 +34,5 @@ public interface RecordsMapper extends BaseMapperX<StaffRecordSDO> {
     Page<StaffRecordSDO> getRecordsPage(Page<StaffRecordSDO> page, @Param("params") RecordsPageReqVO reqVO);
 
 
+    String selectLoginNum();
 }

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

@@ -28,4 +28,6 @@ public interface RecordsService {
      * 员工档案更新
      */
     String updateStaff(RecordsRespVO vo);
+
+    String generateNum();
 }

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

@@ -1,9 +1,7 @@
 package com.zjugis.module.adm.service.staff;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.web.core.util.WebFrameworkUtils;
 import com.zjugis.module.adm.controller.admin.staff.vo.records.RecordsPageReqVO;
@@ -48,4 +46,11 @@ public class RecordsServiceImpl implements RecordsService {
         recordsMapper.update(staffRecordSDO, new LambdaQueryWrapperX<StaffRecordSDO>().eq(StaffRecordSDO::getId, vo.getId()));
         return "更新成功";
     }
+
+    @Override
+    public String generateNum() {
+        String staff = recordsMapper.selectLoginNum();
+        int intValue = Integer.parseInt(staff) + 1;
+        return String.format("%04d", intValue);
+    }
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/resources/mapper/staff/RecordsMapper.xml

@@ -42,6 +42,18 @@
             </if>
         </where>
         order by t1.UPDATE_TIME desc
+    </select>
+
 
+    <select id="selectLoginNum" resultType="String">
+        SELECT n.LOGIN_NAME
+        FROM (
+                 SELECT a.LOGIN_NAME
+                 FROM ADM_STAFF_RECORDS a
+                 WHERE a.LOGIN_NAME IS NOT NULL
+                   AND REGEXP_LIKE ( a.LOGIN_NAME, '^[0-9]+$' )
+                 ORDER BY a.LOGIN_NAME DESC
+             ) n
+        WHERE ROWNUM = 1
     </select>
 </mapper>