核心企业确权审批

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -114,11 +114,15 @@ public class  FlowableController extends BaseController
             zcFinanceInfService.updateById(zcFinanceInf);
         //核心企业确权审批
         }else if("1000000007".equals(menuId)){
+            //融信主键
             ZcFinanceInf zcFinanceInf = zcFinanceInfService.getById(id);
+            //融信创建(0:供应商申请, 1:核心企业开立, 2:供应商开立)
             String type = zcFinanceInf.getZfiCreateType();
             if("0".equals(type)){
+                //调用融资企业签收审批
                 approvalService.addSignApproval(CommonUtil.entityToMap(zcFinanceInf));
             }else if("2".equals(type)){
+                //已生效
                 zcFinanceInf.setZfiStatus("02");
                 zcFinanceInfService.updateById(zcFinanceInf);
             }
@@ -274,11 +278,15 @@ public class  FlowableController extends BaseController
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //审批拒绝
             if("delete".equals(state)){
+                //融信主键
                 zcFinanceInf.setZfiId(id);
+                //核心企业融资状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
                 zcFinanceInf.setZfiCoreStatus("02");
             }else if("recall".equals(state)){
+                //融信主键
                 zcFinanceInf.setZfiId(id);
-                zcFinanceInf.setZfiCoreStatus("03");
+                //核心企业融资状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+                zcFinanceInf.setZfiCoreStatus("02");
             }
             zcFinanceInfService.updateById(zcFinanceInf);
             //核心企业确权审批
@@ -286,11 +294,13 @@ public class  FlowableController extends BaseController
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //审批拒绝
             if("delete".equals(state)){
+                //融信主键
                 zcFinanceInf.setZfiId(id);
-                zcFinanceInf.setZfiStatus("02");
+                //融信状态改为已失效
+                zcFinanceInf.setZfiStatus("03");
             }else if("recall".equals(state)){
                 zcFinanceInf.setZfiId(id);
-                zcFinanceInf.setZfiStatus("02");
+                zcFinanceInf.setZfiStatus("03");
             }
             zcFinanceInfService.updateById(zcFinanceInf);
         }

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -114,12 +114,15 @@ public class ApprovalServiceImpl implements ApprovalService {
         //根据企业id获取用户id
         LambdaQueryWrapper<SysUserCompanyRel> userQuery = new LambdaQueryWrapper<>();
         userQuery.eq(SysUserCompanyRel::getSucrCompanyId,zfiCoreId);
+        //是否经办人
         userQuery.eq(SysUserCompanyRel::getSucrHandler,"1");
         List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQuery);
+        //获取userId
         String userId = String.valueOf(userList.get(0).getSucrUserId());
+        //获取userName
         SysUser sysUser = iSysUserService.getById(userId);
         String userName = sysUser.getNickName();
-        //查询当前操作员
+
         flowParam.put("menuId", "1000000007");
         flowParam.put("companyId", zfiCoreId);
         //双主键
@@ -130,23 +133,25 @@ public class ApprovalServiceImpl implements ApprovalService {
         JSONObject jsonObj = new JSONObject(map);
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+        //成功
         if("200".equals(resMap.get("code"))){
         }else
-            //未开启流程实例
-            if("300".equals(resMap.get("code")) || "350".equals(resMap.get("code"))){
-                ZcFinanceInf zcFinanceInf = zcFinanceInfService.getById(CommonUtil.objToString(map.get("zfiId")));
-                String type = zcFinanceInf.getZfiCreateType();
-                if("0".equals(type)){
-                    addSignApproval(map);
-                }else if("2".equals(type)){
-                    zcFinanceInf.setZfiStatus("02");
-                    zcFinanceInfService.updateById(zcFinanceInf);
-                }
-            }else if ("450".equals(resMap.get("code"))) {
-                throw new Exception("未配置审批流程");
-            }else if (!"200".equals(resMap.get("code"))) {
-                throw new Exception(resMap.get("message").toString());
+        //未开启流程实例
+        if("300".equals(resMap.get("code")) || "350".equals(resMap.get("code"))){
+            ZcFinanceInf zcFinanceInf = zcFinanceInfService.getById(CommonUtil.objToString(map.get("zfiId")));
+            String type = zcFinanceInf.getZfiCreateType();
+            if("0".equals(type)){
+                approvalService.addSignApproval(map);
+            }else if("2".equals(type)){
+                zcFinanceInf.setZfiStatus("02");
+                zcFinanceInfService.updateById(zcFinanceInf);
             }
+            //未配置审批流程
+        }else if ("450".equals(resMap.get("code"))) {
+            throw new Exception("未配置审批流程");
+        }else if (!"200".equals(resMap.get("code"))) {
+            throw new Exception(resMap.get("message").toString());
+        }
     }
 
 

sc-service/src/main/java/com/huyi/service/conmany/controller/OwnCompanyManageController.java

@@ -3,6 +3,7 @@ package com.huyi.service.conmany.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.SysCompany;
+import com.huyi.service.base.entity.SysUser;
 import com.huyi.service.base.entity.SysUserCompanyRel;
 import com.huyi.service.base.service.ISysCompanyService;
 import com.huyi.service.base.service.ISysUserCompanyRelService;
@@ -209,6 +210,13 @@ public class OwnCompanyManageController extends BaseController
         sysCompany.setCreateTime(DateUtils.getNowDate());
         //新增
         iSysCompanyService.createSysCompany(sysCompany);
+        //TODO 新增用户
+        //创建主键
+        String id = IdUtils.fastSimpleUUID();
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(Long.valueOf(id));
+        sysUser.setUserName(scyPhone);
+        sysUser.setNickName(scyName);
         return R.ok();
     }
 

