补充资料审批判断是否需要平台审批

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

@@ -396,10 +396,10 @@ public class ApprovalServiceImpl implements ApprovalService {
         JSONObject jsonObj=new JSONObject(map);
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
+        //融信id
+        String zfiId = CommonUtil.objToString(map.get("zfiId"));
         //发起审批成功
         if ("200".equals(resMap.get("code"))){
-            //融信id
-            String zfiId = CommonUtil.objToString(map.get("zfiId"));
             ZcFinanceInf zfi = new ZcFinanceInf();
             zfi.setZfiId(zfiId);
             //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
@@ -417,8 +417,37 @@ public class ApprovalServiceImpl implements ApprovalService {
             //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
             zcFinanceInf.setZfiSupplierStatus("01");
             zcFinanceInfService.updateById(zcFinanceInf);
-            //调用平台审批
-            approvalService.addPlatformApproval(map);
+            //融信id查询融资产品
+            ZcFinanceInf inf = zcFinanceInfService.getById(zfiId);
+            //查询融资产品是否需要平台审批
+            ZcFinanceProduct zcFinanceProduct = zcFinanceProductService.getById(CommonUtil.objToString(map.get("zfiProductId")));
+            //是否需平台审批(0:不需要,1:需要)
+            String zfpPlatform = zcFinanceProduct.getZfpPlatform();
+            if ("1".equals(zfpPlatform)) {
+                //调用平台审批
+                Map maps = new HashMap();
+                if (inf != null) {
+                    BeanMap beanMap = BeanMap.create(inf);
+                    for (Object key : beanMap.keySet()) {
+                        maps.put(key + "", beanMap.get(key));
+                    }
+                }
+                //调用平台审批
+                approvalService.addPlatformApproval(maps);
+            }else {
+                ZcFinanceInf financeInf = new ZcFinanceInf();
+                //主键
+                financeInf.setZfiId(zfiId);
+                //平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+                financeInf.setZfiPlatformStatus("01");
+                //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
+                financeInf.setZfiSupplierStatus("01");
+                //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
+                financeInf.setZfiStatus("02");
+                //签收日期
+                financeInf.setZfiSignDate(DateUtils.getNowDate());
+                zcFinanceInfService.updateById(financeInf);
+            }
         }else if ("450".equals(resMap.get("code"))){
             throw new Exception("未配置审批流程!");
         }else if (!"200".equals(resMap.get("code"))) {

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

@@ -593,7 +593,15 @@ public class RecordSealController extends BaseController {
             String userId = "CA74686406B322C7E05311016B0A442F";
             //项目编号
             String projectCode = DateUtils.dateTimeNow();
-            JSONObject jsonObject = AxqCommonUtil.contractSigning(userId,"MM",fileName,keyWords,"0","0","250","250",projectCode,filePath,new HttpConnector("D:/anxinsign.jks", "123456", "Test", "CA4572A39DCB55ABE05311016B0A04B3"));
+            //jks路径
+            String jksPath = configService.selectConfigByKey("jks_path").getMsg();
+            //密码
+            String keyStorePassword = configService.selectConfigByKey("cfca_key_store_password").getMsg();
+            //渠道
+            String channel = configService.selectConfigByKey("cfca_channel").getMsg();
+            //platId
+            String platId = configService.selectConfigByKey("cfca_platId").getMsg();
+            JSONObject jsonObject = AxqCommonUtil.contractSigning(userId,"MM",fileName,keyWords,"0","0","250","250",projectCode,filePath,new HttpConnector(jksPath,keyStorePassword, channel,platId));
             /**-------- CFCA盖章 结束--------**/
             /**-------- CFCA盖章文件下载 开始--------**/
             //获取错误码
@@ -612,7 +620,7 @@ public class RecordSealController extends BaseController {
             //String path = "D:/zhuomian/cfca/";
             String path = configService.selectConfigByKey("cfca_file_path").getMsg();
             //下载文件
-            AxqCommonUtil.downloadFile(contractNo,path,new HttpConnector("D:/anxinsign.jks", "123456", "Test", "CA4572A39DCB55ABE05311016B0A04B3"));
+            AxqCommonUtil.downloadFile(contractNo,path,new HttpConnector(jksPath,keyStorePassword,channel,platId));
             /**-------- CFCA盖章文件下载 结束--------**/
             //上传到文件服务器
             //获取token
@@ -760,26 +768,17 @@ public class RecordSealController extends BaseController {
         }
         return f.getAbsolutePath();
     }
- /*   public static void main(String[] args) {
-        String date = DateUtils.dateTimeNow();
-        List<String> urlList = new ArrayList<>();
-        urlList.add("http://huyi.img.minpay.cc/file/000000/doc/20210823/8a2ea656-8f98-4d37-98a1-132c1d4fc768.doc");
-        //提取文件名
-        List<String> fileNameList = new ArrayList<>();
-        fileNameList.add("招采文件.doc");
-        for(int i =0 ; i < urlList.size() ;i++){
-            String directory = FileConstants.REMOTE_FILE_PATH;
-            //文件下载
-            String filePath = downloadFile(urlList.get(i),fileNameList.get(i));
-            //加载word示例文档
-            Document doc = new Document();
-            doc.loadFromFile(filePath);
-            //保存为PDF格式
-            doc.saveToFile(directory + fileNameList.get(i) +date+ ".pdf", FileFormat.PDF);
-            filePath = directory + fileNameList.get(i) +date+ ".pdf";
-            System.out.println("转换成功");
-        }
-    }*/
+//    public static void main(String[] args) throws Exception{
+//        int days = 14;
+//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//注意月份是MM
+//        GregorianCalendar cal = new GregorianCalendar();
+//        Date date = simpleDateFormat.parse("2021-09-30 00:00:00");
+//        cal.setTime(date);
+//        cal.add(Calendar.DATE, -days);
+//        String date2 = DateUtils.parseDateToStr("yyyy-MM-dd",cal.getTime());
+//        System.out.println(DateUtils.parseDateToStr("yyyy-MM-dd",cal.getTime()));
+//
+//    }