Merge branch 'branch-nt-2022-12-27' of https://git.flowbb.cn/RK-Dev/fqgz-server into branch-nt-2022-12-27

eladmin-system/src/main/java/me/zhengjie/application/admin/job/GenerateNotarizationJob.java

@@ -16,13 +16,11 @@ import me.zhengjie.dao.mybatis.mapper.NotaryOfficeMapper;
 import me.zhengjie.dao.mybatis.mapper.OrderFileMapper;
 import me.zhengjie.dao.mybatis.mapper.SysUserMapper;
 import me.zhengjie.utils.StringUtils;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 生成公证书定时任务
@@ -41,28 +39,21 @@ public class GenerateNotarizationJob {
      * 生成签名公证书
      */
     @XxlJob("generateSignedNotarization")
-    public void generateSignedNotarization(){
+    public void generateSignedNotarization() {
         XxlJobHelper.log("Generate signed notarization beginning ......");
-        List<ContractOrderEntity> orderList = contractOrderRepository.canBeAutoSignedOrder();
-        if (orderList != null && orderList.size() > 0) {
-            List<String> collection = orderList.stream().map(ContractOrderEntity::getBusinessNo).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(collection)) {
-                List<OrderFileEntity> orderFileList = orderFileRepository.canBeSignedNotarization(collection);
-                for (OrderFileEntity orderFile : orderFileList) {
-                    try {
-                        if(StringUtils.isEmpty(orderFile.getAxqContractNo())) {
-                            signNotarization(orderFile);
-                        }
-                        if(StringUtils.isEmpty(orderFile.getSignedPdfUrl())) {
-                            downloadNotarization(orderFile);
-                        }
-                    }catch (Exception e){
-                        e.printStackTrace();
-                        XxlJobHelper.log(e.getMessage());
-                    }
+        List<OrderFileEntity> orderFileList = orderFileRepository.canBeSignedNotarization();
+        for (OrderFileEntity orderFile : orderFileList) {
+            try {
+                if (StringUtils.isEmpty(orderFile.getAxqContractNo())) {
+                    signNotarization(orderFile);
                 }
+                if (StringUtils.isEmpty(orderFile.getSignedPdfUrl())) {
+                    downloadNotarization(orderFile);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                XxlJobHelper.log(e.getMessage());
             }
-    
         }
         XxlJobHelper.log("Generate signed notarization endding ......");
     }
@@ -139,7 +130,6 @@ public class GenerateNotarizationJob {
         orderFileMapper.updateById(saveOrderFile);
     }
 
-
     /**
      * 更新已签发时间
      * @param no

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/OrderFileRepository.java

@@ -85,14 +85,13 @@ public class OrderFileRepository {
     /**
      * 获取指定订单可以签名的公证书列表
      *
-     * @param bizNoList
      * @return
      */
-    public List<OrderFileEntity> canBeSignedNotarization(List<String> bizNoList) {
+    public List<OrderFileEntity> canBeSignedNotarization() {
         QueryWrapper<OrderFileEntity> qw = new QueryWrapper<>();
-        qw.in("business_no", bizNoList);
-        qw.in("code", OrderFileConstant.TYPE_CODE_NOTARIZATION);
+        qw.eq("code", OrderFileConstant.TYPE_CODE_NOTARIZATION);
         qw.isNotNull("doc_no");
+        qw.isNull("axq_contract_no");
         return orderFileMapper.selectList(qw);
     }