Merge branch 'master' of http://git.minpay.cc/SupplyChain/service

sc-service/src/main/java/com/huyi/service/common/companyAcc/controller/companyAccController.java

@@ -34,21 +34,26 @@ public class companyAccController extends BaseController {
     @Autowired
     private CompanyAccService companyAccService;
 
+
     /**
      * 查询核心企业还款账户
+     * @param zfpcrAccount 银行卡号
+     * @param scyId        企业id
      * @return
      */
-    @GetMapping("/list/{zfpcrAccount}")
-    public AjaxResult list(@PathVariable String zfpcrAccount) {
+    @GetMapping("/list/{zfpcrAccount}/{scyId}")
+    public AjaxResult list(@PathVariable String zfpcrAccount,@PathVariable String scyId) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
         //获取企业
         String companyId = use.getCompanyId();
         Map map = new HashMap();
-        if (!SalaryConstants.OPEX.equals(companyId)) {
-            map.put("companyId", companyId);
-        }
+//        if (!SalaryConstants.OPEX.equals(companyId)) {
+//            map.put("companyId", companyId);
+//        }
+        //企业id
+        map.put("companyId", scyId);
         if (CommonUtil.isNotEmpty(zfpcrAccount)) {
             map.put("zfpcrAccount", zfpcrAccount);
         }

sc-service/src/main/java/com/huyi/service/common/financeInf/controller/FinanceInfController.java

@@ -47,7 +47,8 @@ public class FinanceInfController extends BaseController {
     private IZcFinanceInfService iZcFinanceInfService;
     @Autowired
     private FinanceInfService financeInfService;
-
+    //金额
+    private static  final  String AMOUNT = "10000";
     /**
      * 查询融信 (融资用
      * @param zfrFinanceId 融信id
@@ -64,6 +65,10 @@ public class FinanceInfController extends BaseController {
         map.put("companyId",companyId);
         map.put("zfiId",zfrFinanceId);
         List<Map> list = financeInfService.selectFinanceInfList(map);
+        for (Map map1 : list){
+            String zfiAmount = CommonUtil.objToString(map1.get("zfiAmount"));
+            map1.put("zfiAmount",AmtUtil.divide(zfiAmount,AMOUNT,2));
+        }
 //        LambdaQueryWrapper<ZcFinanceInf> queryWrapper = new LambdaQueryWrapper<>();
 //        queryWrapper.eq(ZcFinanceInf::getZfiSupplierId,companyId);
 //        queryWrapper.eq(ZcFinanceInf::getZfiStatus,"02");

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.conmany.service.IOwnCompanyManageService;
+import com.huyi.service.rel.service.IOwnCompanyRelService;
 import com.huyi.service.util.FlowableService;
 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.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
@@ -67,6 +69,10 @@ public class OwnCompanyManageController extends BaseController
 
     @Autowired
     private FlowableService flowableService;
+
+    @Autowired
+    private IOwnCompanyRelService iOwnCompanyRelService;
+
     /**
      * 企业四要素认证状态;未认证
      */
@@ -127,31 +133,43 @@ public class OwnCompanyManageController extends BaseController
     @GetMapping("/list")
     public R list(SysCompany sysCompany, QueryRequest request)
     {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        Map map = new HashMap();
+        map.put("companyId",companyId);
         //企业名称
         if(CommonUtil.isNotEmpty(sysCompany.getScyName())) {
             queryWrapper.like(SysCompany::getScyName, sysCompany.getScyName());
+            map.put("scyName",sysCompany.getScyName());
         }
         //企业统一信用代码
         if(CommonUtil.isNotEmpty(sysCompany.getScySocialCode())) {
             queryWrapper.like(SysCompany::getScySocialCode, sysCompany.getScySocialCode());
+            map.put("scySocialCode",sysCompany.getScySocialCode());
         }
         //企业联系人（法人）
         if(CommonUtil.isNotEmpty(sysCompany.getScyLegal())) {
             queryWrapper.like(SysCompany::getScyLegal, sysCompany.getScyLegal());
+            map.put("scyLegal",sysCompany.getScyLegal());
         }
         //企业联系电话
         if(CommonUtil.isNotEmpty(sysCompany.getScyPhone())) {
             queryWrapper.like(SysCompany::getScyPhone, sysCompany.getScyPhone());
+            map.put("scyPhone",sysCompany.getScyPhone());
         }
         //企业状态不为空
         if(CommonUtil.isNotEmpty(sysCompany.getScyStatus())) {
             if(TREE_STATE.equals(sysCompany.getScyStatus())) {
                 queryWrapper.and(i -> i.eq(SysCompany::getScyStatus, TREE_STATE).or().eq(SysCompany::getScyStatus, "03")
                         .or().eq(SysCompany::getScyStatus, "04"));
+                map.put("scyStatus",sysCompany.getScyStatus());
             }
             if(!TREE_STATE.equals(sysCompany.getScyStatus())){
                 queryWrapper.eq(SysCompany::getScyStatus, sysCompany.getScyStatus());
+                map.put("scyStatus",sysCompany.getScyStatus());
             }
         }
         //企业状态如果为空，则查询正常或停用状态
@@ -159,13 +177,18 @@ public class OwnCompanyManageController extends BaseController
             queryWrapper.ne(SysCompany::getScyStatus, DELETE_STATE);
         }
         //企业类型
-        if(CommonUtil.isNotEmpty(sysCompany.getScyType())) {
+        if(CommonUtil.isNotEmpty(sysCompany.getScyType()) && SalaryConstants.OPEX.equals(companyId)) {
             queryWrapper.eq(SysCompany::getScyType, sysCompany.getScyType());
+            //创建时间倒序排列
+            queryWrapper.orderByDesc(SysCompany::getCreateTime);
+            IPage<SysCompany> list = iSysCompanyService.findSysCompanys(request,queryWrapper);
+            return R.ok(list);
+        }
+        if(CommonUtil.isNotEmpty(sysCompany.getScyType()) && "01".equals(sysCompany.getScyType()) && !SalaryConstants.OPEX.equals(companyId)){
+            IPage<Map> list = iOwnCompanyManageService.creditCompanyList(request,map);
+            return R.ok(list);
         }
-        //创建时间倒序排列
-        queryWrapper.orderByDesc(SysCompany::getCreateTime);
-        IPage<SysCompany> list = iSysCompanyService.findSysCompanys(request,queryWrapper);
-        return R.ok(list);
+        return R.ok();
     }
 
     /**
@@ -235,8 +258,6 @@ public class OwnCompanyManageController extends BaseController
         sysCompany.setScySocialCode(scySocialCode);
         //法人
         sysCompany.setScyLegal(scyLegal);
-        //联系电话
-        sysCompany.setScyPhone(scyPhone);
         //类型（核心企业）
         sysCompany.setScyType(CONFIRM_STATE);
         //企业状态：待四要素状态
@@ -349,9 +370,6 @@ public class OwnCompanyManageController extends BaseController
         queryWrapper.eq(SysCompany::getScyId,scyId);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
         if(list.size() > 0) {
-            if (NORMAL_STATE.equals(list.get(0).getScyAuthStatus())) {
-                return R.ok(list);
-            }
             if (NORMAL_STATE.equals(list.get(0).getScyStatus())) {
                 //经办人信息
                 LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
@@ -413,6 +431,10 @@ public class OwnCompanyManageController extends BaseController
                 //其他附件
                 map.put("appendixList",appendixList);
                 return R.ok(map);
+            }if (NORMAL_STATE.equals(list.get(0).getScyAuthStatus())) {
+                return R.ok(list);
+            }else if(!NORMAL_STATE.equals(list.get(0).getScyStatus())){
+                return R.ok(list);
             }
         }else {
             throw new Exception("企业不存在");
@@ -420,6 +442,65 @@ public class OwnCompanyManageController extends BaseController
         return R.ok();
     }
 
+    /**
+     * 查询链属列表
+     * @param scySocialCode 社会统一信用代码
+     * @param companyName   企业名称
+     * @param scrType       企业类型
+     * @param scrStatus     链属状态
+     * @param request
+     * @return
+     */
+    @GetMapping("/listRel")
+    public R listRel(String scyId, String scySocialCode, String companyName,
+                  String scrType, String scrStatus, String scrContarct, QueryRequest request)
+    {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        Map map = new HashMap();
+        if(!SalaryConstants.OPEX.equals(companyId)) {
+            if (CommonUtil.isNotEmpty(scyId)) {
+                map.put("companyId", scyId);
+            }else
+            if (CommonUtil.isEmpty(scyId)) {
+                map.put("companyId", companyId);
+            }
+            if(CommonUtil.isNotEmpty(companyName)) {
+                map.put("companyName", companyName);
+            }
+            if(CommonUtil.isNotEmpty(scySocialCode)) {
+                map.put("scySocialCode", scySocialCode);
+            }
+            if(CommonUtil.isNotEmpty(scrType)) {
+                map.put("scrType", scrType);
+            }
+            if(CommonUtil.isNotEmpty(scrStatus)) {
+                map.put("scrStatus", scrStatus);
+            }
+        }else if(SalaryConstants.OPEX.equals(companyId)) {
+            if (CommonUtil.isNotEmpty(scyId)) {
+                map.put("companyId", scyId);
+            }
+            if (CommonUtil.isNotEmpty(companyName)) {
+                map.put("name", companyName);
+            }
+            if (CommonUtil.isNotEmpty(scySocialCode)) {
+                map.put("code", scySocialCode);
+            }
+            if (CommonUtil.isNotEmpty(scrType)) {
+                map.put("type", scrType);
+            }
+            if (CommonUtil.isNotEmpty(scrStatus)) {
+                map.put("status", scrStatus);
+            }
+            if(CommonUtil.isNotEmpty(scrContarct)){
+                map.put("scrContarct",scrContarct);
+            }
+        }
+        IPage<Map> list = iOwnCompanyRelService.selectCompanyRelList(request,map);
+        return R.ok(list,companyId);
+    }
 
     /**
      * 获取企业明细信息(四要素审核专用)
@@ -540,22 +621,22 @@ public class OwnCompanyManageController extends BaseController
             throw new Exception("联系人长度不能超过30字；请检查是否正确");
         }
         //联系电话
-        String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
-        if(CommonUtil.isEmpty(scyPhone)){
-            throw new Exception("联系电话不能为空");
-        }
-        if(CommonUtil.isNotEmpty(scyPhone)) {
-            if(scyPhone.length() > 11){
-                throw new Exception("手机号不能超过11位");
-            }
-            String checkPhone = "^1[3|4|5|6|7|8|9][0-9]\\d{8}$";
-            Pattern regePhone = Pattern.compile(checkPhone);
-            Matcher matcherPhone = regePhone.matcher(scyPhone);
-            boolean isMatPhone = matcherPhone.matches();
-            if (!isMatPhone) {
-                throw new Exception("手机格式不正确");
-            }
-        }
+//        String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
+//        if(CommonUtil.isEmpty(scyPhone)){
+//            throw new Exception("联系电话不能为空");
+//        }
+//        if(CommonUtil.isNotEmpty(scyPhone)) {
+//            if(scyPhone.length() > 11){
+//                throw new Exception("手机号不能超过11位");
+//            }
+//            String checkPhone = "^1[3|4|5|6|7|8|9][0-9]\\d{8}$";
+//            Pattern regePhone = Pattern.compile(checkPhone);
+//            Matcher matcherPhone = regePhone.matcher(scyPhone);
+//            boolean isMatPhone = matcherPhone.matches();
+//            if (!isMatPhone) {
+//                throw new Exception("手机格式不正确");
+//            }
+//        }
         //查询当前企业id的状态
         SysCompany sysCompanyQuery = iSysCompanyService.getById(scyId);
         //执行修改
@@ -569,7 +650,7 @@ public class OwnCompanyManageController extends BaseController
         //法人
         sysCompany.setScyLegal(scyLegal);
         //联系电话
-        sysCompany.setScyPhone(scyPhone);
+//        sysCompany.setScyPhone(scyPhone);
         //类型（核心企业）
         sysCompany.setScyType(sysCompanyQuery.getScyType());
         //企业状态

sc-service/src/main/java/com/huyi/service/conmany/mapper/OwnCompanyManageMapper.java

@@ -89,4 +89,11 @@ public interface OwnCompanyManageMapper extends BaseMapper<SysCompany> {
      */
     public List<Map> handlerNegativeList(@Param("paramMap")Map map);
 
+    /**
+     * 查询已授信的核心企业信息
+     * @param map
+     * @return
+     */
+    public IPage<Map> creditCompanyList(Page<Map> page, @Param("paramMap")Map map);
+
 }

sc-service/src/main/java/com/huyi/service/conmany/service/IOwnCompanyManageService.java

@@ -1,7 +1,9 @@
 package com.huyi.service.conmany.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huyi.service.base.entity.SysCompany;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 
 import java.util.List;
 import java.util.Map;
@@ -85,4 +87,11 @@ public interface IOwnCompanyManageService extends IService<SysCompany> {
      * @return
      */
     public List<Map> handlerNegativeList(Map map);
+
+    /**
+     * 查询已授信的核心企业信息
+     * @param map
+     * @return
+     */
+    public IPage<Map> creditCompanyList(QueryRequest request, Map map);
 }

sc-service/src/main/java/com/huyi/service/conmany/service/impl/OwnCompanyManageServiceImpl.java

@@ -82,4 +82,9 @@ public class OwnCompanyManageServiceImpl extends ServiceImpl<OwnCompanyManageMap
         return ownCompanyManageMapper.handlerNegativeList(map);
     }
 
+    @Override
+    public IPage<Map> creditCompanyList(QueryRequest request, Map map) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return ownCompanyManageMapper.creditCompanyList(page,map);
+    }
 }

