审批增加用户

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -17,6 +17,7 @@ import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.companyAuth.service.IOwnAuthService;
 import com.tianhu.system.domain.*;
 import com.tianhu.system.service.*;
+import com.tianhu.system.utils.FlowableService;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -110,10 +111,13 @@ public class OwnAuthController extends BaseController {
      * CFCA认证方式(小额打款认证)
      */
     private String AUTHENTICATIONMODE = "5";
+    private FlowableService flowableService;
     /**
      * CFCA证件类型(小额打款认证)
      */
     private String TYPECODE = "0";
+
+
     /**
      * 新增企业认证
      *
@@ -291,9 +295,10 @@ public class OwnAuthController extends BaseController {
             userService.insertUserRole(listUser);
         }
         SysUser listUserTwo = userService.selectUserByUserName(phoneNumber);
+        SysUser listUsers = null;
         //创建其他和管理员
         if(CommonUtil.isNotEmpty(operator)&&CommonUtil.isNotEmpty(number)){
-            SysUser listUsers = userService.selectUserByUserName(number);
+            listUsers = userService.selectUserByUserName(number);
             if(listUsers == null) {
                 SysUser user = new SysUser();
                 user.setUserName(number);
@@ -316,7 +321,7 @@ public class OwnAuthController extends BaseController {
             sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
         }
         //创建用户与企业关系
-        SysUserCompanyRel sysUserCompanyRel =new SysUserCompanyRel();
+        SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
         sysUserCompanyRel.setSucrCompanyId(scyId);
         sysUserCompanyRel.setSucrUserId(listUserTwo.getUserId());
         sysUserCompanyRel.setSucrDeptId(deptId);
@@ -342,7 +347,26 @@ public class OwnAuthController extends BaseController {
         }
         //修改当前用户企业
         sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+
         SysCompany company = sysCompanyService.getById(scyId);
+
+        // 审批增加分组
+        flowableService.addFlowableGroup(scyId, company.getScyName());
+        // 经办人与登录用户是同一手机号
+        if (use.getUserName().equals(phoneNumber)) {
+            flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
+        } else {
+            flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
+            // 经办人不存在
+            if(listUser == null){
+                flowableService.addFlowableUser(String.valueOf(listUser.getUserId()), listUser.getNickName(), scyId);
+            }
+        }
+        // 业务人员不存在
+        if (listUsers == null) {
+            listUsers = userService.selectUserByUserName(number);
+            flowableService.addFlowableUser(String.valueOf(listUsers.getUserId()), listUsers.getNickName(), scyId);
+        }
         return R.ok(company);
     }
 

tianhu-system/src/main/java/com/tianhu/system/controller/SysDeptController.java

@@ -201,7 +201,7 @@ public class SysDeptController extends BaseController
         dept.setAlternateNumber(alternateNumber);
         //TODO 通知审批流
         if(IS_APPROVAL){
-            Map<String, Object> resMap = flowableService.addFlowableGroup(dept);
+            Map<String, Object> resMap = flowableService.addFlowableGroup(dept.getAlternateNumber(), dept.getDeptName());
             if (!"200".equals(resMap.get("code"))) {
                 return AjaxResult.error(CommonUtil.objToString(resMap.get("message")));
             }
@@ -253,7 +253,7 @@ public class SysDeptController extends BaseController
         dept.setUpdateBy(SecurityUtils.getUsername());
         //TODO 通知审批流
         if(IS_APPROVAL){
-            Map<String, Object> resMap = flowableService.addFlowableGroup(dept);
+            Map<String, Object> resMap = flowableService.addFlowableGroup(dept.getAlternateNumber(), dept.getDeptName());
             if (!"200".equals(resMap.get("code"))) {
                 return AjaxResult.error(CommonUtil.objToString(resMap.get("message")));
             }

tianhu-system/src/main/java/com/tianhu/system/utils/FlowableService.java

@@ -36,21 +36,18 @@ public class FlowableService {
 		}
 		return resMap;
 	}
-	
-	
+
 	/**
 	 * 保存用户
-	 * @param staffInf
 	 * @return
 	 */
-//	public Map<String, Object> addFlowableUser(SysStaffInf	staffInf,String deptId) {
-//		Map<String, Object> m = new HashMap<>();
-//		m.put("id", staffInf.getSsId());
-//		m.put("name", staffInf.getSsName());
-//		m.put("companyId",staffInf.getSsCompanyId());
-//		m.put("groupId",deptId);
-//		return apiPost(ADD_USER, m);
-//	}
+	public Map<String, Object> addFlowableUser(String id, String name, String groupId) {
+		Map<String, Object> m = new HashMap<>();
+		m.put("id", id);
+		m.put("name", name);
+		m.put("groupId", groupId);
+		return apiPost(ADD_USER, m);
+	}
 	
 	/**
 	 * 删除用户
@@ -65,11 +62,10 @@ public class FlowableService {
 	 * 新增部门
 	 * @return
 	 */
-	public Map<String, Object> addFlowableGroup(SysDept dept) {
+	public Map<String, Object> addFlowableGroup(String groupId, String groupName) {
 		Map<String, Object> m = new HashMap<>();
-		m.put("groupId", dept.getAlternateNumber());
-		m.put("groupName",dept.getDeptName());
-		m.put("companyId",dept.getCompanyId());
+		m.put("groupId", groupId);
+		m.put("groupName", groupName);
 		return apiPost(ADD_GROUP, m);
 	}