融信,融资盖章 授信解冻

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

@@ -34,6 +34,8 @@ import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
+
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -1185,6 +1187,70 @@ public class OwnMessageController extends BaseController {
         return f.getAbsolutePath();
     }
 
+    /**
+     * 查询企业当前融信已盖章合同
+     * @param zfiId 融信id
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/listStamped")
+    public AjaxResult listStamped (@RequestParam(required=false) String zfiId) throws Exception {
+        //获取当前用户
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        //获取公司
+        String companyId = use.getCompanyId();
+        //企业类型
+        String companyType = use.getCompanyType();
+        LambdaQueryWrapper<ZcFinanceFileRel> queryWrapper = new LambdaQueryWrapper<>();
+        if ("01".equals(companyType)){
+            //核心企业
+            queryWrapper.eq(ZcFinanceFileRel::getZffrCoreId,companyId);
+        }else if ("02".equals(companyType)){
+            //供应商
+            queryWrapper.eq(ZcFinanceFileRel::getZffrSupplierId,companyId);
+        }
+        queryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId, zfiId);
+        List<ZcFinanceFileRel> financeFileList = financeFileRelService.findZcFinanceFileRels(queryWrapper);
+        ZcFinanceInf zcFinanceInf = financeInfService.getById(zfiId);
+        List<PubFileInf> fileInfList = new ArrayList<>();
+        //返回
+        Map<String,Object> p = new HashMap<>();
+        //文件信息
+        List<Map<String,String>>  list  = new ArrayList<>();
+        p.put("list",list);
+        if (financeFileList.size() > 0){
+            List<String> fileIdList = CommonUtil.getIdFromList(financeFileList,"zffrFileId");
+            LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
+            fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
+            fileInfLambdaQueryWrapper.orderByAsc(PubFileInf::getPfiFileId);
+            fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
+        }
+        if(fileInfList.size() > 0 ){
+            //提取所有的文件url
+            List<String> urlList = CommonUtil.getIdFromList(fileInfList,"pfiFileUrl");
+            //提取文件名
+            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"pfiFileName");
+            for(int i =0 ; i < urlList.size() ;i++){
+                //文件下载
+                String filePath = downloadFile(urlList.get(i),fileNameList.get(i));
+                File pdfFile = new File(filePath);
+                FileInputStream inputFile = new FileInputStream(pdfFile);
+                byte[] buffer = new byte[(int)pdfFile.length()];
+                inputFile.read(buffer);
+                inputFile.close();
+                String base64 = new BASE64Encoder().encode(buffer);
+                //声明map
+                Map<String,String> pm = new HashMap<>();
+                pm.put("filePath",filePath);
+                pm.put("base64",base64);
+                list.add(pm);
+            }
+        }
+        p.put("list",list);
+        return AjaxResult.success(p);
+    }
     public static void main(String[] args){
         WordPdfUtil.doc2pdf("D:\\桌面\\bce10e0a-9255-49f6-a6a7-8c771aeb8941.docx","D:\\桌面\\123.pdf");
     }

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

@@ -693,6 +693,10 @@ public class CreditLineController extends BaseController {
         String zfiAmount = map.get("zfiAmount");
         //授信状态
         String zfpcrStatus = map.get("zfpcrStatus");
+        ZcFinanceProComRel proComRel = iZcFinanceProComRelService.getById(zfpcrId);
+        //到期时间
+        String zfpcrEndDate = proComRel.getZfpcrEndDate();
+
         ZcFinanceProComRel zcFinanceProComRel = new ZcFinanceProComRel();
         //授信id
         zcFinanceProComRel.setZfpcrId(zfpcrId);
@@ -705,12 +709,33 @@ public class CreditLineController extends BaseController {
                 return AjaxResult.error("此授信正在使用无法冻结");
             }
         }else {
+            if (CommonUtil.isNotEmpty(zfpcrEndDate)){
+                Date EndDate = DateUtils.parseDate(zfpcrEndDate,"yyyy-MM-dd");
+                zfpcrEndDate = DateUtils.parseDateToStr("yyyyMMdd",EndDate);
+                //当前时间
+                String currentDate = DateUtils.dateTimeNow("yyyyMMdd");
+                int result = CommonUtil.compare(zfpcrEndDate,currentDate);
+                if (result < 0){
+                    return AjaxResult.error("此授信已到期,请修改到期时间后解冻");
+                }
+            }
             zcFinanceProComRel.setZfpcrStatus("00");
             iZcFinanceProComRelService.updateZcFinanceProComRel(zcFinanceProComRel);
         }
         return AjaxResult.success();
     }
 
+    public static void main(String args[]){
+        //到期时间
+        String zfpcrEndDate = "2021-11-02";
+        Date EndDate = DateUtils.dateTime("yyyy-MM-dd",zfpcrEndDate);
+        zfpcrEndDate = DateUtils.parseDateToStr("yyyyMMdd",EndDate);
+
+        //当前时间
+        String currentDate = DateUtils.dateTimeNow("yyyyMMdd");
+        int a = CommonUtil.compare(zfpcrEndDate,currentDate);
+        System.out.println(a);
+    }
 
     /**
      * 文件下载

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

@@ -114,6 +114,7 @@ public class FinanceRecordController extends BaseController {
                   @RequestParam (required = false) String zfrQuery,
                   @RequestParam (required = false) String zfrValue,
                   @RequestParam (required = false) String zfrQueryStatus,
+                  @RequestParam (required = false) String zfrStatus,
                   @RequestParam (required = false) Map dataTime,QueryRequest request) {
         //查询当前操作员
         LoginUser userInfo = tokenService.getLoginUser();
@@ -129,9 +130,9 @@ public class FinanceRecordController extends BaseController {
         //企业类型
         map.put("companyType",companyType);
         //融资状态
-        if (!"05".equals(zfrQueryStatus)) {
-            map.put("zfrStatus", zfrQueryStatus);
-        }
+//        if (!"05".equals(zfrQueryStatus)) {
+            map.put("zfrStatus", zfrStatus);
+//        }
         //01:我签收的   02:我开立的
         if ("01".equals(zfrTypes)){
             map.put("zfiSupplierId",companyId);

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

@@ -831,6 +831,64 @@ public class RecordSealController extends BaseController {
         iZcChargeInfService.update(zcChargeInf,queryWrapper);
         return AjaxResult.success();
     }
+
+    /**
+     * 查询企业当前融资已盖章合同
+     * @param zfrId 融资id
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/listStamped")
+    public AjaxResult listStamped (@RequestParam(required=false) String zfrId) throws Exception {
+        //获取当前用户
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        //获取公司
+        String companyId = use.getCompanyId();
+        LambdaQueryWrapper<ZcFinanceRecordFileRel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ZcFinanceRecordFileRel::getZfrfrSupplierId,companyId);
+        queryWrapper.eq(ZcFinanceRecordFileRel::getZfrfrFinanceId, zfrId);
+        List<ZcFinanceRecordFileRel> financeFileList = financeRecordFileRelService.findZcFinanceRecordFileRels(queryWrapper);
+        List<PubFileInf> fileInfList = new ArrayList<>();
+        //返回
+        Map<String,Object> p = new HashMap<>();
+        //文件信息
+        List<Map<String,String>>  list  = new ArrayList<>();
+        p.put("list",list);
+        if (financeFileList.size() > 0){
+            List<String> fileIdList = CommonUtil.getIdFromList(financeFileList,"zfrfrFileId");
+            LambdaQueryWrapper<PubFileInf> fileInfLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            fileInfLambdaQueryWrapper.in(PubFileInf::getPfiFileId,fileIdList);
+            fileInfLambdaQueryWrapper.eq(PubFileInf::getPfiIsDel,"00");
+            fileInfLambdaQueryWrapper.orderByAsc(PubFileInf::getPfiFileId);
+            fileInfList = fileInfService.findPubFileInfs(fileInfLambdaQueryWrapper);
+        }
+        if(fileInfList.size() > 0 ){
+//            //提取所有的文件url
+//            List<String> urlList = CommonUtil.getIdFromList(fileInfList,"pfiFileUrl");
+//            //提取文件名
+//            List<String> fileNameList = CommonUtil.getIdFromList(fileInfList,"pfiFileName");
+            for(int i =0 ; i < fileInfList.size() ;i++){
+                System.out.println("第"+i+"次取值,url:"+fileInfList.get(i).getPfiFileUrl()+"---名称:"+fileInfList.get(i).getPfiFileName());
+                //文件下载
+                String filePath = downloadFile(fileInfList.get(i).getPfiFileUrl(),fileInfList.get(i).getPfiFileName());
+                File pdfFile = new File(filePath);
+                FileInputStream inputFile = new FileInputStream(pdfFile);
+                byte[] buffer = new byte[(int)pdfFile.length()];
+                inputFile.read(buffer);
+                inputFile.close();
+                String base64 = new BASE64Encoder().encode(buffer);
+                //声明map
+                Map<String,String> pm = new HashMap<>();
+                pm.put("filePath",filePath);
+                pm.put("base64",base64);
+                list.add(pm);
+            }
+        }
+        p.put("list",list);
+        return AjaxResult.success(p);
+    }
+
     /**
      * 下载远程文件并保存到本地
      * @param remoteFilePath 远程文件路径

sc-service/src/main/resources/mapper/bill/OwnBillMapper.xml

@@ -20,12 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (case when b.zbi_payer_id = #{paramMap.companyId} then '00' else '01' end) 'zbiType'
         FROM
         zc_bill_inf b
-        LEFT JOIN zc_finance_bill_rel rel
-        ON rel.zfbr_bill_id = b.zbi_id
-        LEFT JOIN zc_finance_inf f
-        ON rel.zfbr_finance_id = f.zfi_id
-        AND f.zfi_status != '03'
-        AND f.zfi_status != '99'
+        LEFT JOIN financeInf f
+        ON b.zbi_id = f.zfbr_bill_id
         LEFT JOIN sys_company r
         ON r.scy_id = b.zbi_payer_id
         LEFT JOIN sys_company e