sc-service/src/main/java/com/huyi/service/cost/controller/OwnCostManageController.java

@@ -82,7 +82,7 @@ public class OwnCostManageController extends BaseController
     private String DELETE_STATE = "99";
 
 
-    /**
+/**
  * 查询费用列表
  * @param zfrNumber  融资编号
  * @param zciStatus  费用状态

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

@@ -3,6 +3,7 @@ package com.huyi.service.credit.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
+import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.constant.FileConstants;
 import com.keao.tianhu.core.util.AmtUtil;
 import com.spire.doc.Document;
@@ -71,6 +72,9 @@ public class CreditHandleController extends BaseController {
     //系统参数服务类
     @Autowired
     private RemoteConfigService configService;
+    //审批服务类
+    @Autowired
+    private ApprovalService approvalService;
 
     /**
      * 融信确权
@@ -216,7 +220,8 @@ public class CreditHandleController extends BaseController {
         financeInf.setZfiId(zfiId);
         financeInf.setZfiSupplierStatus("03");
         financeInfService.updateById(financeInf);
-
+        //调用补充资料审批
+        approvalService.addInformationApproval(map);
         return AjaxResult.success();
     }
 

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

@@ -322,7 +322,6 @@ public class OwnCreditController extends BaseController {
         }
         //获取申请金额
         String zfiAmount = CommonUtil.objToString(map.get("zfiAmount"));
-        inf.setZfiAmount(zfiAmount);
         if(CommonUtil.isEmpty(zfiAmount)){
             throw new Exception("请输入申请金额");
         }
@@ -452,6 +451,7 @@ public class OwnCreditController extends BaseController {
             rel.setZfbrBillId(billId);
             financeBillRelService.createZcFinanceBillRel(rel);
         }
+        inf.setZfiAmount(zfiAmount);
         //修改数据
         financeInfService.updateById(inf);
         return AjaxResult.success();
@@ -582,13 +582,14 @@ public class OwnCreditController extends BaseController {
         inf.setZfiPaymentNumber(zfiPaymentNumber);
         //获取申请金额
         String zfiAmount = CommonUtil.objToString(map.get("zfiAmount"));
-        inf.setZfiAmount(zfiAmount);
+
         if(CommonUtil.isEmpty(zfiAmount)){
             throw new Exception("请输入申请金额");
         }
         if(!AmtUtil.isMoney(zfiAmount)){
             throw new Exception("请输入正确的申请金额");
         }
+
         //非供应商申请
         if(!"0".equals(type)){
             //获取可用额度
@@ -769,6 +770,7 @@ public class OwnCreditController extends BaseController {
             rel.setZfbrBillId(billId);
             financeBillRelService.createZcFinanceBillRel(rel);
         }
+        inf.setZfiAmount(zfiAmount);
         //插入数据
         financeInfService.createZcFinanceInf(inf);
         //核心开立

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

@@ -628,12 +628,18 @@ public class OwnMessageController extends BaseController {
                 //修改人
                 finance.setUpdateBy(userId);
                 financeInfService.updateById(finance);
-                //补充资料的审批方法
-                //approvalService.addInformationApproval(map);
             }else if("02".equals(companyType)){
                 //融资企业
-                //平台审批方法
-                approvalService.addPlatformApproval(map);
+                //修改融信状态
+                ZcFinanceInf finance = new ZcFinanceInf();
+                finance.setZfiId(zfiId);
+                //已生效
+                finance.setZfiStatus("02");
+                //修改时间
+                finance.setUpdateTime(DateUtils.getNowDate());
+                //修改人
+                finance.setUpdateBy(userId);
+                financeInfService.updateById(finance);
             }
 
         }
@@ -697,8 +703,16 @@ public class OwnMessageController extends BaseController {
 
             }else if("02".equals(companyType)){
                 //融资企业
-                //平台审批方法
-                approvalService.addPlatformApproval(map);
+                //修改融信状态
+                ZcFinanceInf finance = new ZcFinanceInf();
+                finance.setZfiId(zfiId);
+                //待确权
+                finance.setZfiStatus("00");
+                //修改时间
+                finance.setUpdateTime(DateUtils.getNowDate());
+                //修改人
+                finance.setUpdateBy(userId);
+                financeInfService.updateById(finance);
             }
 
         }
@@ -730,6 +744,8 @@ public class OwnMessageController extends BaseController {
         }
         //经办人
         String handler = CommonUtil.objToString(relList.get(0).getSucrUserId());
+        //身份证号
+        String idCard = relList.get(0).getSucrCard();
         LambdaQueryWrapper<com.huyi.service.base.entity.SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
         //非删除
         sysUserLambdaQueryWrapper.eq(com.huyi.service.base.entity.SysUser::getDelFlag,"0");
@@ -741,8 +757,7 @@ public class OwnMessageController extends BaseController {
         if(userList.size() < 1){
             throw  new Exception("获取经办人信息失败");
         }
-        //获取身份证号
-        String idCard = userList.get(0).getIdCard();
+        //获取姓名
         String name = userList.get(0).getNickName();
         //前后台通知
         //String backFrontUrl = "https://www.baidu.com";

sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -59,6 +59,9 @@ public class CreditLineController extends BaseController {
     private IZcFinanceContractService iZcFinanceContractService;
 
     public final static String REGEX = "^\\d\\.([0-9]{1,2}|[0-9][0-9])$|^[0-9]\\d{0,1}(\\.\\d{1,2}){0,1}$|^100(\\.0{1,2}){0,1}$";
+    //金额
+    private static  final  String AMOUNT = "10000";
+
      /**
      * 查询授信额度列表
      */