sc-service/src/main/java/com/huyi/service/credit/controller/CreditApproveController.java

@@ -3,8 +3,12 @@ package com.huyi.service.credit.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.SysCompany;
+import com.huyi.service.base.entity.SysUser;
+import com.huyi.service.base.entity.SysUserCompanyRel;
 import com.huyi.service.base.entity.ZcFinanceInf;
 import com.huyi.service.base.service.ISysCompanyService;
+import com.huyi.service.base.service.ISysUserCompanyRelService;
+import com.huyi.service.base.service.ISysUserService;
 import com.huyi.service.base.service.IZcFinanceInfService;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.util.FlowableService;
@@ -49,6 +53,69 @@ public class CreditApproveController extends BaseController {
     private ISysCompanyService iSysCompanyService;
     // 开始流程
     public final static String STRART_FLOW = "flow/strartFlow";
+    @Autowired
+    private ISysUserCompanyRelService iSysUserCompanyRelService;
+    @Autowired
+    private ISysUserService iSysUserService;
+
+
+    /**
+     * 核心企业开立融信提交审批
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize(hasPermi = "service:financeApply:coreApproval")
+    @PutMapping("/coreApproval")
+    public R coreApproval(@RequestBody Map<String,Object> map ) throws Exception {
+        Map<String, Object> flowParam = new HashMap<String, Object>();
+        //核心企业Id
+        String zfiCoreId = 	CommonUtil.objToString(map.get("zfiCoreId"));
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysCompany::getScyId,zfiCoreId);
+        List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
+        //查询当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        flowParam.put("menuId", "1000000000");
+        flowParam.put("companyId", user.getSysUser().getCompanyId());
+        //双主键
+        flowParam.put("businessKey", CommonUtil.objToString(map.get("zfiId")));
+        //员工编号
+        flowParam.put("sessionUserId", user.getSysUser().getUserId());
+        if (!CommonUtil.isEmpty(list.get(0).getScyName())){
+            flowParam.put("name",list.get(0).getScyName() + "在" + DateUtils.getDate() + "发起融信开立审批");
+        }
+        JSONObject jsonObj = new JSONObject(map);
+        flowParam.put("paras", jsonObj.toString());
+        Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+        if("200".equals(resMap.get("code"))){
+            ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
+            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            zcFinanceInf.setZfiCoreStatus("00");
+            zcFinanceInfService.updateById(zcFinanceInf);
+        }else
+            //未开启流程实例
+            if("300".equals(resMap.get("code")) || "350".equals(resMap.get("code"))){
+                //修改状态为通过
+                ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
+                //融信Id
+                zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+                //核心企业融资状态(审批通过)
+                zcFinanceInf.setZfiCoreStatus("01");
+                //审核通过(待签收)
+                zcFinanceInf.setZfiStatus("01");
+                zcFinanceInf.setUpdateBy(String.valueOf(user.getSysUser().getUserId()));
+                zcFinanceInf.setUpdateTime(DateUtils.getNowDate());
+                zcFinanceInfService.updateById(zcFinanceInf);
+            }else if ("450".equals(resMap.get("code"))) {
+                throw new Exception("未配置审批流程");
+            }else if (!"200".equals(resMap.get("code"))) {
+                throw new Exception(resMap.get("message").toString());
+            }
+        return R.ok();
+    }
+
+
     /**
      * 融资企业申请融信提交审批
      * @param map
@@ -223,54 +290,56 @@ public class CreditApproveController extends BaseController {
         }
         return AjaxResult.success();
     }
+
+
     /**
-     * 核心企业开立融信提交审批
+     * 核心企业确权审批
      * @param map
      * @return
      * @throws Exception
      */
-    @PreAuthorize(hasPermi = "service:financeApply:coreApproval")
-    @PutMapping("/coreApproval")
-    public R coreApproval(@RequestBody Map<String,Object> map ) throws Exception {
+    @PreAuthorize(hasPermi = "service:financeApply:confirmationApproval")
+    @PutMapping("/confirmationApproval")
+    public R confirmationApproval(@RequestBody Map<String,Object> map ) throws Exception {
         Map<String, Object> flowParam = new HashMap<String, Object>();
         //核心企业Id
         String zfiCoreId = 	CommonUtil.objToString(map.get("zfiCoreId"));
-        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysCompany::getScyId,zfiCoreId);
-        List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
-        //查询当前操作员
-        LoginUser user = tokenService.getLoginUser();
-        flowParam.put("menuId", "1000000000");
-        flowParam.put("companyId", user.getSysUser().getCompanyId());
+        //根据企业id获取用户id
+        LambdaQueryWrapper<SysUserCompanyRel> userQuery = new LambdaQueryWrapper<>();
+        userQuery.eq(SysUserCompanyRel::getSucrCompanyId,zfiCoreId);
+        //是否经办人
+        userQuery.eq(SysUserCompanyRel::getSucrHandler,"1");
+        List<SysUserCompanyRel> userList = iSysUserCompanyRelService.findSysUserCompanyRels(userQuery);
+        //获取userId
+        String userId = String.valueOf(userList.get(0).getSucrUserId());
+        //获取userName
+        SysUser sysUser = iSysUserService.getById(userId);
+        String userName = sysUser.getNickName();
+
+        flowParam.put("menuId", "1000000007");
+        flowParam.put("companyId", zfiCoreId);
         //双主键
         flowParam.put("businessKey", CommonUtil.objToString(map.get("zfiId")));
         //员工编号
-        flowParam.put("sessionUserId", user.getSysUser().getUserId());
-        if (!CommonUtil.isEmpty(list.get(0).getScyName())){
-            flowParam.put("name",list.get(0).getScyName() + "在" + DateUtils.getDate() + "发起融信开立审批");
-        }
+        flowParam.put("sessionUserId", userId);
+        flowParam.put("name", userName + "在" + DateUtils.getDate() + "发起确权审批");
         JSONObject jsonObj = new JSONObject(map);
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+        //成功
         if("200".equals(resMap.get("code"))){
-            ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
-            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
-            zcFinanceInf.setZfiCoreStatus("00");
-            zcFinanceInfService.updateById(zcFinanceInf);
         }else
             //未开启流程实例
             if("300".equals(resMap.get("code")) || "350".equals(resMap.get("code"))){
-                //修改状态为通过
-                ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
-                //融信Id
-                zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
-                //核心企业融资状态(审批通过)
-                zcFinanceInf.setZfiCoreStatus("01");
-                //审核通过(待签收)
-                zcFinanceInf.setZfiStatus("01");
-                zcFinanceInf.setUpdateBy(String.valueOf(user.getSysUser().getUserId()));
-                zcFinanceInf.setUpdateTime(DateUtils.getNowDate());
-                zcFinanceInfService.updateById(zcFinanceInf);
+                ZcFinanceInf zcFinanceInf = zcFinanceInfService.getById(CommonUtil.objToString(map.get("zfiId")));
+                String type = zcFinanceInf.getZfiCreateType();
+                if("0".equals(type)){
+                    approvalService.addSignApproval(map);
+                }else if("2".equals(type)){
+                    zcFinanceInf.setZfiStatus("02");
+                    zcFinanceInfService.updateById(zcFinanceInf);
+                }
+            //未配置审批流程
             }else if ("450".equals(resMap.get("code"))) {
                 throw new Exception("未配置审批流程");
             }else if (!"200".equals(resMap.get("code"))) {
@@ -278,4 +347,6 @@ public class CreditApproveController extends BaseController {
             }
         return R.ok();
     }
+
+
 }

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -6,9 +6,11 @@ import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.credit.service.OwnCreditService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
-import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.domain.R;
-import com.tianhu.common.core.utils.*;
+import com.tianhu.common.core.utils.AmtUtil;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.DateUtils;
+import com.tianhu.common.core.utils.IdUtils;
 import com.tianhu.common.core.web.controller.BaseController;
 import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.log.annotation.Log;
@@ -20,6 +22,7 @@ import com.tianhu.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+
 import java.lang.reflect.InvocationTargetException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -72,6 +75,9 @@ public class OwnCreditController extends BaseController {
     @Autowired
     private IZcBillFileRelService billFileRelService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
 
 
     /**
@@ -963,7 +969,18 @@ public class OwnCreditController extends BaseController {
     }
 
 
-
+    /**
+     * 获取当前操作员
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/getUser")
+    public R getUser()throws Exception {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        return R.ok(companyId);
+    }