diff --git a/src/main/java/com/example/guoyan/scheduled/ProcessScheduled.java b/src/main/java/com/example/guoyan/scheduled/ProcessScheduled.java index 4970028..4f9d083 100644 --- a/src/main/java/com/example/guoyan/scheduled/ProcessScheduled.java +++ b/src/main/java/com/example/guoyan/scheduled/ProcessScheduled.java @@ -101,7 +101,7 @@ public class ProcessScheduled { /** * 定时任务跑合同和项目信息的变化发给北京,五分钟一次 */ - @Scheduled(cron = "0 0/5 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") public void invoice_request_Process_Scheduled() { //提交参数设置 @@ -482,11 +482,14 @@ public class ProcessScheduled { HashMap hashMapScKpsqsp = otherMapper.selectScKpsqsp_yptbh_ByPjid(sendKpxx.getRequestid()); String fplx = hashMapScKpsqsp.get("fplx"); String fpzl = hashMapScKpsqsp.get("fpzl"); - //发票种类如果是电子发票 + //发票种类如果是电子发票 if("2c9a59b680e0190f0181224a7a76045a".equals(fpzl)&&"增值税普通发票".equals(sendKpxx.getInvoiceType())){ - sendKpxx.setInvoiceType("增值税电子普通发票"); + sendKpxx.setInvoiceType("数电普通发票"); + //发票种类如果是纸质发票 }else if("2c9a59b680e0190f0181224a5c740459".equals(fpzl)&&"数电专用发票".equals(sendKpxx.getInvoiceType())){ sendKpxx.setInvoiceType("增值税专用发票"); + }else if("2c9a59b680e0190f0181224a7a76045a".equals(fpzl)&&"增值税专用发票".equals(sendKpxx.getInvoiceType())){ + sendKpxx.setInvoiceType("数电专用发票"); } String specialInfo = sendKpxx.getSpecialInfo(); if(specialInfo==null){ diff --git a/src/main/resources/mapper/SendXmMapper.xml b/src/main/resources/mapper/SendXmMapper.xml index 8866724..da6dd46 100644 --- a/src/main/resources/mapper/SendXmMapper.xml +++ b/src/main/resources/mapper/SendXmMapper.xml @@ -40,7 +40,7 @@ 'supervision' WHEN name = '咨询' THEN 'advisory' - WHEN name ='监理加咨询' THEN + WHEN name ='咨询+监理' THEN 'supervision_advisory' else 'supervision' END AS name