@@ -78,13 +81,17 @@ public class CreditLineController extends BaseController {
                   @RequestParam (required = false) Map endTime,QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
-        SysUser use = userInfo.getSysUser();
+        SysUser user = userInfo.getSysUser();
         //获取企业
-        String companyId = use.getCompanyId();
+        String companyId = user.getCompanyId();
+        //获取企业类型
+        String companyType = user.getCompanyType();
         Map map = new HashMap();
         if (!SalaryConstants.OPEX.equals(companyId)) {
             map.put("companyId", companyId);
         }
+        //企业类型
+        map.put("companyType",companyType);
         //企业名称
         map.put("scyName",scyName);
         //授信额度范围
@@ -122,9 +129,11 @@ public class CreditLineController extends BaseController {
             //可用额度(授信额度 - 申请金额)
             String usableAmount = AmtUtil.subtract(zfpcrAmount,zfiAmount,2);
             //已使用额度
-            m.put("zfiAmount",zfiAmount);
+            m.put("zfiAmount",AmtUtil.divide(zfiAmount,AMOUNT,2));
             //可用额度
-            m.put("usableAmount",usableAmount);
+            m.put("usableAmount",AmtUtil.divide(usableAmount,AMOUNT,2));
+            //授信额度
+            m.put("zfpcrAmount",AmtUtil.divide(zfpcrAmount,AMOUNT,2));
         }
         return R.ok(list);
     }
