发票批量导入修改

开票申请修改

base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.java

@@ -24,6 +24,9 @@ public class CInvoiceImportHEntity extends BaseEntity {
     private String push_status;
     //推送字段
     private String push_field;
+    //查询日期期间用
+    private String start_date_start;
+    private String start_date_end;
 
     public String getTab_name() {
         return tab_name;
@@ -88,4 +91,20 @@ public class CInvoiceImportHEntity extends BaseEntity {
     public void setPush_field(String push_field) {
         this.push_field = push_field;
     }
+
+    public String getStart_date_start() {
+        return start_date_start;
+    }
+
+    public void setStart_date_start(String start_date_start) {
+        this.start_date_start = start_date_start;
+    }
+
+    public String getStart_date_end() {
+        return start_date_end;
+    }
+
+    public void setStart_date_end(String start_date_end) {
+        this.start_date_end = start_date_end;
+    }
 }

base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml

@@ -18,6 +18,8 @@
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null and id != ''">f.id = #{id}</if>
             <if test="bill_code != null and bill_code != ''">and f.bill_code = #{bill_code}</if>
+            <if test="start_date_start != null and start_date_start != ''">and f.start_date >= #{start_date_start}</if>
+            <if test="start_date_end != null and start_date_end != ''"><![CDATA[   and f.start_date <= #{start_date_end}    ]]> </if>
             and push_status is null
             -- and start_date >= '2025-05-26'
         </trim>

base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java

@@ -77,9 +77,13 @@ public class CInvoiceImportPluginServiceImpl implements ICInvoiceImportPluginSer
             dataSourceCode = requestJson.getString("apiDataSourceCode");
         }
         String id = requestJson.getString("id");//主表id 测试的时候用
+        String start_date_start = requestJson.getString("start_date_start");
+        String start_date_end = requestJson.getString("start_date_end");
         CInvoiceImportHEntity importHEntity = new CInvoiceImportHEntity();
         importHEntity.setDataSourceCode(dataSourceCode);
         importHEntity.setId(id);
+        importHEntity.setStart_date_start(start_date_start);
+        importHEntity.setStart_date_end(start_date_end);
         List<CInvoiceImportHEntity> cInvoiceImportHList = cInvoiceImportHService.queryInvoiceList(importHEntity);
         if (CollectionUtils.isNotEmpty(cInvoiceImportHList)) {
             ParamAssembler assembler = null;

base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/plugin/InvoiceDistributePluginInitializer.java

@@ -1234,9 +1234,12 @@ public class InvoiceDistributePluginInitializer extends PluginBaseEntity {
                 JSONObject attribute = attrObj.getJSONObject("attribute");
                 if (null != attribute && !"0".equals(attribute.getString("code"))){
                     String message = attribute.getString("message");
+                    if (StrUtil.isEmpty(message)){
+                        message = "开票失败";
+                    }
                     InvoiceEntity invoiceEntity = new InvoiceEntity();
                     invoiceEntity.setId(data_id);
-                    invoiceEntity.setResult_status(message);
+                    invoiceEntity.setFailure_reason(message);
                     invoiceEntity.setDataSourceCode("HT-OA");
                     invoiceDao.updateInvoiceResult(invoiceEntity);
                     //查询待办，退回流程用，这里只处理退回的情况，如果要处理提交，要等开票成功后才能提交，去定时查开票结果的定时任务里做
@@ -1246,7 +1249,7 @@ public class InvoiceDistributePluginInitializer extends PluginBaseEntity {
                     ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice);
                     if (null != applyInvoiceEntity){
                         String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), message);
-                        applyInvoiceService.process(stepBack,"8000590006","zzzh");
+                        applyInvoiceService.process(stepBack,"8000590006","ZZZH");
                     }
                 }
             }