Merge branch 'master' of https://mc.cloudpure.cn/mjava/cont

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderServiceImpl.java

@@ -201,6 +201,9 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     String wlbm = safeGetString(item, "textField_mfbx1pqt");
 //                    String wlbm = "010101010003";
                     String wlmc = safeGetString(item, "textField_mfbx1pqs");
+                    String tcfpfs = safeGetString(item, "textField_mpqmsz2q");
+                    String yjfpfs = safeGetString(item, "textField_mpqmsz2r");
+                    String fpxsy = safeGetString(item, "textField_mpqmsz2s");
                     String ggxh = safeGetString(item, "textField_mfbx1pqr");
                     String xsdw = safeGetString(item, "textField_mfbx1pqq");
                     int xssl = parseInt(safeGetString(item, "numberField_mfbx1pr4"), 0);
@@ -236,6 +239,9 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                     table1Map.put("sfzp", sfzp);
                     table1Map.put("bz", bz1);
                     table1Map.put("sl", sl);
+                    table1Map.put("tcfpfs", tcfpfs);
+                    table1Map.put("yjfpfs", yjfpfs);
+                    table1Map.put("fpxsy", fpxsy);
                     table1Map.put("se1", zse);
                     table1Map.put("bbh", bbh);
                     table1Map.put("je1", zje);

mjava-qiwang/src/main/java/com/malk/qiwang/Controller/InvoiceLibraryController.java

