融信相关

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

@@ -149,6 +149,10 @@ public class CreditHandleController extends BaseController {
             }else if("2".equals(zfiCreateType)){
                 //已生效
                 financeInf.setZfiStatus("02");
+                //签收日期
+                //获取当前时间
+                Date currentTime = DateUtils.getNowDate();
+                financeInf.setZfiSignDate(currentTime);
             }
 
         }else if("01".equals(flag)){//拒绝
@@ -484,7 +488,6 @@ public class CreditHandleController extends BaseController {
             //提取文件名
             List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"pfiFileName");
             for(int i =0 ; i < urlList.size() ;i++){
-                //TODO 文件路径需要修改
                 //替换word文档中的变量
                 //String directory = FileConstants.REMOTE_FILE_PATH;
                 String directory = configService.selectConfigByKey("credit_file_path").getMsg();

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.credit.service.OwnCreditService;
+import com.huyi.service.util.FlowableService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.AmtUtil;
@@ -74,8 +75,7 @@ public class OwnCreditController extends BaseController {
     @Autowired
     private IZcBillFileRelService billFileRelService;
     @Autowired
-    private ISysUserService iSysUserService;
-
+    private FlowableService flowableService;
 
 
     /**
@@ -164,6 +164,8 @@ public class OwnCreditController extends BaseController {
         map.put("endAmt",CommonUtil.objToBigDecimal(endAmt));
         //获取企业类型
         String companyType =  use.getCompanyType();
+        map.put("companyType",companyType);
+        map.put("companyId",companyId);
         IPage<Map> list = ownCreditService.selectCreditList(map,request);
         return R.ok(list);
     }
@@ -603,9 +605,25 @@ public class OwnCreditController extends BaseController {
         inf.setZfiRate(zfiRate);
         //核心开立
         if("1".equals(type)){
-            //TODO 根据有无审批流做判断
-            //核心企业状态
-            inf.setZfiCoreStatus("03");
+            //根据有无审批流做判断
+            Map<String,Object> pp = new HashMap<>();
+            pp.put("menuId","1000000000");
+            pp.put("companyId",companyId);
+            Map<String,Object> mmp = flowableService.selectApproval(pp);
+            //不等于200
+           if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
+                    throw  new Exception("查询审批流程失败");
+            }
+            List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
+           //未开启流程审批
+            if(list.size() < 1){
+                //通过
+                inf.setZfiCoreStatus("01");
+            }else{
+                //核心企业状态--暂存
+                inf.setZfiCoreStatus("03");
+            }
+
             //接收企业
             String zfiSupplierId = CommonUtil.objToString(map.get("zfiSupplierId"));
             inf.setZfiSupplierId(zfiSupplierId);
@@ -631,12 +649,29 @@ public class OwnCreditController extends BaseController {
 
             }
         }else if("0".equals(type) || "2".equals(type)){//供应商开立/申请
-            //TODO 根据有无审批流做判断
-            inf.setZfiSupplierStatus("03");
+            // 根据有无审批流做判断
             //获取合计金额
             String checkTotalAmt = CommonUtil.objToString(map.get("checkTotalAmt"));
             //供应商开立
             if("2".equals(type)){
+                //根据有无审批流做判断
+                Map<String,Object> pp = new HashMap<>();
+                pp.put("menuId","1000000001");
+                pp.put("companyId",companyId);
+                Map<String,Object> mmp = flowableService.selectApproval(pp);
+                //不等于200
+                if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
+                    throw  new Exception("查询审批流程失败");
+                }
+                List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
+                //未开启流程审批
+                if(list.size() < 1){
+                    //通过
+                    inf.setZfiSupplierStatus("01");
+                }else{
+                    //供应商企业状态--暂存
+                    inf.setZfiSupplierStatus("03");
+                }
                 //供应商企业授信额度
                 String zfiSupplierQuotaId = CommonUtil.objToString(map.get("zfiSupplierQuotaId"));
                 inf.setZfiSupplierQuotaId(zfiSupplierQuotaId);
@@ -659,6 +694,26 @@ public class OwnCreditController extends BaseController {
                 if(!"0".equals(zfpcrLoanType)){
                     inf.setZfiCollectionAccount(zfiCollectionAccount);
                 }*/
+            }else if("0".equals(type)){//供应商申请
+                //根据有无审批流做判断
+                Map<String,Object> pp = new HashMap<>();
+                pp.put("menuId","1000000002");
+                pp.put("companyId",companyId);
+                Map<String,Object> mmp = flowableService.selectApproval(pp);
+                //不等于200
+                if(CommonUtil.compare(CommonUtil.objToString(mmp.get("code")),"200") != 0){
+                    throw  new Exception("查询审批流程失败");
+                }
+                List<Map<String,Object>>  list = (List<Map<String, Object>>) mmp.get("data");
+                //未开启流程审批
+                if(list.size() < 1){
+                    //通过
+                    inf.setZfiSupplierStatus("01");
+                }else{
+                    //供应商企业状态--暂存
+                    inf.setZfiSupplierStatus("03");
+                }
+
             }
             if(CommonUtil.compare(zfiAmount,checkTotalAmt) == 1){
                 throw new Exception("签发金额不可大于合计金额");

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

@@ -6,6 +6,7 @@ import com.huyi.service.base.service.*;
 import com.huyi.service.common.cfcaCommon.ICfcaFaceAuthService;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.constant.FileConstants;
+import com.huyi.service.credit.service.OwnCreditService;
 import com.keao.tianhu.core.util.AmtUtil;
 import com.spire.doc.Document;
 import com.spire.doc.FileFormat;
@@ -86,6 +87,10 @@ public class OwnMessageController extends BaseController {
     @Autowired
     private RemoteConfigService configService;
 
+    //自写融信服务类
+    @Autowired
+    private OwnCreditService    ownCreditService;
+
 
     /**
      * 发送短信
@@ -631,6 +636,12 @@ public class OwnMessageController extends BaseController {
                 //修改人
                 finance.setUpdateBy(userId);
                 financeInfService.updateById(finance);
+                Map p = new HashMap();
+                p.put("zfiId",zfiId);
+                int num = ownCreditService.updateSupplierStatus(p);
+                if(num != 1){
+                    throw new Exception("盖章异常");
+                }
                 //融资企业签收审批
                 approvalService.addSignApproval(map);
             }else if("02".equals(companyType)){
@@ -640,6 +651,10 @@ public class OwnMessageController extends BaseController {
                 finance.setZfiId(zfiId);
                 //已生效
                 finance.setZfiStatus("02");
+                //签收日期
+                //获取当前时间
+                Date currentTime = DateUtils.getNowDate();
+                financeInf.setZfiSignDate(currentTime);
                 //修改时间
                 finance.setUpdateTime(DateUtils.getNowDate());
                 //修改人

sc-service/src/main/java/com/huyi/service/credit/mapper/OwnCreditMapper.java

@@ -73,6 +73,14 @@ public interface OwnCreditMapper {
      */
     String getSupplierUsedBalance(Map map);
 
+    /**
+     * 修改融信融资审批状态
+     * @param map
+     * @return
+     */
+
+    int  updateSupplierStatus( @Param("paramMap") Map map);
+
 
 
 

sc-service/src/main/java/com/huyi/service/credit/service/OwnCreditService.java

@@ -68,4 +68,10 @@ public interface OwnCreditService {
      */
     String getSupplierUsedBalance(Map map);
 
+
+    /**
+     * 修改融信融资企业审批状态
+     */
+    int updateSupplierStatus(Map map);
+
 }

sc-service/src/main/java/com/huyi/service/credit/service/impl/OwnCreditServiceImpl.java

@@ -63,4 +63,9 @@ public class OwnCreditServiceImpl implements OwnCreditService {
         return creditMapper.getSupplierUsedBalance(map);
     }
 
+    @Override
+    public int updateSupplierStatus(Map map) {
+        return creditMapper.updateSupplierStatus(map);
+    }
+
 }

sc-service/src/main/java/com/huyi/service/util/FlowableService.java

@@ -26,6 +26,8 @@ public class FlowableService {
 	public final static String ADD_GROUP = "api/addGroup";
 	// 删除分组
 	public final static String DELETE_GROUP = "api/deleteGroup";
+	//查询是否配置审批流程
+	public final static String SELECT_APPROVAL = "cloudSupplyChain/selectApproval";
 
 	public Map<String, Object> apiPost(String url, Map<String, Object> param) {
 		return apiPost(url, param, null);
@@ -132,4 +134,14 @@ public class FlowableService {
 		}
 		return map;
 	}
+
+	/**
+	 * 查询是否配置审批流程
+	 * @param map
+	 * @return
+	 */
+	public Map<String, Object> selectApproval(Map<String,Object> map) {
+		return apiPost(SELECT_APPROVAL,map);
+	}
+
 }

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -37,6 +37,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN zc_finance_product p
             ON p.zfp_id = f.zfi_product_id
             WHERE 1=1
+
+        <if test="paramMap.companyType != null  and paramMap.zfiId != '' and paramMap.companyId != null  and paramMap.companyId != ''">
+            <!--核心企业 开立方是自己的-->
+            <if test="paramMap.companyType == '01'">
+                and f.zfi_core_id = #{paramMap.companyId}
+            </if>
+            <!--融资企业 接收方为自己的-->
+            <if test="paramMap.companyType == '02'">
+                and f.zfi_supplier_id = #{paramMap.companyId}
+            </if>
+            <!--资方 融资产品为自己的-->
+            <if test="paramMap.companyType == '03'">
+                and p.zfp_management_id = #{paramMap.companyId}
+            </if>
+        </if>
+
         <if test="paramMap.zfiId != null  and paramMap.zfiId != ''">
             and f.zfi_id = #{paramMap.zfiId}
         </if>
@@ -296,6 +312,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <update id="updateSupplierStatus" parameterType="map" >
+       update
+        zc_finance_inf
+       set  zfi_supplier_status = null
+       where zfi_id = #{paramMap.zfiId}
+    </update>
 
 
 </mapper>