注册商户

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -115,7 +115,7 @@ public class StaffController {
     @ApiOperation(value = "新建员工", notes = "新建员工")
     @PostMapping({"insert_feign_staff"})
     public ResponseResultVO<?> insertFeignStaff(@RequestBody StaffVO staffVO) {
-        return staffService.insert(staffVO);
+        return staffService.insertFeignStaff(staffVO);
     }
 
     /**

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

@@ -66,6 +66,27 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
+     * @desc : 获取编码/单号
+     * @author : 周兴
+     * @date : 2024/3/1 11:41
+     */
+    public Map<String, Object> getUniqueNoteCode(String docName, Integer cpId, Boolean codeFlag) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("docName", docName);
+        // 公司Id
+//        StaffEntity staff = authUtils.getStaff();
+        param.put("cpId", cpId);
+        Map<String, Object> map = null;
+        // 获取系统基础数据
+        if (codeFlag) {
+            map = commonMapper.getUniqueCode(param);
+        } else {
+            map = commonMapper.getUniqueNote(param);
+        }
+        return map;
+    }
+
+    /**
      * @desc : 登录后获取信息
      * @author : 周兴
      * @date : 2024/3/4 11:41

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

@@ -72,7 +72,7 @@ public class OrgService extends BaseService<Org> {
         // 获取编码和主键UuId
         organization.setDisplayNo(displayNo);
         organization.setOrgId(codeMap.get("outId").toString());
-//        organization.setOrgCode(codeMap.get("outNote").toString());
+        organization.setOrgCode(codeMap.get("outNote").toString());
 
         //查询 本次要加的 部门的 父级下 最大的DisplayNo  然后加1  就是现在要加的DisplayNo
         Map<String, Object> param = new HashMap<>();
@@ -105,29 +105,16 @@ public class OrgService extends BaseService<Org> {
         // 转化实体
         Org organization = orgConvert.convertToPo(orgVO);
         // 获取显示顺序
-//        Integer displayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORG);
-        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.ORG.getName(), true);
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(
+                Constant.docNameConstant.ORG.getName(),orgVO.getCpId(), true);
         // 获取编码和主键UuId
         organization.setDisplayNo(0);
         organization.setOrgId(codeMap.get("outId").toString());
-//        organization.setOrgCode(codeMap.get("outNote").toString());
-
-        //查询 本次要加的 部门的 父级下 最大的DisplayNo  然后加1  就是现在要加的DisplayNo
-        Map<String, Object> param = new HashMap<>();
-        param.put("otherCond", "parent_id = #{parentID} ::uuid");
-        organization.setDisplayNo(commonService.getMaxDisplayNo(Constant.DisplayNoTable.ORG ,param));
-        if (organization.getParentId() != null) {
-            //插入TOPid
-            organization.setTopId(organization.getParentId());
-        }
-
-
+        organization.setOrgCode(codeMap.get("outNote").toString());
         // 插入组织部门数据
         super.insert(organization);
         //执行函数
-        orgMapper.resetLevelOrg(new Org().setTopId(organization.getParentId()).setCpId(organization.getCpId()));
-        return ResponseResultUtil.success();
-        //        return result == 1 ? ResponseResultUtil.success(organization) :
-//                ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
+        // orgMapper.resetLevelOrg(new Org().setTopId(organization.getParentId()).setCpId(organization.getCpId()));
+        return ResponseResultUtil.success(organization);
     }
 }

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

@@ -100,14 +100,43 @@ public class StaffService extends BaseService<Staff> {
         staffQuery.setCpId(staff.getCpId());
         staffQuery.setStaffPhone(staff.getStaffPhone());
         List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
-        if (staffResponses!=null && staffResponses.size() > 0){
+        if (staffResponses != null && staffResponses.size() > 0) {
             return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);
         }
         // 获取编码和主键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);
+        super.insert(staff);
+        return ResponseResultUtil.success(staff);
+    }
+
+    /**
+     * @desc : 保存方法
+     * @author : 姜永辉
+     * @date : 2023/1/9 10:49
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> insertFeignStaff(StaffVO staffVO) {
+        // 转化实体
+        Staff staff = staffConvert.convertToPo(staffVO);
+        // 校验同一个公司的电话不能重复
+        StaffQuery staffQuery = new StaffQuery();
+        staffQuery.setCpId(staff.getCpId());
+        staffQuery.setStaffPhone(staff.getStaffPhone());
+        List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
+        if (staffResponses != null && staffResponses.size() > 0) {
+            return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);
+        }
+        // 获取编码和主键UuId
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(
+                Constant.docNameConstant.STAFF.getName(), staff.getCpId(), true);
+        staff.setStaffId(codeMap.get("outId").toString());
+        staff.setStaffCode(codeMap.get("outNote").toString());
+        super.insert(staff);
+        return ResponseResultUtil.success(staff);
     }
 
     /**
@@ -115,7 +144,7 @@ public class StaffService extends BaseService<Staff> {
      * @author : 姜永辉
      * @date : 2023/1/9 10:49
      */
-    @Transactional( rollbackFor = {Exception.class} )
+    @Transactional(rollbackFor = {Exception.class})
     public ResponseResultVO<?> insertRequestStaff(StaffVO staffVO) {
         // 转化实体
         Staff staff = staffConvert.convertToPo(staffVO);
@@ -124,7 +153,7 @@ public class StaffService extends BaseService<Staff> {
         staffQuery.setCpId(staff.getCpId());
         staffQuery.setStaffPhone(staff.getStaffPhone());
         List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
-        if (staffResponses!=null && staffResponses.size() > 0){
+        if (staffResponses != null && staffResponses.size() > 0) {
             return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);
         }
         // 获取编码和主键UuId
@@ -132,7 +161,7 @@ public class StaffService extends BaseService<Staff> {
         staff.setStaffId(codeMap.get("outId").toString());
         staff.setStaffCode(codeMap.get("outNote").toString());
         // 更新 被邀人员的cpid
-        if (staff.getWxUserId()!=null){
+        if (staff.getWxUserId() != null) {
             // 更新 被邀请人员的微信用户的cpid 加入公司
             Map<String, Object> collectQuery = new HashMap<>();
             collectQuery.put("cpId", staff.getCpId());
@@ -140,7 +169,8 @@ public class StaffService extends BaseService<Staff> {
             companyFeign.updateWxUserCompany(collectQuery);
         }
         // 插入员工
-        return super.insert(staff);
+        super.insert(staff);
+        return ResponseResultUtil.success(staff);
     }
 
     /**