@@ -53,6 +53,7 @@ public class InvoiceLibraryController {
     private InvoiceLibraryMapper baseMapper;
     private static final String url = "http://47.103.203.2:9092/qiwang/";
             //员工报销
+//private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
     @PostMapping("/invoiceLibrary")
     public McR test(@RequestBody Map map)  {
         log.info("map:{}", map);

mjava-qiwang/src/main/java/com/malk/qiwang/Controller/QiWangController.java

@@ -70,14 +70,17 @@ public class QiWangController {
     private DDClient_Contacts ddClient_contacts;
     private static final String bdurl = "D://qiwang//files//";
     private static final String url = "http://47.103.203.2:9092/qiwang/";
+//    private static final String bdurl = "C:\\Users\\EDY\\Desktop\\项目\\琦王\\files\\";
+//private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
     @PostMapping("/test")
+
     public McR test(@RequestBody Map map) {
         log.info("map:{}", map);
         String processInstanceId = UtilMap.getString(map, "processInstanceId");
 
-        // 获取审批实例信息
-//        Map processInstance = ddClientWorkflow.getProcessInstanceId(ddClient.getAccessToken(), processInstanceId);
-//        System.out.println("processInstance====" + processInstance);
+//         获取审批实例信息
+        Map processInstance = ddClientWorkflow.getProcessInstanceId(ddClient.getAccessToken(), processInstanceId);
+        System.out.println("processInstance====" + processInstance);
 //
 //        if (Objects.nonNull(processInstance)) {
 //            List<Map> formComponentValues = (List<Map>) processInstance.get("formComponentValues");
@@ -430,6 +433,12 @@ public McR test4(@RequestBody Map map) {
         List<String> nos=new ArrayList<>();
         List<McInvoiceDto> result = invoices.stream().map(item -> {
             Map prop = UtilMap.getMap(UtilMap.getMap(item, "SingleInvoiceInfos"), UtilMap.getString(item, "SubType"));
+
+            List<Map<String, Object>> vatInvoiceItemInfos = UtilMap.getList(prop, "VatInvoiceItemInfos");
+            if (!vatInvoiceItemInfos.isEmpty()) {
+                String taxRate = UtilMap.getString(vatInvoiceItemInfos.get(0), "TaxRate");
+                System.out.println("TaxRate: " + taxRate); // 输出: 9%
+            }
             System.out.println("prop====="+prop);
             String no=UtilMap.getString(prop, "Number");
             if(nos.contains(no)){

mjava-qiwang/src/main/java/com/malk/qiwang/entity/InvoiceLibrary.java

@@ -133,8 +133,25 @@ public class InvoiceLibrary implements Serializable {
     private String paySubject;
 //    付款账号
     private String payAccount;
+
     //银行全称
     private String bankName;
+
     //是否长摊
     private String isLongTerm;
+
+    //是否有发票
+    private String hasInvoice;
+
+    //子表报销金额
+    private BigDecimal detailAmount;
+
+    //共享税额
+    private BigDecimal sharedTaxAmount;
+
+    //共享未税金额
+    private BigDecimal sharedAmount;
+
+    //共享税率
+    private String sharedRate;
 }

mjava-qiwang/src/main/java/com/malk/qiwang/model/McInvoiceDto.java

@@ -156,6 +156,9 @@ public class McInvoiceDto extends BaseDto {
      */
     private String arrivePort;
 
+    //税率
+    private String taxRate;
+
     /**
      * 出发时间 [yyyy-MM-dd HH:mm]
      */
@@ -190,7 +193,7 @@ public class McInvoiceDto extends BaseDto {
      */
     public static Map formatDtoLabelAndProp() {
 
-        Map data = UtilMap.map("发票名称, 发票类型, 发票代码, 发票号码, 开票日期, 校验码, 价税合计, 不含税金额, 税额", "name, kindName, code, serial, date, checkCode, amount, excludingTax, tax");
+        Map data = UtilMap.map("发票名称, 发票类型, 发票代码, 发票号码, 开票日期, 校验码, 价税合计, 不含税金额, 税额, 税率", "name, kindName, code, serial, date, checkCode, amount, excludingTax, tax, taxRate");
         data.putAll(UtilMap.map("购买方名称, 购买方税号, 销售方名称, 销售方税号", "buyerName, buyerTaxId, sellerName, sellerTaxId"));
         data.putAll(UtilMap.map("乘客姓名, 座位类型, 出发地, 到达地, 出发时间, 车次编号/航班号, 保险费, 燃油附加费, 民航发展基金", "passengerName, seatType, departurePort, arrivePort, departureTime, trainNo, insuranceCosts, fuelCosts, constructionCosts"));
         return data;

mjava-qiwang/src/main/resources/application-dev.yml

@@ -23,7 +23,8 @@ dingtalk:
   operator: 16441447913471369 #刘志
   operatorUnionId: 99iiLnPefWJRBnaze9vB2fQiEiE #刘志
   spaceId: 660951480
-  downloadPath: D:\\qiwang\\files\\
+#  downloadPath: D:\\qiwang\\files\\
+  downloadPath: C:\\Users\\EDY\\Desktop\\项目\\琦王\\files\\
 #  agentId: 2691784047
 #  appKey: dinghbynhnd2dbgypmsa
 #  appSecret: Kl5Xw8x0TlEIlvcJuUkYZD18UTTShJmfdKrAIpY8oX-Q_tazyUKA28nQh7dG5-mq

mjava-qiwang/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 100MB

mjava-xiaoliu/src/main/resources/application-dev.yml

@@ -7,9 +7,10 @@ enable:
   scheduling: ture
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/xiaoliu/log/
   level:
     com.malk.*: info
+  file:
+    path: /home/server/xiaoliu/log/
 
 
 mybatis-plus:
@@ -18,7 +19,7 @@ mybatis-plus:
     map-underscore-to-camel-case: false
     #开启日志打印
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  type-aliases-package: com.malk.hengyilong.entity
+  type-aliases-package: com.malk.xiaoliu.entity
   #扫描mapper文件
   mapper-locations: classpath:mapper/*.xml
 

mjava-xiaoliu/src/main/resources/application-prod.yml

@@ -7,9 +7,10 @@ enable:
   scheduling: ture
 logging:
   config: classpath:logback-spring.xml
-  path: /home/server/xiaoliu/log/
   level:
     com.malk.*: info
+  file:
+    path: /home/server/xiaoliu/log/
 
 mybatis-plus:
   configuration:
@@ -32,8 +33,8 @@ dingtalk:
   operator:
 
 aliwork:
-  appType: APP_QX8IOI1D22HK3GC413L5
-  systemToken: AXD66JB143P1C5Q8K93RR75ZEXSK2379ZYHJMP09
+  appType: APP_UGY7IRUWT1C8619BR7VV
+  systemToken: O7G66671RZX4QKZMI2M5V5AOY7WZ2BQR351OM11
 
 rhr:
   host: https://app91651.eapps.dingtalkcloud.com