往来账款、首页禅道bug修改

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/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>
 
     <!--已签发业务核心企业数量-->