Browse Source

5.29代码提交

“lqy 3 weeks ago
parent
commit
fb1bcd2b24

+ 6 - 0
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);

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

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

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

@@ -68,10 +68,10 @@ public class QiWangController {
     private DDClient_Workflow ddClientWorkflow ;
     @Autowired
     private DDClient_Contacts ddClient_contacts;
-//    private static final String bdurl = "D://qiwang//files//";
-    private static final String bdurl = "C:\\Users\\EDY\\Desktop\\项目\\琦王\\files\\";
-//    private static final String url = "http://47.103.203.2:9092/qiwang/";
-private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
+    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) {

+ 2 - 2
mjava-qiwang/src/main/java/com/malk/qiwang/Service/impl/InvoiceLibraryServiceImpl.java

@@ -96,8 +96,8 @@ public class InvoiceLibraryServiceImpl extends ServiceImpl<InvoiceLibraryMapper,
     private CompanyTitleMapper companyTitleMapper;
     @Autowired
     private DDClient_Contacts ddClient_contacts;
-//    private static final String url = "http://47.103.203.2:9092/qiwang/";
-    private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
+    private static final String url = "http://47.103.203.2:9092/qiwang/";
+//    private static final String url = "http://24120b4f.r39.cpolar.top/qiwang/";
 
     @Override
     public McR invoiceLibrary(Map map) {

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

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