Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/bill/controller/OwnBillController.java

@@ -224,6 +224,9 @@ public class OwnBillController extends BaseController {
         zcBillInf.setCreateTime(DateUtils.getNowDate());
         //发票列表
         List<Map<String,String>> fileList = (List<Map<String, String>>) map.get("fileList");
+        if(fileList.size() == 0){
+            return R.fail(500,"往来账款发票数据不能为空，请上传发票后重试");
+        }
         for (Map<String,String> file : fileList) {
             //发票代码
             String ziiNo = CommonUtil.objToString(file.get("ziiNo"));
@@ -403,6 +406,9 @@ public class OwnBillController extends BaseController {
         zcBillInf.setCreateTime(DateUtils.getNowDate());
         //发票列表
         List<Map<String,String>> fileList = (List<Map<String, String>>) map.get("fileList");
+        if(fileList.size() == 0){
+            return R.fail(500,"往来账款发票数据不能为空，请上传发票后重试");
+        }
         for (Map<String,String> file : fileList) {
             //发票id
             String ziiId = CommonUtil.objToString(file.get("ziiId"));
@@ -632,7 +638,7 @@ public class OwnBillController extends BaseController {
         //获取发票信息
         ZcInvoiceInf zcInvoiceInf = iOwnBillService.getInvoice(file);
         if(zcInvoiceInf == null){
-            return R.fail(500,"未识别发票信息");
+            return R.fail(500,"无法识别发票信息");
         }
         LambdaQueryWrapper<ZcInvoiceInf> queryWrapper = new LambdaQueryWrapper<>();
         //发票代码

sc-service/src/main/java/com/huyi/service/bill/service/impl/OwnBillServiceImpl.java

@@ -140,6 +140,7 @@ public class OwnBillServiceImpl implements IOwnBillService {
             zcInvoiceInf.setZiiExcludedAmount(totalAmount);
             zcInvoiceInf.setZiiTotalAmount(totalAmount);
         }catch(Exception e){
+            zcInvoiceInf = null;
             e.printStackTrace();
         }
         //返回获取文字后的发票信息

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

@@ -83,6 +83,11 @@ public class CreditHandleController extends BaseController {
     //消息待办服务类
     @Autowired
     private  RemoteSystemService remoteSystemService;
+    //融信文件关系服务类
+    @Autowired
+    private  IZcFinanceFileRelService financeFileRelService;
+
+
 
     /**
      * 融信确权
@@ -753,9 +758,6 @@ public class CreditHandleController extends BaseController {
                 ps.put("expireDate",expireDateA);
                 //调用替换word中的变量
                 WordUtil.wordTemplate(filePath,filePath,ps);
-                //加载word示例文档
-                Document doc = new Document();
-                doc.loadFromFile(filePath);
                 //保存为PDF格式
                 //截取文件名称
                 //获取.的位置
@@ -854,26 +856,40 @@ public class CreditHandleController extends BaseController {
         }
         return val;
     }
- /*   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("转换成功");
+
+    /**
+     * 获取融信盖章文件
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/getCreditSealFile")
+    public AjaxResult getCreditSealFile(@RequestBody Map<String,Object> map)throws Exception
+    {
+        //获取融信编号
+        String zfiId = CommonUtil.objToString(map.get("zfiId"));
+        //查询融信和文件的关系表
+        LambdaQueryWrapper<ZcFinanceFileRel> relLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        relLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId,zfiId);
+        List<ZcFinanceFileRel>    financeFileRelList =  financeFileRelService.findZcFinanceFileRels(relLambdaQueryWrapper);
+        //文件信息
+        List<PubFileInf>  list  = new ArrayList<>();
+        for(int i = 0 ;  i  < financeFileRelList.size();i ++){
+            ZcFinanceFileRel rel = financeFileRelList.get(i);
+            //获取文件编号
+            String fileId = rel.getZffrFileId();
+            //获取文件信息
+            PubFileInf  fileInf =  fileInfService.getById(fileId);
+            if(fileInf == null){
+                throw new Exception("获取文件信息失败");
+            }
+            list.add(fileInf);
         }
-    }*/
+        //返回
+        Map<String,Object> p = new HashMap<>();
+        p.put("list",list);
+        return AjaxResult.success(p);
+    }
 
 
 

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

@@ -490,9 +490,6 @@ public class OwnMessageController extends BaseController {
                 WordUtil.wordTemplate(filePath,filePath,ps);
                 /**-------- word 变量替换 结束--------**/
                 /**-------- word 转PDF 开始--------**/
-                //加载word示例文档
-                Document doc = new Document();
-                doc.loadFromFile(filePath);
                 //保存为PDF格式
                 //截取文件名称
                 //获取.的位置

sc-service/src/main/java/com/huyi/service/rel/controller/OwnCompanyRelController.java

@@ -330,6 +330,13 @@ public class OwnCompanyRelController extends BaseController
         if(CommonUtil.isEmpty(scyName)){
             throw new Exception("企业名称不能为空");
         }
+        String checkScyName = "^[\\u4E00-\\u9FFF0-9A-Z《》()]+$";
+        Pattern regeScyName = Pattern.compile(checkScyName);
+        Matcher matcherScyName = regeScyName.matcher(scyName);
+        boolean isMatScyName = matcherScyName.matches();
+        if(!isMatScyName){
+            throw new Exception("企业名称不能存在特殊字符");
+        }
         //统一社会信用代码
         String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
         if(CommonUtil.isEmpty(scySocialCode)){
@@ -350,7 +357,7 @@ public class OwnCompanyRelController extends BaseController
                 throw new Exception("联系人过长");
             }
             //联系人正则校验
-            String checkNickName = "^([\\u4e00-\\u9fa5]+|[a-zA-Z0-9]+)$";
+            String checkNickName = "^[A-Za-z\\u4e00-\\u9fa5]+$";
             Pattern regeNickName = Pattern.compile(checkNickName);
             Matcher matcherNickName = regeNickName.matcher(scrContarct);
             boolean isMatNickName = matcherNickName.matches();

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

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="paramMap.companyName != null and paramMap.companyName != '' ">
             AND (s.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') OR p.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%'))
         </if>
-        AND r.scr_status != '99'
+        AND r.scr_status = '01'
         ORDER BY r.create_time DESC
     </select>
 </mapper>

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

@@ -34,10 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--已融资供应商数量-->
     <select id="getFinanceSupplier" parameterType="map" resultType="java.lang.String">
         SELECT
-          COUNT(DISTINCT zfsq_company_id)	'num'
+          COUNT(DISTINCT zfi_supplier_id)	'num'
         FROM
-          zc_finance_supplier_quota
-        WHERE zfsq_status != '99'
+          zc_finance_inf
+        WHERE  zfi_status IN ('02','04','05','07')
     </select>
 
     <!--已签发业务核心企业数量-->