@@ -141,6 +150,12 @@ public class CreditLineController extends BaseController {
         Map map = new HashMap();
         map.put("zfpcrId",zfpcrId);
         List<Map> list = creditLineService.selectCreditLineDetail(map);
+        for (Map map1 : list) {
+            String zfpcrAmount = map1.get("zfpcrAmount")+"";
+            String zfpcrOldAmount = CommonUtil.objToString(map.get("zfpcrOldAmount"));
+            map1.put("zfpcrAmount",AmtUtil.multiply(zfpcrAmount,AMOUNT,2));
+            map1.put("zfpcrOldAmount",AmtUtil.multiply(zfpcrOldAmount,AMOUNT,2));
+        }
         //授信合同信息关联表
         LambdaQueryWrapper<ZcFinanceQuotaConRel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ZcFinanceQuotaConRel::getZfqcrCreditId,zfpcrId);
@@ -183,6 +198,7 @@ public class CreditLineController extends BaseController {
         String zfpcrCompanyId = CommonUtil.objToString(map.get("zfpcrCompanyId"));
         //授信额度
         String zfpcrAmount = CommonUtil.objToString(map.get("zfpcrAmount"));
+        zfpcrAmount = AmtUtil.multiply(zfpcrAmount,AMOUNT,2);
         //利率
         String zfpcrRate =  CommonUtil.objToString(map.get("zfpcrRate"));
         //有效期
@@ -325,6 +341,8 @@ public class CreditLineController extends BaseController {
         zcFinanceProComRel.setZfpcrChargeRate(zfpcrChargeRate);
         //核心企业还款账户账号
         zcFinanceProComRel.setZfpcrAccount(zfpcrAccount);
+        //核心企业还款账户开户行
+        zcFinanceProComRel.setZfpcrAccountBank(zfpcrAccountBank);
         //融资放款方式
         zcFinanceProComRel.setZfpcrLoanType(zfpcrLoanType);
         //记账簿托管方式
@@ -375,8 +393,10 @@ public class CreditLineController extends BaseController {
         String zfpcrCompanyId = CommonUtil.objToString(map.get("zfpcrCompanyId"));
         //授信额度
         String zfpcrAmount = CommonUtil.objToString(map.get("zfpcrAmount"));
+        zfpcrAmount = AmtUtil.multiply(zfpcrAmount,AMOUNT,2);
         //原授信额度
         String zfpcrOldAmount = CommonUtil.objToString(map.get("zfpcrOldAmount"));
+        zfpcrOldAmount = AmtUtil.multiply(zfpcrOldAmount,AMOUNT,2);
         //利率
         String zfpcrRate =  CommonUtil.objToString(map.get("zfpcrRate"));
         //有效期
@@ -520,6 +540,8 @@ public class CreditLineController extends BaseController {
         zcFinanceProComRel.setZfpcrChargeRate(zfpcrChargeRate);
         //核心企业还款账户账号
         zcFinanceProComRel.setZfpcrAccount(zfpcrAccount);
+        //核心企业还款账户开户行
+        zcFinanceProComRel.setZfpcrAccountBank(zfpcrAccountBank);
         //融资放款方式
         zcFinanceProComRel.setZfpcrLoanType(zfpcrLoanType);
         //记账簿托管方式

sc-service/src/main/java/com/huyi/service/financeProduct/controller/FinanceProductControllers.java

@@ -12,6 +12,8 @@ import com.huyi.service.base.service.IZcFinanceProConRelService;
 import com.huyi.service.base.service.IZcFinanceProductService;
 import com.huyi.service.financeProduct.service.IOwnFinanceProductService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.common.core.constant.SalaryConstants;
+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;
@@ -21,6 +23,7 @@ import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.security.annotation.PreAuthorize;
 import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -69,14 +72,14 @@ public class FinanceProductControllers extends BaseController {
     @GetMapping("/list")
     public AjaxResult list(String zfpName, String scyName, String begin,String end, QueryRequest request) {
         //查询当前操作员
-//        LoginUser userInfo = tokenService.getLoginUser();
-//        SysUser use = userInfo.getSysUser();
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
         //获取企业
-//        String companyId = use.getCompanyId();
+        String companyId = use.getCompanyId();
         Map map = new HashMap(16);
-//        if(!SalaryConstants.OPEX.equals(companyId)){
-//            map.put("companyId",companyId);
-//        }
+        if(!SalaryConstants.OPEX.equals(companyId)){
+            map.put("companyId",companyId);
+        }
         //产品名称
         if(CommonUtil.isNotEmpty(zfpName)){
             map.put("zfpName",zfpName);
@@ -99,6 +102,13 @@ public class FinanceProductControllers extends BaseController {
             map.put("end",CommonUtil.objToBigDecimal(end));
         }
         IPage<Map> list = ownFinanceProductService.selectFinanceProductList(map,request);
+        //转换最小融资金额单位为万元
+        List resList = list.getRecords();
+        for(int i = 0;i<resList.size();i++){
+            Map<String,String> res = (Map<String,String>)resList.get(i);
+            String zfpMinimumAmount = AmtUtil.divide(res.get("zfpMinimumAmount"),"10000");
+            res.put("zfpMinimumAmount",zfpMinimumAmount);
+        }
         return AjaxResult.success(list);
     }
 
@@ -116,6 +126,9 @@ public class FinanceProductControllers extends BaseController {
         //查询用户名称
         Map resultMap = ownFinanceProductService.selectUserName(map);
         ZcFinanceProduct zcFinanceProduct = zcFinanceProductService.getById(zfpId);
+        //转换最小融资金额单位为万元
+        String zfpMinimumAmount = AmtUtil.divide(CommonUtil.objToString(zcFinanceProduct.getZfpMinimumAmount()),"10000");
+        zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
         resultMap.put("zcFinanceProduct",zcFinanceProduct);
         //查询融资产品关联合同
         LambdaQueryWrapper<ZcFinanceProConRel> queryWrapper = new LambdaQueryWrapper<>();
@@ -181,6 +194,7 @@ public class FinanceProductControllers extends BaseController {
         }
         //最小融资金额
         String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
+        String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
         if(CommonUtil.isEmpty(zfpMinimumAmount)){
             return AjaxResult.error("最小融资金额不能为空");
         }
@@ -285,7 +299,7 @@ public class FinanceProductControllers extends BaseController {
         zcFinanceProduct.setZfpStatus("01");
         zcFinanceProduct.setZfpManagementId(zfpManagementId);
         zcFinanceProduct.setZfpSplit(zfpSplit);
-        zcFinanceProduct.setZfpMinimumAmount(zfpMinimumAmount);
+        zcFinanceProduct.setZfpMinimumAmount(minAmount);
         zcFinanceProduct.setZfpShortestPeriod(zfpShortestPeriod);
         zcFinanceProduct.setZfpCharge(zfpCharge);
         zcFinanceProduct.setZfpRecourse(zfpRecourse);
@@ -356,6 +370,7 @@ public class FinanceProductControllers extends BaseController {
         String zfpAuthType = CommonUtil.objToString(map.get("zfpAuthType"));
         //最小融资金额
         String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
+        String minAmount = AmtUtil.multiply(zfpMinimumAmount,"10000");
         if(CommonUtil.isEmpty(zfpMinimumAmount)){
             return AjaxResult.error("最小融资金额不能为空");
         }

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -101,6 +101,8 @@ public class FinanceRecordController extends BaseController {
 
     //正整数正则
     private static final String REGEX =  "^[0-9]*[1-9][0-9]*$";
+    //金额
+    private static  final  String AMOUNT = "10000";
 
      /**
      * 查询融资管理列表
@@ -113,13 +115,17 @@ public class FinanceRecordController extends BaseController {
                   @RequestParam (required = false) String zfrStatus,QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
-        SysUser use = userInfo.getSysUser();
+        SysUser user = userInfo.getSysUser();
         //获取企业
-        String companyId = use.getCompanyId();
+        String companyId = user.getCompanyId();
+        //获取企业类型
+        String companyType = user.getCompanyType();
         Map map = new HashMap();
-//        if (!SalaryConstants.OPEX.equals(companyId)) {
-//            map.put("companyId", companyId);
-//        }
+        if (!SalaryConstants.OPEX.equals(companyId)) {
+            map.put("companyId", companyId);
+        }
+        //企业类型
+        map.put("companyType",companyType);
         map.put("zfrStatus",zfrStatus);
         //00:我签收的   01:我开立的
         if ("00".equals(zfrTypes)){
@@ -138,6 +144,18 @@ public class FinanceRecordController extends BaseController {
             map.put("zfrRate", zfrValue);
         }
         IPage<Map> list = financeRecordService.selectFinanceRecordList(map, request);
+        List listAll = list.getRecords();
+        for (int j = 0; j < listAll.size(); j++) {
+            Map<String,String>  m = (Map<String, String>) listAll.get(j);
+            //融资金额
+            String zfrAmount = m.get("zfrAmount");
+            zfrAmount = AmtUtil.divide(zfrAmount,AMOUNT,2);
+            //实际放款金额
+            String zfrLoanAmount = m.get("zfrLoanAmount");
+            zfrLoanAmount = AmtUtil.divide(zfrLoanAmount,AMOUNT,2);
+            m.put("zfrAmount",zfrAmount);
+            m.put("zfrLoanAmount",zfrLoanAmount);
+        }
         return R.ok(list);
     }
 
@@ -182,7 +200,8 @@ public class FinanceRecordController extends BaseController {
             zfpcrChargeRate = AmtUtil.divide(zfpcrChargeRate,"100",4);
             needPay = AmtUtil.multiply(zfrAmount,zfpcrChargeRate,2);
         }
-        map.put("needPay",needPay);
+        map.put("needPay",AmtUtil.multiply(needPay,AMOUNT,2));
+        map.put("zfrAmount",AmtUtil.divide(zfrAmount,AMOUNT,2));
         return AjaxResult.success(map);
     }
 
@@ -221,6 +240,7 @@ public class FinanceRecordController extends BaseController {
         String zfrFinanceId = CommonUtil.objToString(map.get("zfrFinanceId"));
         //融资金额
         String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
+        zfrAmount = AmtUtil.multiply(zfrAmount,AMOUNT,2);
         //融资收款账号
         String zfrCollectionAccount = CommonUtil.objToString(map.get("zfrCollectionAccount"));
         //融资利率
@@ -318,19 +338,26 @@ public class FinanceRecordController extends BaseController {
         //创建时间
         zcFinanceRecord.setCreateTime(createTime);
         /*-------------新增费用表--------*/
-        ZcChargeInf zcChargeInf = new ZcChargeInf();
-        //主键
-        zcChargeInf.setZciId(IdUtils.fastSimpleUUID());
-        //融资id
-        zcChargeInf.setZciFinanceId(zfrId);
-        //手续费
-        String zciAmount = AmtUtil.divide(zfpcrChargeRate,"100",4);
-        zciAmount = AmtUtil.subtract(zfrAmount,zciAmount,2);
-        zcChargeInf.setZciAmount(zciAmount);
-        //创建人
-        zcChargeInf.setCreateBy(userId);
-        //创建时间
-        zcChargeInf.setCreateTime(DateUtils.getNowDate());
+        //查询此融资是否已存在
+        LambdaQueryWrapper<ZcChargeInf> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ZcChargeInf::getZciFinanceId,zfrFinanceId);
+        int count = iZcChargeInfService.count(queryWrapper);
+        if (count == 0) {
+            ZcChargeInf zcChargeInf = new ZcChargeInf();
+            //主键
+            zcChargeInf.setZciId(IdUtils.fastSimpleUUID());
+            //融资id
+            zcChargeInf.setZciFinanceId(zfrId);
+            //手续费
+            String zciAmount = AmtUtil.divide(zfpcrChargeRate, "100", 4);
+            zciAmount = AmtUtil.subtract(zfrAmount, zciAmount, 2);
+            zcChargeInf.setZciAmount(zciAmount);
+            //创建人
+            zcChargeInf.setCreateBy(userId);
+            //创建时间
+            zcChargeInf.setCreateTime(DateUtils.getNowDate());
+            iZcChargeInfService.createZcChargeInf(zcChargeInf);
+        }
         /*----------修改融信表状态---------------*/
         ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
         //融信id
@@ -342,7 +369,7 @@ public class FinanceRecordController extends BaseController {
         //修改时间
         zcFinanceInf.setUpdateTime(DateUtils.getNowDate());
         iZcFinanceInfService.updateZcFinanceInf(zcFinanceInf);
-        iZcChargeInfService.createZcChargeInf(zcChargeInf);
+
         iZcFinanceRecordService.createZcFinanceRecord(zcFinanceRecord);
         return AjaxResult.success();
     }
@@ -367,8 +394,10 @@ public class FinanceRecordController extends BaseController {
         String userId = user.getUserId() + "";
         //放款金额
         String zfrLoanAmount = CommonUtil.objToString(map.get("zfrLoanAmount"));
+        zfrLoanAmount = AmtUtil.multiply(zfrLoanAmount,AMOUNT,2);
         //融资金额
         String zfrAmount = CommonUtil.objToString(map.get("zfrAmount"));
+        zfrAmount = AmtUtil.multiply(zfrAmount,AMOUNT,2);
         //融信id
         String zfrFinanceId = CommonUtil.objToString(map.get("zfrFinanceId"));
         //授信额度
@@ -449,6 +478,10 @@ public class FinanceRecordController extends BaseController {
             map.put("billIdList",CommonUtil.listToStr4InSql(billIdList));
         }
         List<Map> list = financeRecordService.selectBillInfList(map);
+        for (Map map1 : list){
+            String zbiAmount = CommonUtil.objToString(map1.get("zbiAmount"));
+            map1.put("zbiAmount",AmtUtil.divide(zbiAmount,AMOUNT,2));
+        }
         return AjaxResult.success(list);
     }
 

sc-service/src/main/java/com/huyi/service/financeRecord/controller/RecordSealController.java

@@ -668,8 +668,8 @@ public class RecordSealController extends BaseController {
         return AjaxResult.success();
     }
 
-    @PostMapping("/updateChargeStatus/{zfrId}")
-    public AjaxResult updateChargeStatus(@PathVariable String zfrId) throws Exception {
+    @GetMapping("/listChargeStatus/{zfrId}")
+    public AjaxResult listChargeStatus(@PathVariable("zfrId") String zfrId){
         //融资信息
         ZcFinanceRecord zcFinanceRecord = iZcFinanceRecordService.getById(zfrId);
         //融信id
@@ -682,9 +682,24 @@ public class RecordSealController extends BaseController {
         ZcFinanceProComRel zcFinanceProComRel  = iZcFinanceProComRelService.getById(coreQuotaId);
         //融资放款方式
         String loanType = zcFinanceProComRel.getZfpcrLoanType();
-        if ("1".equals(loanType) || "2".equals(loanType)){
 
+        List<ZcChargeInf> list = new ArrayList<>();
+        if ("1".equals(loanType) || "2".equals(loanType)){
+            LambdaQueryWrapper<ZcChargeInf> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(ZcChargeInf::getZciFinanceId,zfrId);
+            list = iZcChargeInfService.findZcChargeInfs(queryWrapper);
         }
+        return AjaxResult.success(list);
+    }
+    /**
+     * 缴费状态修改
+     * @param zfrId 融资id
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/updateChargeStatus/{zfrId}")
+    public AjaxResult updateChargeStatus(@PathVariable String zfrId) throws Exception {
+
         LambdaQueryWrapper<ZcChargeInf> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ZcChargeInf::getZciFinanceId,zfrId);
         ZcChargeInf zcChargeInf = new ZcChargeInf();

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -345,9 +345,9 @@ public class repaymentController extends BaseController {
     public AjaxResult RepaymentRegistration(@RequestBody Map map){
         //附件url
         List<Map<String, String>> file = (List<Map<String, String>>) map.get("zfrApplyFile");
-        if(file.size() == 0){
-            return AjaxResult.error("请上传附件");
-        }
+//        if(file.size() == 0){
+//            return AjaxResult.error("请上传附件");
+//        }
         String zfrApplyFile="";
         String zfrApplyFileId = "";
         if(file.size()>0) {
@@ -368,8 +368,12 @@ public class repaymentController extends BaseController {
         zcFinanceRecord.setZfrId(zfrId);
         //添加上传文件
         zcFinanceRecord.setZfrApplyFile(zfrApplyFileId);
-        //修改融资状态未已结算
+        //修改融资状态为已结算
         zcFinanceRecord.setZfrStatus("03");
+        //修改还款状态为已还款
+        zcFinanceRecord.setZfrApplyFile("01");
+        //更新实际还款日期
+        zcFinanceRecord.setZfrPayDate(DateUtils.getNowDate());
         zcFinanceRecordService.updateZcFinanceRecord(zcFinanceRecord);
         //融信Id
         ZcFinanceRecord record = zcFinanceRecordService.getById(zfrId);

sc-service/src/main/resources/mapper/common/FinanceInfMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         zfi_cfca_supplier_no                          'zfiCfcaSupplierNo',
         zfi_status                                    'zfiStatus',
         zfpcr_rate 		                              'zfpcrRate',
-        zfpcr_loan_type 	                          'zfpcrLoantype',
+        zfpcr_loan_type 	                          'zfpcrLoanType',
         zfpcr_charge_rate                             'zfpcrChargeRate'
         FROM
         zc_finance_inf

sc-service/src/main/resources/mapper/company/OwnCompanyManageMapper.xml

@@ -158,4 +158,68 @@
         WHERE s.user_id =  #{paramMap.userId}
     </select>
 
+    <!--查询已授信的企业列表-->
+    <select id="creditCompanyList" parameterType="map" resultType="map">
+        SELECT
+            zfp_id				        'zfpId',
+            zfp_management_id		    'zfpManagementId',
+            zfpcr_company_id		    'zfpcrCompanyId',
+            s.scy_id			        'scyId',
+            s.scy_license_file		    'scyLicenseFile',
+            s.scy_name			        'scyName',
+            s.scy_social_code		    'scySocialCode',
+            s.scy_registered_capital	'scyRegisteredCapital',
+            s.scy_start_time		    'scyStartTime',
+            s.scy_end_time			    'scyEndTime',
+            s.scy_address			    'scyAddress',
+            s.scy_phone			        'scyPhone',
+            s.scy_legal_file		    'scyLegalFile',
+            s.scy_legal_back_file		'scyLegalBackFile',
+            s.scy_legal 			    'scyLegal',
+            s.scy_legal_id			    'scyLegalId',
+            s.scy_authorization_file	'scyAuthorizationFile',
+            s.scy_commitment_file		'scyCommitmentFile',
+            s.scy_appendix_file		    'scyAppendixFile',
+            s.scy_type			        'scyType',
+            s.scy_industry			    'scyIndustry',
+            s.scy_scale			        'scyScale',
+            s.scy_organization		    'scyOrganization',
+            s.scy_manager			    'scyManager',
+            s.scy_cfca_user_id		    'scyCfcaUserId',
+            s.scy_remarks			    'scyRemarks',
+            s.scy_auth_status		    'scyAuthStatus',
+            s.scy_status			    'scyStatus',
+            s.create_by			        'createBy',
+            s.create_time			    'createTime'
+        FROM zc_finance_product
+        LEFT JOIN zc_finance_pro_com_rel ON zfpcr_product_id = zfp_id
+        LEFT JOIN sys_company s ON s.scy_id = zfpcr_company_id
+        WHERE zfpcr_company_id != '000000'
+        <if test="paramMap.companyId != null and paramMap.companyId != '' ">
+            AND zfp_management_id = #{paramMap.companyId}
+        </if>
+        <if test="paramMap.scyName != null and paramMap.scyName != '' ">
+            AND s.scy_name LIKE CONCAT('%', #{paramMap.scyName}, '%')
+        </if>
+        <if test="paramMap.scySocialCode != null and paramMap.scySocialCode != '' ">
+            AND s.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%')
+        </if>
+        <if test="paramMap.scyLegal != null and paramMap.scyLegal != '' ">
+            AND s.scy_legal LIKE CONCAT('%', #{paramMap.scyLegal}, '%')
+        </if>
+        <if test="paramMap.scyPhone != null and paramMap.scyPhone != '' ">
+            AND s.scy_phone LIKE CONCAT('%', #{paramMap.scyPhone}, '%')
+        </if>
+        <if test="paramMap.scyStatus != null and paramMap.scyStatus != '' and paramMap.scyStatus == '02' ">
+            AND (s.scy_status = '02' OR s.scy_status = '03' OR s.scy_status = '04')
+        </if>
+        <if test="paramMap.scyStatus != null and paramMap.scyStatus != '' and paramMap.scyStatus != '02' ">
+            AND s.scy_status = #{paramMap.scyStatus}
+        </if>
+        <if test="paramMap.scyStatus == null and paramMap.scyStatus == '' ">
+            AND s.scy_status != '99'
+        </if>
+        ORDER BY s.create_time DESC
+    </select>
+
 </mapper>

sc-service/src/main/resources/mapper/creditLine/CreditLineMapper.xml

@@ -29,9 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_company c
         ON c.scy_id = r.`zfpcr_company_id`
         WHERE 1=1
-        <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+        <if test="paramMap.companyType == 01">
             and r.zfpcr_company_id =  #{paramMap.companyId}
         </if>
+        <if test="paramMap.companyType == 03">
+            and p.zfp_management_id =  #{paramMap.companyId}
+        </if>
         <if test="paramMap.scyName != null  and paramMap.scyName != ''">
             and c.scy_name like concat('%', #{paramMap.scyName}, '%')
         </if>

sc-service/src/main/resources/mapper/financeProduct/OwnFinanceProductMapper.xml

@@ -35,9 +35,9 @@
             left join sys_company s
             on z.zfp_management_id = s.scy_id
             where 1=1
-<!--            <if test="paramMap.companyId != null  and paramMap.companyId != ''">-->
-<!--                AND z.zfp_management_id = #{paramMap.companyId}-->
-<!--            </if>-->
+            <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+                AND z.zfp_management_id = #{paramMap.companyId}
+            </if>
             <if test="paramMap.zfpName != null  and paramMap.zfpName != ''">
                 AND z.zfp_name LIKE concat('%', #{paramMap.zfpName}, '%')
             </if>

sc-service/src/main/resources/mapper/financeRecord/FinanceRecordMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             r.zfr_status          'zfrStatus',
             r.zfr_finance_id      'zfrFinanceId',
             r.zfr_approve_stt     'zfrApproveStt',
+            r.zfr_loan_amount     'zfrLoanAmount',
             i.zfi_id              'zfiId',
             i.zfi_number          'zfiNumner',
             i.zfi_core_id         'zfiCoreId',
@@ -31,16 +32,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         zc_finance_record r
         LEFT JOIN zc_finance_inf i
-        ON i.zfi_id = r.zfr_finance_id
+            ON i.zfi_id = r.zfr_finance_id
         LEFT JOIN zc_finance_pro_com_rel p
-        ON i.zfi_core_quota_id =  p.zfpcr_id
+            ON i.zfi_core_quota_id =  p.zfpcr_id
+        LEFT JOIN zc_finance_product f
+            ON f.zfp_id = p.zfpcr_product_id
         LEFT JOIN sys_company s
-        ON i.zfi_core_id = s.scy_id
+            ON i.zfi_core_id = s.scy_id
         LEFT JOIN sys_company c
-        ON i.zfi_supplier_id = c.scy_id
+            ON i.zfi_supplier_id = c.scy_id
         left join sys_user u
-        on r.zfr_handler = u.user_id
+            ON r.zfr_handler = u.user_id
         WHERE 1 = 1
+        <if test="paramMap.companyType == 01">
+            and i.zfi_core_id = #{paramMap.companyId}
+        </if>
+        <if test="paramMap.companyType == 02">
+            and i.zfi_supplier_id = #{paramMap.companyId}
+        </if>
+        <if test="paramMap.companyType == 03">
+            and f.zfp_management_id = #{paramMap.companyId}
+        </if>
         <if test="paramMap.zfrStatus != null  and paramMap.zfrStatus != ''">
             and r.zfr_status = #{paramMap.zfrStatus}
         </if>

sc-service/src/main/resources/mapper/repayment/OwnRepaymentMapper.xml

@@ -30,7 +30,7 @@
             left join sys_company y
             on i.zfi_core_id = y.scy_id
             where 1=1
-            AND r.zfr_status = '01'
+            AND r.zfr_status in ('01','03')
             <if test="paramMap.supplierId != null  and paramMap.supplierId != ''">
                 and i.zfi_supplier_id = #{paramMap.supplierId}
             </if>