web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java

@@ -100,4 +100,12 @@ public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade {
         }
         return map;
     }
+
+    @Override
+    public SingleResponse<Long> addHumanUserDept(ZcloudDepartmentAddCmd zcloudDepartmentAddCmd) {
+        DepartmentAddCmd addCmd = new DepartmentAddCmd();
+        BeanUtils.copyProperties(zcloudDepartmentAddCmd, addCmd);
+        Long deptId = departmentService.addHumanUserDept(addCmd);
+        return SingleResponse.of(deptId);
+    }
 }

web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java

@@ -5,12 +5,14 @@ import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.SingleResponse;
 import com.zcloud.basic.info.api.UserServiceI;
 import com.zcloud.basic.info.command.convertor.UserCoConvertor;
+import com.zcloud.basic.info.dto.UserAddCmd;
 import com.zcloud.basic.info.dto.clientobject.UserCO;
 import com.zcloud.basic.info.persistence.dataobject.UserDO;
 import com.zcloud.basic.info.persistence.dataobject.UserImgDO;
 import com.zcloud.basic.info.persistence.repository.UserRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade;
+import com.zcloud.gbscommon.zclouduser.request.ZcloudUserAddCmd;
 import com.zcloud.gbscommon.zclouduser.request.ZcloudUserImgQry;
 import com.zcloud.gbscommon.zclouduser.request.ZcloudUserQry;
 import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo;
@@ -97,4 +99,12 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade {
         return MultiResponse.of(zcloudUserImgBase64Cos);
     }
 
+    @Override
+    public SingleResponse addHumanUser(ZcloudUserAddCmd cmd) {
+        UserAddCmd userAddCmd = new UserAddCmd();
+        BeanUtil.copyProperties(cmd, userAddCmd);
+        userServiceI.addHumanUser(userAddCmd);
+        return SingleResponse.buildSuccess();
+    }
+
 }

web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java

@@ -16,6 +16,7 @@ import com.zcloud.basic.info.dto.DepartmentAddCmd;
 import com.zcloud.basic.info.dto.DepartmentTreeQry;
 import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO;
 import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
+import com.zcloud.gbscommon.utils.Tools;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -73,5 +74,27 @@ public class DepartmentAddExe {
         }
         return id;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long executeHumanUserDept(DepartmentAddCmd cmd) {
+        DepartmentE examTypeE = new DepartmentE();
+        BeanUtils.copyProperties(cmd, examTypeE);
+        cmd.setDepartmentId(Tools.get32UUID());
+        Long id = null;
+        try {
+            id = departmentGateway.add(examTypeE);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        if (id ==null) {
+            throw new BizException("保存失败");
+        }
+        if(CollUtil.isNotEmpty(cmd.getDepartmentIdsList())&& CommonFlagEnum.YES.getCode().equals(cmd.getSuperviseFlag())){
+            List<DepartmentSuperviseE> departmentSuperviseEList =examTypeE.initAdd(cmd.getDepartmentIdsList(), id);
+            departmentSuperviseGateway.addbatch(departmentSuperviseEList);
+        }
+        return id;
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java

@@ -635,5 +635,42 @@ public class UserAddExe {
             imgFilesRepository.saveBatch(newImgFiles);
         }
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public boolean executeHumanUser(UserAddCmd cmd) {
+        UserE userE = new UserE();
+        BeanUtils.copyProperties(cmd, userE);
+        userE.setTenantId(cmd.getCorpinfoId());
+        //校验手机号
+        List<Integer> employmentFlagList = Arrays.asList(UserEmploymentFlagEnum.ON.getCode(), UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(), UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
+        List<UserDO> userList = userRepository.getListByPhone(userE.getPhone(), employmentFlagList);
+        if (CollUtil.isNotEmpty(userList)) {
+            List<UserE> userEList = userCoConvertor.convertDOsToEs(userList);
+            userE.checkPhone(userEList);
+        }
+
+        CorpInfoDO corpInfoDO = corpInfoRepository.getById(userE.getCorpinfoId());
+        String corpName = null;
+        UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
+        BeanUtils.copyProperties(userE, userEmploymentLogE);
+        boolean res = false;
+        try {
+            userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType()));
+            userE.resetPassword(corpInfoDO.getType());
+            userE.setDepartmentLeaderFlag(0);
+            res = userGateway.add(userE);
+            if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) {
+                corpName = corpInfoDO.getCorpName();
+            }
+            userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId());
+            userEmploymentLogGateway.add(userEmploymentLogE);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        if (!res) {
+            throw new BizException("保存失败");
+        }
+        return true;
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java

@@ -101,5 +101,10 @@ public class DepartmentServiceImpl implements DepartmentServiceI {
         String name = Tools.getTreeFullName(list,"id", "parentId", "name", deptId);
         return name;
     }
+
+    @Override
+    public Long addHumanUserDept(DepartmentAddCmd cmd) {
+        return departmentAddExe.executeHumanUserDept(cmd);
+    }
 }
 

web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java

@@ -265,5 +265,11 @@ public class UserServiceImpl implements UserServiceI {
     public PageResponse<UserCO> pageByNopermission(UserPageQry qry) {
         return userQueryExe.pageByNopermission(qry);
     }
+
+    @Override
+    public SingleResponse addHumanUser(UserAddCmd cmd) {
+        userAddExe.executeHumanUser(cmd);
+        return SingleResponse.buildSuccess();
+    }
 }
 

web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java

@@ -44,5 +44,7 @@ public interface DepartmentServiceI {
 
 
     Collection<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry);
+
+    Long addHumanUserDept(DepartmentAddCmd cmd);
 }
 

web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java

@@ -102,5 +102,7 @@ public interface UserServiceI {
     UserLoginCO getUserCorpByPhone(UserAppPhoneCmd cmd);
 
     List<UserImgDO> listBase64ByUrl(Map<String, Object> map);
+
+    SingleResponse addHumanUser(UserAddCmd cmd);
 }