Merge remote-tracking branch 'origin/master'

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

@@ -762,11 +762,10 @@ public class  FlowableController extends BaseController
             if("delete".equals(state)){
                 zcFinanceInf.setZfiSupplierStatus("02");
             }
-//            else if("recall".equals(state)){
-//                //撤回
-//                //更改为保存状态
-//                zcFinanceInf.setZfiSupplierStatus("03");
-//            }
+            else if("recall".equals(state)){
+                //撤回
+                zcFinanceInf.setZfiSupplierStatus("02");
+            }
             zcFinanceInfService.update(zcFinanceInf,lambdaQueryWrapper);
             //待办更改为已办
             LambdaQueryWrapper<SysNotice> noticeLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -812,11 +811,10 @@ public class  FlowableController extends BaseController
             if("delete".equals(state)){
                 zcFinanceInf.setZfiSupplierStatus("02");
             }
-//            else if("recall".equals(state)){
-//                //撤回
-//                //更改为保存状态
-//                zcFinanceInf.setZfiSupplierStatus("03");
-//            }
+            else if("recall".equals(state)){
+                //撤回
+                zcFinanceInf.setZfiSupplierStatus("02");
+            }
             zcFinanceInfService.update(zcFinanceInf,lambdaQueryWrapper);
             //待办更改为已办
             LambdaQueryWrapper<SysNotice> noticeLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -858,6 +856,9 @@ public class  FlowableController extends BaseController
             //审批拒绝
             if("delete".equals(state)){
                 zcFinanceInf.setZfiSupplierStatus("02");
+            }else if("recall".equals(state)){
+                //撤回
+                zcFinanceInf.setZfiSupplierStatus("02");
             }
             zcFinanceInfService.update(zcFinanceInf,wrapper);
             //待办更改为已办
@@ -919,6 +920,10 @@ public class  FlowableController extends BaseController
                 //zcFinanceInf.setZfiSupplierStatus("02");
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
                 zcFinanceInf.setZfiStatus("06");
+            }else if("recall".equals(state)){
+                //撤回
+                zcFinanceInf.setZfiPlatformStatus("02");
+                zcFinanceInf.setZfiStatus("06");
             }
             //更新融信状态
             zcFinanceInfService.update(zcFinanceInf,wrapper);

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

@@ -90,8 +90,12 @@ public class OwnCreditController extends BaseController {
     //待办服务类
     @Autowired
     private  ISysNoticeService      sysNoticeService;
-
-
+    //融信文件关联表
+    @Autowired
+    private  IZcFinanceFileRelService  financeFileRelService;
+    //用户公司关系表
+    @Autowired
+    private  ISysUserCompanyRelService userCompanyRelService;
 
 
     /**
@@ -337,6 +341,46 @@ public class OwnCreditController extends BaseController {
         map.put("openBank",openBank);
         //开立方账户
         map.put("openAccount",openAccount);
+        //核心企业经办人
+        String coreHandleName = "";
+        //获取核心企业的经办人
+        LambdaQueryWrapper<SysUserCompanyRel> userCompanyRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userCompanyRelLambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,zfiCoreId);
+        userCompanyRelLambdaQueryWrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
+        List<SysUserCompanyRel>   userCompanyRelList =  userCompanyRelService.findSysUserCompanyRels(userCompanyRelLambdaQueryWrapper);
+        if(userCompanyRelList.size() > 0){
+            //经办人编号
+            String  handleId = CommonUtil.objToString(userCompanyRelList.get(0).getSucrUserId());
+            com.huyi.service.base.entity.SysUser sysUser =     sysUserService.getById(handleId);
+            if(sysUser != null){
+                coreHandleName = sysUser.getNickName();
+            }
+        }
+        map.put("coreHandleName",coreHandleName);
+        //获取核心企业的第一个普通用户
+        String coreFirstUser = "";
+        LambdaQueryWrapper<SysUserCompanyRel> userCompanyRelQueryWrapper = new LambdaQueryWrapper<>();
+        userCompanyRelQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,zfiCoreId);
+        userCompanyRelQueryWrapper.eq(SysUserCompanyRel::getSucrHandler,"0");
+        List<SysUserCompanyRel>   userCompanyRels =  userCompanyRelService.findSysUserCompanyRels(userCompanyRelQueryWrapper);
+        if(userCompanyRels.size() > 0){
+            //提取用户id
+            List<String> firstCoreList = new ArrayList<>();
+            for(int t = 0 ;t < userCompanyRels.size();t++){
+                String userids = CommonUtil.objToString(userCompanyRels.get(t).getSucrUserId());
+                firstCoreList.add(userids);
+            }
+            LambdaQueryWrapper<com.huyi.service.base.entity.SysUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userLambdaQueryWrapper.in(com.huyi.service.base.entity.SysUser::getUserId,firstCoreList);
+            userLambdaQueryWrapper.orderByAsc(com.huyi.service.base.entity.SysUser::getCreateTime);
+            List<com.huyi.service.base.entity.SysUser>  users = sysUserService.findSysUsers(userLambdaQueryWrapper);
+            if(users.size() > 0){
+                coreFirstUser = users.get(0).getNickName();
+            }
+
+
+        }
+        map.put("coreFirstUser",coreFirstUser);
         //产品
         String productId = financeInf.getZfiProductId();
         ZcFinanceProduct product =   productService.getById(productId);
@@ -385,6 +429,16 @@ public class OwnCreditController extends BaseController {
         }
         map.put("zfrId",zfrId);
         map.put("companyType",companyType);
+        //查询融信开立方的盖章日期
+        LambdaQueryWrapper<ZcFinanceFileRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId,zfiId);
+        List<ZcFinanceFileRel> financeFileRelList = financeFileRelService.findZcFinanceFileRels(lambdaQueryWrapper);
+        //核心企业盖章日期
+        String openDate = "";
+        if(financeFileRelList.size() > 0){
+            openDate = DateUtils.parseDateToStr("yyyy年MM月dd日",financeFileRelList.get(0).getZffrCoreTime());
+        }
+        map.put("openDate",openDate);
         return AjaxResult.success(map);
     }
 

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

@@ -757,7 +757,7 @@ public class OwnMessageController extends BaseController {
                 finance.setUpdateBy(userId);
                 financeInfService.updateById(finance);
                 //给融资企业经办人添加一条签收待办
-                String title = "【融资签收】"+openName+"的【"+zfiNumber+"】,融信金额【¥"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
+                String title = "【融信签收】"+openName+"的【"+zfiNumber+"】,融信金额【¥"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
                 remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"", "01", "/credit/addInformation/"+zfiId);
 
                 /**融信操作日志*/
@@ -845,7 +845,7 @@ public class OwnMessageController extends BaseController {
 
                 }else{
                     //给融资企业经办人生成签收待办
-                    String title = "【融资签收】"+openName+"的【"+zfiNumber+"】,融信金额【¥"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
+                    String title = "【融信签收】"+openName+"的【"+zfiNumber+"】,融信金额【¥"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
                     remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"", "01", "/credit/signFor/"+zfiId);
                 }
                 /**融信操作日志*/