增加获取单号/编码的共通方法

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -22,6 +22,20 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Integer getMaxDisplayNo(Map param);
 
     /**
+     * @desc : 获取编码
+     * @author : 周兴
+     * @date : 2024-3-1 15:47
+     */
+    Map<String, Object> getUniqueCode(Map param);
+
+    /**
+     * @desc : 获取单号
+     * @author : 周兴
+     * @date : 2024-3-1 15:47
+     */
+    Map<String, Object> getUniqueNote(Map param);
+
+    /**
      * @desc : 获取数据字典项目
      * @author : 王英杰
      * @date : 2023/1/6 14:15

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -19,6 +19,16 @@
         </if>
     </select>
 
+    <!--获取编码-->
+    <select id="getUniqueCode"  resultType="java.util.Map">
+        select out_id AS "outId",out_code AS "outNote" from dkic_b.f_create_code_id(#{cpId},#{docName});
+    </select>
+
+    <!--获取单号-->
+    <select id="getUniqueNote"  resultType="java.util.Map">
+        select out_id AS "outId",out_note AS "outNote" from dkic_b.f_create_note_id(#{cpId},#{docName});
+    </select>
+
     <resultMap id="BaseResultMap" type="java.util.Map">
         <result column="kindTags" property="kindTags" typeHandler="JsonTypeHandler"/>
     </resultMap>

src/main/java/com/dk/mdm/model/pojo/mst/Staff.java

@@ -40,7 +40,6 @@ public class Staff extends PageInfo<Staff> implements Serializable {
     /**
      * 员工ID
      */
-    @TableId(value = "staff_id", type = IdType.AUTO)
     @ApiModelProperty(value = "员工ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -41,6 +41,26 @@ public class CommonService extends BaseService<Map<String, Object>> {
     private AuthUtils authUtils;
 
     /**
+     * @desc : 获取编码/单号
+     * @author : 周兴
+     * @date : 2024/3/1 11:41
+     */
+    public Map<String, Object> getUniqueNoteCode(String docName,Boolean codeFlag) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("docName",docName);
+        // TODO 公司Id
+        param.put("cpId",1);
+        Map<String, Object> map = null;
+        // 获取系统基础数据
+        if(codeFlag){
+            map = commonMapper.getUniqueCode(param);
+        }else{
+            map = commonMapper.getUniqueNote(param);
+        }
+        return map;
+    }
+
+    /**
      * @desc : 获取数据字典项目
      * @author : 王英杰
      * @date : 2023/1/6 11:41

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -2,6 +2,7 @@ package com.dk.mdm.service.mst;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
@@ -14,12 +15,15 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.mdm.model.response.mst.StaffResponse;
 import com.dk.mdm.model.vo.mst.StaffVO;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -57,6 +61,9 @@ public class StaffService extends BaseService<Staff> {
     @Autowired
     private StaffPurviewService staffPurviewService;
 
+    @Autowired
+    private CommonService commonService;
+
     /**
      * @desc : 条件查询
      * @author : 姜永辉
@@ -79,6 +86,10 @@ public class StaffService extends BaseService<Staff> {
     public ResponseResultVO<?> insert(StaffVO staffVO) {
         // 转化实体
         Staff staff = staffConvert.convertToPo(staffVO);
+        // 获取编码和主键UuId
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.STAFF.getName(), true);
+        staff.setStaffId(codeMap.get("outId").toString());
+        staff.setStaffCode(codeMap.get("outNote").toString());
         return super.insert(staff);
     }