Administrator 3 lat temu
rodzic
commit
f9e57e76c2
48 zmienionych plików z 658 dodań i 1175 usunięć
  1. 242 305
      .idea/workspace.xml
  2. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar
  3. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original
  4. 4 4
      sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml
  5. 1 1
      sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt
  6. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar
  7. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original
  8. 4 4
      sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml
  9. 1 1
      sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt
  10. 39 5
      test-api/src/main/java/com/sooka/api/Guiji_Gjj.java
  11. 275 206
      test-api/src/main/java/com/sooka/service/impl/Guiji_Gjj_ServiceImpl.java
  12. 4 4
      test-api/src/main/resources/application-dev.yml
  13. 4 1
      test-api/src/main/resources/mapper/TgjjBsxxMapper.xml
  14. 1 1
      test-api/src/main/resources/mapper/TgjjBsxxMapper2.xml
  15. 1 1
      test-api/src/main/resources/mapper/TgjjDbxxMapper.xml
  16. 4 3
      test-api/src/main/resources/mapper/TgjjDbxxMapper2.xml
  17. 1 1
      test-api/src/main/resources/mapper/TgjjDkxxMapper.xml
  18. 3 2
      test-api/src/main/resources/mapper/TgjjDkxxMapper2.xml
  19. 1 1
      test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper.xml
  20. 4 3
      test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper2.xml
  21. 1 1
      test-api/src/main/resources/mapper/TgjjDwxxMapper.xml
  22. 4 3
      test-api/src/main/resources/mapper/TgjjDwxxMapper2.xml
  23. 1 1
      test-api/src/main/resources/mapper/TgjjDwzhxxMapper.xml
  24. 4 3
      test-api/src/main/resources/mapper/TgjjDwzhxxMapper2.xml
  25. 1 1
      test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper.xml
  26. 4 3
      test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper2.xml
  27. 1 1
      test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper.xml
  28. 4 3
      test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper2.xml
  29. 1 1
      test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper.xml
  30. 4 3
      test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper2.xml
  31. 1 1
      test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper.xml
  32. 4 3
      test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper2.xml
  33. 1 1
      test-api/src/main/resources/mapper/TgjjGrxxMapper.xml
  34. 4 3
      test-api/src/main/resources/mapper/TgjjGrxxMapper2.xml
  35. 1 1
      test-api/src/main/resources/mapper/TgjjGrzhxxMapper.xml
  36. 4 3
      test-api/src/main/resources/mapper/TgjjGrzhxxMapper2.xml
  37. 1 1
      test-api/src/main/resources/mapper/TgjjGtjkrxxMapper.xml
  38. 4 3
      test-api/src/main/resources/mapper/TgjjGtjkrxxMapper2.xml
  39. 1 1
      test-api/src/main/resources/mapper/TgjjHmdxxMapper.xml
  40. 4 3
      test-api/src/main/resources/mapper/TgjjHmdxxMapper2.xml
  41. 1 1
      test-api/src/main/resources/mapper/TgjjKjhzbMapper.xml
  42. 4 3
      test-api/src/main/resources/mapper/TgjjKjhzbMapper2.xml
  43. 1 1
      test-api/src/main/resources/mapper/TgjjZcxxMapper.xml
  44. 4 3
      test-api/src/main/resources/mapper/TgjjZcxxMapper2.xml
  45. 4 4
      test-api/target/classes/application-dev.yml
  46. 4 551
      test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml
  47. 1 29
      test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt
  48. BIN
      test-api/target/test-api-0.0.1-SNAPSHOT.jar.original

Plik diff jest za duży
+ 242 - 305
.idea/workspace.xml


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original


Plik diff jest za duży
+ 4 - 4
sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml


+ 1 - 1
sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.AuthApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.994 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.411 s - in com.sooka.AuthApplicationTests

BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar


BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original


Plik diff jest za duży
+ 4 - 4
sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml


+ 1 - 1
sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.gateway.GatewayApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.807 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.636 s - in com.sooka.gateway.GatewayApplicationTests

+ 39 - 5
test-api/src/main/java/com/sooka/api/Guiji_Gjj.java

@@ -8,6 +8,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 
 @Configuration      //1.主要用于标记配置类,兼备Component的效果。
@@ -17,13 +20,44 @@ public class Guiji_Gjj extends BaseApi  {
     @Resource
     Guiji_Gjj_Service guiji_gjj_service;
 
-    final String scheduTime_1 = "0 10 09 ? * *";
-    final String scheduTime_2 = "0 0 0-23 * * ?";
-
+    final String scheduTime_1 = "0 31 12 ? * *";
+    final String scheduTime_2 = "0 31 01 ? * *";
 
+//    final String scheduTime_1 = "0 56 12 ? * *";
+//    final String scheduTime_2 = "0 58 12 ? * *";
     @Scheduled(cron = scheduTime_1)
-    public ResultModel guiji_housingconstruction_hqryzxsjjk() {
-        guiji_gjj_service.data_schedu("2021-11-15 09:05:00","2021-11-15 10:05:00");
+    public ResultModel gjj_0_12() {
+        Date t = new Date();
+        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+        String d =f.format(t);
+        //取当天0-12点
+        String begin_time = d+" 00:00:00";
+        String end_time = d+" 12:00:00";
+        System.out.println("am :"+begin_time+" "+end_time);
+        guiji_gjj_service.data_schedu(begin_time,end_time);
         return null;
     }
+
+    @Scheduled(cron = scheduTime_2)
+    public ResultModel gjj_12_24() {
+        Calendar   cal   =   Calendar.getInstance();
+        cal.add(Calendar.DATE,   -1);
+        String yesterday = new SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime());
+        //取当天0-12点
+        String begin_time = yesterday+" 12:00:00";
+        String end_time = yesterday+" 24:59:00";
+        System.out.println("pm :"+begin_time+" "+end_time);
+        guiji_gjj_service.data_schedu(begin_time,end_time);
+        return null;
+    }
+
+    public static void main(String[] args){
+        Calendar   cal   =   Calendar.getInstance();
+        cal.add(Calendar.DATE,   -1);
+        String yesterday = new SimpleDateFormat( "yyyy-MM-dd ").format(cal.getTime());
+        System.out.println(yesterday);
+
+    }
+
+
 }

+ 275 - 206
test-api/src/main/java/com/sooka/service/impl/Guiji_Gjj_ServiceImpl.java

@@ -101,252 +101,321 @@ public class Guiji_Gjj_ServiceImpl implements Guiji_Gjj_Service {
     @Override
     public void data_schedu(String begin_time,String end_time) {
 
-
-
-
-        TgjjBsxx tgjjBsxx = new TgjjBsxx();
-        tgjjBsxx.setSearch_begintime(begin_time);
-        tgjjBsxx.setSearch_endtime(end_time);
-        List<TgjjBsxx> ls_tgjjBsxx = tgjjBsxxMapper.selectTgjjBsxxList(tgjjBsxx);
-        System.out.println("=========bsxx======"+ls_tgjjBsxx.size());
-        for(int i=0;i<ls_tgjjBsxx.size();i++){
-            System.out.println("==========="+i);
-            TgjjBsxx t = ls_tgjjBsxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjBsxxMapper2.insertTgjjBsxx(t);
-            }else{
-                tgjjBsxxMapper2.updateTgjjBsxx(t);
+        //1
+        try{
+            TgjjBsxx tgjjBsxx = new TgjjBsxx();
+            tgjjBsxx.setSearch_begintime(begin_time);
+            tgjjBsxx.setSearch_endtime(end_time);
+            List<TgjjBsxx> ls_tgjjBsxx = tgjjBsxxMapper.selectTgjjBsxxList(tgjjBsxx);
+            System.out.println(begin_time+"  "+end_time+"=========bsxx======"+ls_tgjjBsxx.size());
+            for(int i=0;i<ls_tgjjBsxx.size();i++){
+                TgjjBsxx t = ls_tgjjBsxx.get(i);
+                System.out.println(t.getLastUpdateTime()+"==========="+i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjBsxxMapper2.insertTgjjBsxx(t);
+                }else{
+                    tgjjBsxxMapper2.updateTgjjBsxx(t);
+                }
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
 
-        TgjjDbxx tgjjDbxx = new TgjjDbxx();
-        tgjjDbxx.setSearch_begintime(begin_time);
-        tgjjDbxx.setSearch_endtime(end_time);
-        List<TgjjDbxx> ls_tgjjDbxx = tgjjDbxxMapper.selectTgjjDbxxList(tgjjDbxx);
-        for(int i=0;i<ls_tgjjDbxx.size();i++){
-            TgjjDbxx t = ls_tgjjDbxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjDbxxMapper2.insertTgjjDbxx(t);
-            }else{
-                tgjjDbxxMapper2.updateTgjjDbxx(t);
-            }
-
-        }
 
+//2
+        try{
+            TgjjDbxx tgjjDbxx = new TgjjDbxx();
+            tgjjDbxx.setSearch_begintime(begin_time);
+            tgjjDbxx.setSearch_endtime(end_time);
+            List<TgjjDbxx> ls_tgjjDbxx = tgjjDbxxMapper.selectTgjjDbxxList(tgjjDbxx);
+            for(int i=0;i<ls_tgjjDbxx.size();i++){
+                TgjjDbxx t = ls_tgjjDbxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjDbxxMapper2.insertTgjjDbxx(t);
+                }else{
+                    tgjjDbxxMapper2.updateTgjjDbxx(t);
+                }
 
-        TgjjDkxx tgjjDkxx = new TgjjDkxx();
-        tgjjDkxx.setSearch_begintime(begin_time);
-        tgjjDkxx.setSearch_endtime(end_time);
-        List<TgjjDkxx> ls_tgjjDkxx = tgjjDkxxMapper.selectTgjjDkxxList(tgjjDkxx);
-        for(int i=0;i<ls_tgjjDkxx.size();i++){
-            TgjjDkxx t = ls_tgjjDkxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjDkxxMapper2.insertTgjjDkxx(t);
-            }else{
-                tgjjDkxxMapper2.updateTgjjDkxx(t);
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-        TgjjDwckzhbdxx tgjjDwckzhbdxx = new TgjjDwckzhbdxx();
-        tgjjDwckzhbdxx.setSearch_begintime(begin_time);
-        tgjjDwckzhbdxx.setSearch_endtime(end_time);
-        List<TgjjDwckzhbdxx> ls_tgjjDwckzhbdxx = tgjjDwckzhbdxxMapper.selectTgjjDwckzhbdxxList(tgjjDwckzhbdxx);
-        for(int i=0;i<ls_tgjjDwckzhbdxx.size();i++){
-            TgjjDwckzhbdxx t = ls_tgjjDwckzhbdxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjDwckzhbdxxMapper2.insertTgjjDwckzhbdxx(t);
-            }else{
-                tgjjDwckzhbdxxMapper2.updateTgjjDwckzhbdxx(t);
+//
+//3
+        try{
+            TgjjDkxx tgjjDkxx = new TgjjDkxx();
+            tgjjDkxx.setSearch_begintime(begin_time);
+            tgjjDkxx.setSearch_endtime(end_time);
+            List<TgjjDkxx> ls_tgjjDkxx = tgjjDkxxMapper.selectTgjjDkxxList(tgjjDkxx);
+            for(int i=0;i<ls_tgjjDkxx.size();i++){
+                TgjjDkxx t = ls_tgjjDkxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjDkxxMapper2.insertTgjjDkxx(t);
+                }else{
+                    tgjjDkxxMapper2.updateTgjjDkxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
-        TgjjDwxx tgjjDwxx = new TgjjDwxx();
-        tgjjDwxx.setSearch_begintime(begin_time);
-        tgjjDwxx.setSearch_endtime(end_time);
-        List<TgjjDwxx> ls_tgjjDwxx = tgjjDwxxMapper.selectTgjjDwxxList(tgjjDwxx);
-        for(int i=0;i<ls_tgjjDwxx.size();i++){
-            TgjjDwxx t = ls_tgjjDwxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjDwxxMapper2.insertTgjjDwxx(t);
-            }else{
-                tgjjDwxxMapper2.updateTgjjDwxx(t);
+//4
+        try{
+            TgjjDwckzhbdxx tgjjDwckzhbdxx = new TgjjDwckzhbdxx();
+            tgjjDwckzhbdxx.setSearch_begintime(begin_time);
+            tgjjDwckzhbdxx.setSearch_endtime(end_time);
+            List<TgjjDwckzhbdxx> ls_tgjjDwckzhbdxx = tgjjDwckzhbdxxMapper.selectTgjjDwckzhbdxxList(tgjjDwckzhbdxx);
+            for(int i=0;i<ls_tgjjDwckzhbdxx.size();i++){
+                TgjjDwckzhbdxx t = ls_tgjjDwckzhbdxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjDwckzhbdxxMapper2.insertTgjjDwckzhbdxx(t);
+                }else{
+                    tgjjDwckzhbdxxMapper2.updateTgjjDwckzhbdxx(t);
+                }
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
-        TgjjDwzhxx dwzhxx = new TgjjDwzhxx();
-        dwzhxx.setSearch_begintime(begin_time);
-        dwzhxx.setSearch_endtime(end_time);
-        List<TgjjDwzhxx> ls_dwzhxx = tgjjDwzhxxMapper.selectTgjjDwzhxxList(dwzhxx);
-        for (int i = 0; i < ls_dwzhxx.size(); i++) {
-            TgjjDwzhxx t = ls_dwzhxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjDwzhxxMapper2.insertTgjjDwzhxx(t);
-            }else{
-                tgjjDwzhxxMapper2.updateTgjjDwzhxx(t);
+//5
+        try{
+            TgjjDwxx tgjjDwxx = new TgjjDwxx();
+            tgjjDwxx.setSearch_begintime(begin_time);
+            tgjjDwxx.setSearch_endtime(end_time);
+            List<TgjjDwxx> ls_tgjjDwxx = tgjjDwxxMapper.selectTgjjDwxxList(tgjjDwxx);
+            for(int i=0;i<ls_tgjjDwxx.size();i++){
+                TgjjDwxx t = ls_tgjjDwxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjDwxxMapper2.insertTgjjDwxx(t);
+                }else{
+                    tgjjDwxxMapper2.updateTgjjDwxx(t);
+                }
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
-
-        TgjjGrckzhbdxx tgjjGrckzhbdxx = new TgjjGrckzhbdxx();
-        tgjjGrckzhbdxx.setSearch_begintime(begin_time);
-        tgjjGrckzhbdxx.setSearch_endtime(end_time);
-        List<TgjjGrckzhbdxx> ls_tgjjGrckzhbdxx = tgjjGrckzhbdxxMapper.selectTgjjGrckzhbdxxList(tgjjGrckzhbdxx);
-        for (int i = 0; i < ls_tgjjGrckzhbdxx.size(); i++) {
-            TgjjGrckzhbdxx t = ls_tgjjGrckzhbdxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGrckzhbdxxMapper2.insertTgjjGrckzhbdxx(t);
-            }else{
-                tgjjGrckzhbdxxMapper2.updateTgjjGrckzhbdxx(t);
+//6
+        try{
+            TgjjDwzhxx dwzhxx = new TgjjDwzhxx();
+            dwzhxx.setSearch_begintime(begin_time);
+            dwzhxx.setSearch_endtime(end_time);
+            List<TgjjDwzhxx> ls_dwzhxx = tgjjDwzhxxMapper.selectTgjjDwzhxxList(dwzhxx);
+            for (int i = 0; i < ls_dwzhxx.size(); i++) {
+                TgjjDwzhxx t = ls_dwzhxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjDwzhxxMapper2.insertTgjjDwzhxx(t);
+                }else{
+                    tgjjDwzhxxMapper2.updateTgjjDwzhxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-
-        TgjjGrdkyqxx tgjjGrdkyqxx = new TgjjGrdkyqxx();
-        tgjjGrdkyqxx.setSearch_begintime(begin_time);
-        tgjjGrdkyqxx.setSearch_endtime(end_time);
-        List<TgjjGrdkyqxx> ls_tgjjGrdkyqxx = tgjjGrdkyqxxMapper.selectTgjjGrdkyqxxList(tgjjGrdkyqxx);
-        for (int i = 0; i < ls_tgjjGrdkyqxx.size(); i++) {
-            TgjjGrdkyqxx t = ls_tgjjGrdkyqxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGrdkyqxxMapper2.insertTgjjGrdkyqxx(t);
-            }else{
-                tgjjGrdkyqxxMapper2.updateTgjjGrdkyqxx(t);
+//
+//7
+        try{
+            TgjjGrckzhbdxx tgjjGrckzhbdxx = new TgjjGrckzhbdxx();
+            tgjjGrckzhbdxx.setSearch_begintime(begin_time);
+            tgjjGrckzhbdxx.setSearch_endtime(end_time);
+            List<TgjjGrckzhbdxx> ls_tgjjGrckzhbdxx = tgjjGrckzhbdxxMapper.selectTgjjGrckzhbdxxList(tgjjGrckzhbdxx);
+            for (int i = 0; i < ls_tgjjGrckzhbdxx.size(); i++) {
+                TgjjGrckzhbdxx t = ls_tgjjGrckzhbdxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGrckzhbdxxMapper2.insertTgjjGrckzhbdxx(t);
+                }else{
+                    tgjjGrckzhbdxxMapper2.updateTgjjGrckzhbdxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
+//
+//
+//8
+        try{
+            TgjjGrdkyqxx tgjjGrdkyqxx = new TgjjGrdkyqxx();
+            tgjjGrdkyqxx.setSearch_begintime(begin_time);
+            tgjjGrdkyqxx.setSearch_endtime(end_time);
+            List<TgjjGrdkyqxx> ls_tgjjGrdkyqxx = tgjjGrdkyqxxMapper.selectTgjjGrdkyqxxList(tgjjGrdkyqxx);
+            for (int i = 0; i < ls_tgjjGrdkyqxx.size(); i++) {
+                TgjjGrdkyqxx t = ls_tgjjGrdkyqxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGrdkyqxxMapper2.insertTgjjGrdkyqxx(t);
+                }else{
+                    tgjjGrdkyqxxMapper2.updateTgjjGrdkyqxx(t);
+                }
 
-        TgjjGrdkzhbdxx tgjjGrdkzhbdxx = new TgjjGrdkzhbdxx();
-        tgjjGrdkzhbdxx.setSearch_begintime(begin_time);
-        tgjjGrdkzhbdxx.setSearch_begintime(end_time);
-        List<TgjjGrdkzhbdxx> ls_tgjjGrdkzhbdxx = tgjjGrdkzhbdxxMapper.selectTgjjGrdkzhbdxxList(tgjjGrdkzhbdxx);
-        for (int i = 0; i < ls_tgjjGrdkzhbdxx.size(); i++) {
-            TgjjGrdkzhbdxx  t = ls_tgjjGrdkzhbdxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGrdkzhbdxxMapper2.insertTgjjGrdkzhbdxx(t);
-            }else{
-                tgjjGrdkzhbdxxMapper2.updateTgjjGrdkzhbdxx(t);
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-        TgjjGrdkzhxx tgjjGrdkzhxx = new TgjjGrdkzhxx();
-        tgjjGrdkzhxx.setSearch_begintime(begin_time);
-        tgjjGrdkzhxx.setSearch_begintime(end_time);
-        List<TgjjGrdkzhxx> ls_tgjjGrdkzhxx = tgjjGrdkzhxxMapper.selectTgjjGrdkzhxxList(tgjjGrdkzhxx);
-        for (int i = 0; i < ls_tgjjGrdkzhxx.size(); i++) {
-            TgjjGrdkzhxx t = ls_tgjjGrdkzhxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGrdkzhxxMapper2.insertTgjjGrdkzhxx(t);
-            }else{
-                tgjjGrdkzhxxMapper2.updateTgjjGrdkzhxx(t);
+//
+//9
+        try{
+            TgjjGrdkzhbdxx tgjjGrdkzhbdxx = new TgjjGrdkzhbdxx();
+            tgjjGrdkzhbdxx.setSearch_begintime(begin_time);
+            tgjjGrdkzhbdxx.setSearch_begintime(end_time);
+            List<TgjjGrdkzhbdxx> ls_tgjjGrdkzhbdxx = tgjjGrdkzhbdxxMapper.selectTgjjGrdkzhbdxxList(tgjjGrdkzhbdxx);
+            for (int i = 0; i < ls_tgjjGrdkzhbdxx.size(); i++) {
+                TgjjGrdkzhbdxx  t = ls_tgjjGrdkzhbdxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGrdkzhbdxxMapper2.insertTgjjGrdkzhbdxx(t);
+                }else{
+                    tgjjGrdkzhbdxxMapper2.updateTgjjGrdkzhbdxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
+//
+//10
+        try{
+            TgjjGrdkzhxx tgjjGrdkzhxx = new TgjjGrdkzhxx();
+            tgjjGrdkzhxx.setSearch_begintime(begin_time);
+            tgjjGrdkzhxx.setSearch_begintime(end_time);
+            List<TgjjGrdkzhxx> ls_tgjjGrdkzhxx = tgjjGrdkzhxxMapper.selectTgjjGrdkzhxxList(tgjjGrdkzhxx);
+            for (int i = 0; i < ls_tgjjGrdkzhxx.size(); i++) {
+                TgjjGrdkzhxx t = ls_tgjjGrdkzhxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGrdkzhxxMapper2.insertTgjjGrdkzhxx(t);
+                }else{
+                    tgjjGrdkzhxxMapper2.updateTgjjGrdkzhxx(t);
+                }
 
-        TgjjGrxx tgjjGrxx = new TgjjGrxx();
-        tgjjGrxx.setSearch_begintime(begin_time);
-        tgjjGrxx.setSearch_begintime(end_time);
-        List<TgjjGrxx> ls_tgjjGrxx = tgjjGrxxMapper.selectTgjjGrxxList(tgjjGrxx);
-        for (int i = 0; i < ls_tgjjGrxx.size(); i++) {
-            TgjjGrxx t = ls_tgjjGrxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGrxxMapper2.insertTgjjGrxx(t);
-            }else{
-                tgjjGrxxMapper2.updateTgjjGrxx(t);
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-        TgjjGrzhxx tgjjGrzhxx = new TgjjGrzhxx();
-        tgjjGrzhxx.setSearch_begintime(begin_time);
-        tgjjGrzhxx.setSearch_begintime(end_time);
-        List<TgjjGrzhxx> ls_tgjjGrzhxx = tgjjGrzhxxMapper.selectTgjjGrzhxxList(tgjjGrzhxx);
-        for (int i = 0; i < ls_tgjjGrzhxx.size(); i++) {
-            TgjjGrzhxx t = ls_tgjjGrzhxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGrzhxxMapper2.insertTgjjGrzhxx(t);
-            }else{
-                tgjjGrzhxxMapper2.updateTgjjGrzhxx(t);
+//
+//11
+        try{
+            TgjjGrxx tgjjGrxx = new TgjjGrxx();
+            tgjjGrxx.setSearch_begintime(begin_time);
+            tgjjGrxx.setSearch_begintime(end_time);
+            List<TgjjGrxx> ls_tgjjGrxx = tgjjGrxxMapper.selectTgjjGrxxList(tgjjGrxx);
+            for (int i = 0; i < ls_tgjjGrxx.size(); i++) {
+                TgjjGrxx t = ls_tgjjGrxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGrxxMapper2.insertTgjjGrxx(t);
+                }else{
+                    tgjjGrxxMapper2.updateTgjjGrxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-        TgjjGtjkrxx tgjjGtjkrxx = new TgjjGtjkrxx();
-        tgjjGtjkrxx.setSearch_begintime(begin_time);
-        tgjjGtjkrxx.setSearch_begintime(end_time);
-        List<TgjjGtjkrxx> ls_tgjjGtjkrxx = tgjjGtjkrxxMapper.selectTgjjGtjkrxxList(tgjjGtjkrxx);
-        for (int i = 0; i < ls_tgjjGtjkrxx.size(); i++) {
-            TgjjGtjkrxx t = ls_tgjjGtjkrxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjGtjkrxxMapper2.insertTgjjGtjkrxx(t);
-            }else{
-                tgjjGtjkrxxMapper2.updateTgjjGtjkrxx(t);
+//
+//12
+        try{
+            TgjjGrzhxx tgjjGrzhxx = new TgjjGrzhxx();
+            tgjjGrzhxx.setSearch_begintime(begin_time);
+            tgjjGrzhxx.setSearch_begintime(end_time);
+            List<TgjjGrzhxx> ls_tgjjGrzhxx = tgjjGrzhxxMapper.selectTgjjGrzhxxList(tgjjGrzhxx);
+            for (int i = 0; i < ls_tgjjGrzhxx.size(); i++) {
+                TgjjGrzhxx t = ls_tgjjGrzhxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGrzhxxMapper2.insertTgjjGrzhxx(t);
+                }else{
+                    tgjjGrzhxxMapper2.updateTgjjGrzhxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-        TgjjHmdxx tgjjHmdxx = new TgjjHmdxx();
-        tgjjHmdxx.setSearch_begintime(begin_time);
-        tgjjHmdxx.setSearch_begintime(end_time);
-        List<TgjjHmdxx> ls_tgjjHmdxx = tgjjHmdxxMapper.selectTgjjHmdxxList(tgjjHmdxx);
-        for (int i = 0; i < ls_tgjjHmdxx.size(); i++) {
-            TgjjHmdxx t = ls_tgjjHmdxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjHmdxxMapper2.insertTgjjHmdxx(t);
-            }else{
-                tgjjHmdxxMapper2.updateTgjjHmdxx(t);
+//
+//13
+        try{
+            TgjjGtjkrxx tgjjGtjkrxx = new TgjjGtjkrxx();
+            tgjjGtjkrxx.setSearch_begintime(begin_time);
+            tgjjGtjkrxx.setSearch_begintime(end_time);
+            List<TgjjGtjkrxx> ls_tgjjGtjkrxx = tgjjGtjkrxxMapper.selectTgjjGtjkrxxList(tgjjGtjkrxx);
+            for (int i = 0; i < ls_tgjjGtjkrxx.size(); i++) {
+                TgjjGtjkrxx t = ls_tgjjGtjkrxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjGtjkrxxMapper2.insertTgjjGtjkrxx(t);
+                }else{
+                    tgjjGtjkrxxMapper2.updateTgjjGtjkrxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
-
-        TgjjKjhzb tgjjKjhzb = new TgjjKjhzb();
-        tgjjKjhzb.setSearch_begintime(begin_time);
-        tgjjKjhzb.setSearch_endtime(end_time);
-        List<TgjjKjhzb> ls_tgjjKjhzb = tgjjKjhzbMapper.selectTgjjKjhzbList(tgjjKjhzb);
-        for (int i = 0; i < ls_tgjjKjhzb.size(); i++) {
-            TgjjKjhzb t = ls_tgjjKjhzb.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjKjhzbMapper2.insertTgjjKjhzb(t);
-            }else{
-                tgjjKjhzbMapper2.updateTgjjKjhzb(t);
+//
+//14
+        try{
+            TgjjHmdxx tgjjHmdxx = new TgjjHmdxx();
+            tgjjHmdxx.setSearch_begintime(begin_time);
+            tgjjHmdxx.setSearch_begintime(end_time);
+            List<TgjjHmdxx> ls_tgjjHmdxx = tgjjHmdxxMapper.selectTgjjHmdxxList(tgjjHmdxx);
+            for (int i = 0; i < ls_tgjjHmdxx.size(); i++) {
+                TgjjHmdxx t = ls_tgjjHmdxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjHmdxxMapper2.insertTgjjHmdxx(t);
+                }else{
+                    tgjjHmdxxMapper2.updateTgjjHmdxx(t);
+                }
             }
-
+        }catch (Exception e){
+            e.printStackTrace();
         }
+//
+//15
+        try{
+            TgjjKjhzb tgjjKjhzb = new TgjjKjhzb();
+            tgjjKjhzb.setSearch_begintime(begin_time);
+            tgjjKjhzb.setSearch_endtime(end_time);
+            List<TgjjKjhzb> ls_tgjjKjhzb = tgjjKjhzbMapper.selectTgjjKjhzbList(tgjjKjhzb);
+            for (int i = 0; i < ls_tgjjKjhzb.size(); i++) {
+                TgjjKjhzb t = ls_tgjjKjhzb.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjKjhzbMapper2.insertTgjjKjhzb(t);
+                }else{
+                    tgjjKjhzbMapper2.updateTgjjKjhzb(t);
+                }
 
-
-
-
-
-        TgjjZcxx tgjjZcxx = new TgjjZcxx();
-        tgjjBsxx.setSearch_begintime(begin_time);
-        tgjjBsxx.setSearch_endtime(end_time);
-        List<TgjjZcxx> ls_tgjjZcxx = tgjjZcxxMapper.selectTgjjZcxxList(tgjjZcxx);
-        for(int i=0;i<ls_tgjjZcxx.size();i++){
-            TgjjZcxx t = ls_tgjjZcxx.get(i);
-            make_cd_operation(t);
-            if(t.getCLLX() == 1){
-                tgjjZcxxMapper2.insertTgjjZcxx(t);
-            }else{
-                tgjjZcxxMapper2.updateTgjjZcxx(t);
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
+//
+//
+//
+//16
+        try{
+            TgjjZcxx tgjjZcxx = new TgjjZcxx();
+            tgjjZcxx.setSearch_begintime(begin_time);
+            tgjjZcxx.setSearch_endtime(end_time);
+            List<TgjjZcxx> ls_tgjjZcxx = tgjjZcxxMapper.selectTgjjZcxxList(tgjjZcxx);
+            for(int i=0;i<ls_tgjjZcxx.size();i++){
+                TgjjZcxx t = ls_tgjjZcxx.get(i);
+                make_cd_operation(t);
+                if(t.getCLLX() == 1){
+                    tgjjZcxxMapper2.insertTgjjZcxx(t);
+                }else{
+                    tgjjZcxxMapper2.updateTgjjZcxx(t);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
         System.out.println("*******");
 
     }

+ 4 - 4
test-api/src/main/resources/application-dev.yml

@@ -46,9 +46,9 @@ spring:
         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
             connection-timeout: 30000
               # 最小连接数
-            minimum-idle: 5
+            minimum-idle: 500
         # 最大连接数
-            maximum-pool-size: 15
+            maximum-pool-size: 15000
         # 自动提交
             auto-commit: true
         # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
@@ -75,9 +75,9 @@ spring:
         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
             connection-timeout: 30000
               # 最小连接数
-            minimum-idle: 5
+            minimum-idle: 500
         # 最大连接数
-            maximum-pool-size: 15
+            maximum-pool-size: 15000
         # 自动提交
             auto-commit: true
         # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟

+ 4 - 1
test-api/src/main/resources/mapper/TgjjBsxxMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjBsxx" type="com.sooka.model.bo.TgjjBsxx"></parameterMap>
 
     <sql id="selectTgjjBsxxVo">
-        select ID, JKHTBH, JKRXM, JKRZJLX, JKRZJH, SFST, SFSB, DKLX, YDFKRQ, YDDQRQ, DKKHRQ, SCHKRQ, DKZT, DKJQRQ, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_bsxx
+        select ID, JKHTBH, JKRXM, JKRZJLX, JKRZJH, SFST, SFSB, DKLX, YDFKRQ, YDDQRQ, DKKHRQ, SCHKRQ, DKZT, DKJQRQ, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_bsxx
     </sql>
 
     <select id="selectTgjjBsxxList" parameterMap="TgjjBsxx" resultMap="TgjjBsxxResult">
@@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZXBH != null  and ZXBH != ''"> and ZXBH = #{ZXBH}</if>
             <if test="lastUpdateTime != null "> and LAST_UPDATE_TIME = #{lastUpdateTime}</if>
             <if test="CLLX != null "> and CLLX = #{CLLX}</if>
+            <if test="search_begintime != null"> and  LAST_UPDATE_TIME >= #{search_begintime}</if>
+            <if test="search_endtime != null"> and  LAST_UPDATE_TIME &lt; #{search_endtime}</if>
+
         </where>
     </select>
 

+ 1 - 1
test-api/src/main/resources/mapper/TgjjBsxxMapper2.xml

@@ -21,7 +21,7 @@
     <parameterMap id="TgjjBsxx" type="com.sooka.model.bo.TgjjBsxx"></parameterMap>
 
     <sql id="selectTgjjBsxxVo">
-        select ID, JKHTBH, JKRXM, JKRZJLX, JKRZJH, SFST, SFSB, DKLX, YDFKRQ, YDDQRQ, DKKHRQ, SCHKRQ, DKZT, DKJQRQ, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_bsxx
+        select ID, JKHTBH, JKRXM, JKRZJLX, JKRZJH, SFST, SFSB, DKLX, YDFKRQ, YDDQRQ, DKKHRQ, SCHKRQ, DKZT, DKJQRQ, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_bsxx
     </sql>
 
     <select id="selectTgjjBsxxList" parameterMap="TgjjBsxx" resultMap="TgjjBsxxResult">

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDbxxMapper.xml

@@ -8,7 +8,7 @@
     </resultMap>
     <parameterMap id="TgjjDbxx" type="com.sooka.model.bo.TgjjDbxx"></parameterMap>
     <sql id="selectTgjjDbxxVo">
-        select ID, DBHTBH, JKHTBH, DBJGMC, DYWQZH, DYWTXQZH, DYWFWZL, DYQJLRQ, DYQJCRQ, DYWPGJZ, BZHTBH, BZJGMC, DKBZJ, ZYHTBH, ZYWBH, ZYWMC, ZYWJZ, ZYHTKSRQ, ZYHTJSRQ, ZXBH, LAST_UPDATE_TIME, DYFWGFHTH, CLLX from tgjj_dbxx
+        select ID, DBHTBH, JKHTBH, DBJGMC, DYWQZH, DYWTXQZH, DYWFWZL, DYQJLRQ, DYQJCRQ, DYWPGJZ, BZHTBH, BZJGMC, DKBZJ, ZYHTBH, ZYWBH, ZYWMC, ZYWJZ, ZYHTKSRQ, ZYHTJSRQ, ZXBH, LAST_UPDATE_TIME lastUpdateTime, DYFWGFHTH, CLLX from tgjj_dbxx
     </sql>
 
     <select id="selectTgjjDbxxList" parameterMap="TgjjDbxx" resultMap="TgjjDbxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjDbxxMapper2.xml

@@ -18,7 +18,7 @@
     </resultMap>
     <parameterMap id="TgjjDbxx" type="com.sooka.model.bo.TgjjDbxx"></parameterMap>
     <sql id="selectTgjjDbxxVo">
-        select ID, DBHTBH, JKHTBH, DBJGMC, DYWQZH, DYWTXQZH, DYWFWZL, DYQJLRQ, DYQJCRQ, DYWPGJZ, BZHTBH, BZJGMC, DKBZJ, ZYHTBH, ZYWBH, ZYWMC, ZYWJZ, ZYHTKSRQ, ZYHTJSRQ, ZXBH, LAST_UPDATE_TIME, DYFWGFHTH, CLLX from tgjj_dbxx
+        select ID, DBHTBH, JKHTBH, DBJGMC, DYWQZH, DYWTXQZH, DYWFWZL, DYQJLRQ, DYQJCRQ, DYWPGJZ, BZHTBH, BZJGMC, DKBZJ, ZYHTBH, ZYWBH, ZYWMC, ZYWJZ, ZYHTKSRQ, ZYHTJSRQ, ZXBH, LAST_UPDATE_TIME lastUpdateTime, DYFWGFHTH, CLLX from tgjj_dbxx
     </sql>
 
     <select id="selectTgjjDbxxList" parameterMap="TgjjDbxx" resultMap="TgjjDbxxResult">
@@ -60,7 +60,7 @@
     <insert id="insertTgjjDbxx" parameterMap="TgjjDbxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_dbxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DBHTBH != null">DBHTBH,</if>
             <if test="JKHTBH != null">JKHTBH,</if>
             <if test="DBJGMC != null">DBJGMC,</if>
@@ -85,7 +85,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DBHTBH != null">#{DBHTBH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="DBJGMC != null">#{DBJGMC},</if>
@@ -114,6 +114,7 @@
     <update id="updateTgjjDbxx" parameterMap="TgjjDbxx">
         update tgjj_dbxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DBHTBH != null">DBHTBH = #{DBHTBH},</if>
             <if test="JKHTBH != null">JKHTBH = #{JKHTBH},</if>
             <if test="DBJGMC != null">DBJGMC = #{DBJGMC},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDkxxMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDkxx" type="com.sooka.model.bo.TgjjDkxx"></parameterMap>
 
     <sql id="selectTgjjDkxxVo">
-        select ID, JKHTBH, GFHTBH, SWTYHMC, SWTYHDM, DKDBLX, YDFKRQ, YDDQRQ, DKHKFS, HKZH, ZHKHYHDM, HTDKJE, DKLX, DKQS, FWZL, FWJZMJ, FWTNMJ, FWXZ, FWZJ, JKHTLL, LLFDBL, GFSFK, JKRGJJZH, JKRXM, JKRZJLX, JKRZJH, SFRMC, SFRZHHM, SFRKHYHDM, JKHTQDRQ, YDHKR, DKZH, ZXBH, LAST_UPDATE_TIME, FWZSLX, FWZSHM, GFLX, DKD, CLLX from tgjj_dkxx
+        select ID, JKHTBH, GFHTBH, SWTYHMC, SWTYHDM, DKDBLX, YDFKRQ, YDDQRQ, DKHKFS, HKZH, ZHKHYHDM, HTDKJE, DKLX, DKQS, FWZL, FWJZMJ, FWTNMJ, FWXZ, FWZJ, JKHTLL, LLFDBL, GFSFK, JKRGJJZH, JKRXM, JKRZJLX, JKRZJH, SFRMC, SFRZHHM, SFRKHYHDM, JKHTQDRQ, YDHKR, DKZH, ZXBH, LAST_UPDATE_TIME lastUpdateTime, FWZSLX, FWZSHM, GFLX, DKD, CLLX from tgjj_dkxx
     </sql>
 
     <select id="selectTgjjDkxxList" parameterMap="TgjjDkxx" resultMap="TgjjDkxxResult">

+ 3 - 2
test-api/src/main/resources/mapper/TgjjDkxxMapper2.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjDkxx" parameterMap="TgjjDkxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_dkxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="JKHTBH != null">JKHTBH,</if>
             <if test="GFHTBH != null">GFHTBH,</if>
             <if test="SWTYHMC != null">SWTYHMC,</if>
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="GFHTBH != null">#{GFHTBH},</if>
             <if test="SWTYHMC != null">#{SWTYHMC},</if>
@@ -163,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjDkxx" parameterMap="TgjjDkxx">
         update tgjj_dkxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="JKHTBH != null">JKHTBH = #{JKHTBH},</if>
             <if test="GFHTBH != null">GFHTBH = #{GFHTBH},</if>
             <if test="SWTYHMC != null">SWTYHMC = #{SWTYHMC},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDwckzhbdxx" type="com.sooka.model.bo.TgjjDwckzhbdxx" ></parameterMap>
 
     <sql id="selectTgjjDwckzhbdxxVo">
-        select ID, DWZH, JZRQ, FSE, FSLXE, FSRS, YWMXLX, HBJNY, YWLSH, CZBZ, DWZHYE, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_dwckzhbdxx
+        select ID, DWZH, JZRQ, FSE, FSLXE, FSRS, YWMXLX, HBJNY, YWLSH, CZBZ, DWZHYE, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_dwckzhbdxx
     </sql>
 
     <select id="selectTgjjDwckzhbdxxList" parameterMap="TgjjDwckzhbdxx" resultMap="TgjjDwckzhbdxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjDwckzhbdxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDwckzhbdxx" type="com.sooka.model.bo.TgjjDwckzhbdxx" ></parameterMap>
 
     <sql id="selectTgjjDwckzhbdxxVo">
-        select ID, DWZH, JZRQ, FSE, FSLXE, FSRS, YWMXLX, HBJNY, YWLSH, CZBZ, DWZHYE, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_dwckzhbdxx
+        select ID, DWZH, JZRQ, FSE, FSLXE, FSRS, YWMXLX, HBJNY, YWLSH, CZBZ, DWZHYE, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_dwckzhbdxx
     </sql>
 
     <select id="selectTgjjDwckzhbdxxList" parameterMap="TgjjDwckzhbdxx" resultMap="TgjjDwckzhbdxxResult">
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjDwckzhbdxx" parameterMap="TgjjDwckzhbdxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_dwckzhbdxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DWZH != null">DWZH,</if>
             <if test="JZRQ != null">JZRQ,</if>
             <if test="FSE != null">FSE,</if>
@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="JZRQ != null">#{JZRQ},</if>
             <if test="FSE != null">#{FSE},</if>
@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjDwckzhbdxx" parameterMap="TgjjDwckzhbdxx">
         update tgjj_dwckzhbdxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DWZH != null">DWZH = #{DWZH},</if>
             <if test="JZRQ != null">JZRQ = #{JZRQ},</if>
             <if test="FSE != null">FSE = #{FSE},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDwxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDwxx" type="com.sooka.model.bo.TgjjDwxx"></parameterMap>
 
     <sql id="selectTgjjDwxxVo">
-        select ID, DWMC, DWZH, DWDZ, DWFRDBXM, DWFRDBZJLX, DWFRDBZJHM, DWLSGX, DWJJLX, DWSSHY, DWYB, DWDZXX, DWFXR, JBRXM, JBRGDDHHM, JBRSJHM, JBRZJLX, JBRZJHM, ZZJGDM, DWSLRQ, DWKHRQ, STYHMC, STYHDM, TYSHXYDM, ZXBH, LAST_UPDATE_TIME, DWXZ, CLLX from tgjj_dwxx
+        select ID, DWMC, DWZH, DWDZ, DWFRDBXM, DWFRDBZJLX, DWFRDBZJHM, DWLSGX, DWJJLX, DWSSHY, DWYB, DWDZXX, DWFXR, JBRXM, JBRGDDHHM, JBRSJHM, JBRZJLX, JBRZJHM, ZZJGDM, DWSLRQ, DWKHRQ, STYHMC, STYHDM, TYSHXYDM, ZXBH, LAST_UPDATE_TIME lastUpdateTime, DWXZ, CLLX from tgjj_dwxx
     </sql>
 
     <select id="selectTgjjDwxxList" parameterMap="TgjjDwxx" resultMap="TgjjDwxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjDwxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDwxx" type="com.sooka.model.bo.TgjjDwxx"></parameterMap>
 
     <sql id="selectTgjjDwxxVo">
-        select ID, DWMC, DWZH, DWDZ, DWFRDBXM, DWFRDBZJLX, DWFRDBZJHM, DWLSGX, DWJJLX, DWSSHY, DWYB, DWDZXX, DWFXR, JBRXM, JBRGDDHHM, JBRSJHM, JBRZJLX, JBRZJHM, ZZJGDM, DWSLRQ, DWKHRQ, STYHMC, STYHDM, TYSHXYDM, ZXBH, LAST_UPDATE_TIME, DWXZ, CLLX from tgjj_dwxx
+        select ID, DWMC, DWZH, DWDZ, DWFRDBXM, DWFRDBZJLX, DWFRDBZJHM, DWLSGX, DWJJLX, DWSSHY, DWYB, DWDZXX, DWFXR, JBRXM, JBRGDDHHM, JBRSJHM, JBRZJLX, JBRZJHM, ZZJGDM, DWSLRQ, DWKHRQ, STYHMC, STYHDM, TYSHXYDM, ZXBH, LAST_UPDATE_TIME lastUpdateTime, DWXZ, CLLX from tgjj_dwxx
     </sql>
 
     <select id="selectTgjjDwxxList" parameterMap="TgjjDwxx" resultMap="TgjjDwxxResult">
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjDwxx" parameterMap="TgjjDwxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_dwxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DWMC != null">DWMC,</if>
             <if test="DWZH != null">DWZH,</if>
             <if test="DWDZ != null">DWDZ,</if>
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DWMC != null">#{DWMC},</if>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="DWDZ != null">#{DWDZ},</if>
@@ -131,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjDwxx" parameterMap="TgjjDwxx">
         update tgjj_dwxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DWMC != null">DWMC = #{DWMC},</if>
             <if test="DWZH != null">DWZH = #{DWZH},</if>
             <if test="DWDZ != null">DWDZ = #{DWDZ},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjDwzhxxMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDwzhxx" type="com.sooka.model.bo.TgjjDwzhxx"></parameterMap>
 
     <sql id="selectTgjjDwzhxxVo">
-        select ID, DWZH, DWJCBL, GRJCBL, DWJCRS, DWFCRS, DWZHYE, DWXHRQ, DWXHYY, DWZHZT, JZNY, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_dwzhxx
+        select ID, DWZH, DWJCBL, GRJCBL, DWJCRS, DWFCRS, DWZHYE, DWXHRQ, DWXHYY, DWZHZT, JZNY, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_dwzhxx
     </sql>
 
     <select id="selectTgjjDwzhxxList" parameterMap="TgjjDwzhxx" resultMap="TgjjDwzhxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjDwzhxxMapper2.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjDwzhxx" type="com.sooka.model.bo.TgjjDwzhxx"></parameterMap>
 
     <sql id="selectTgjjDwzhxxVo">
-        select ID, DWZH, DWJCBL, GRJCBL, DWJCRS, DWFCRS, DWZHYE, DWXHRQ, DWXHYY, DWZHZT, JZNY, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_dwzhxx
+        select ID, DWZH, DWJCBL, GRJCBL, DWJCRS, DWFCRS, DWZHYE, DWXHRQ, DWXHYY, DWZHZT, JZNY, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_dwzhxx
     </sql>
 
     <select id="selectTgjjDwzhxxList" parameterMap="TgjjDwzhxx" resultMap="TgjjDwzhxxResult">
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjDwzhxx" parameterMap="TgjjDwzhxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_dwzhxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DWZH != null">DWZH,</if>
             <if test="DWJCBL != null">DWJCBL,</if>
             <if test="GRJCBL != null">GRJCBL,</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="DWJCBL != null">#{DWJCBL},</if>
             <if test="GRJCBL != null">#{GRJCBL},</if>
@@ -88,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjDwzhxx" parameterMap="TgjjDwzhxx">
         update tgjj_dwzhxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DWZH != null">DWZH = #{DWZH},</if>
             <if test="DWJCBL != null">DWJCBL = #{DWJCBL},</if>
             <if test="GRJCBL != null">GRJCBL = #{GRJCBL},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrckzhbdxx" type="com.sooka.model.bo.TgjjGrckzhbdxx"></parameterMap>
 
     <sql id="selectTgjjGrckzhbdxxVo">
-        select ID, GRZH, JZRQ, GJHTQYWLX, FSE, DNGJFSE, SNJZFSE, FSLXE, TQYY, TQFS, YWLSH, CZBZ, GRZHYE, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grckzhbdxx
+        select ID, GRZH, JZRQ, GJHTQYWLX, FSE, DNGJFSE, SNJZFSE, FSLXE, TQYY, TQFS, YWLSH, CZBZ, GRZHYE, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grckzhbdxx
     </sql>
 
     <select id="selectTgjjGrckzhbdxxList" parameterMap="TgjjGrckzhbdxx" resultMap="TgjjGrckzhbdxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGrckzhbdxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrckzhbdxx" type="com.sooka.model.bo.TgjjGrckzhbdxx"></parameterMap>
 
     <sql id="selectTgjjGrckzhbdxxVo">
-        select ID, GRZH, JZRQ, GJHTQYWLX, FSE, DNGJFSE, SNJZFSE, FSLXE, TQYY, TQFS, YWLSH, CZBZ, GRZHYE, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grckzhbdxx
+        select ID, GRZH, JZRQ, GJHTQYWLX, FSE, DNGJFSE, SNJZFSE, FSLXE, TQYY, TQFS, YWLSH, CZBZ, GRZHYE, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grckzhbdxx
     </sql>
 
     <select id="selectTgjjGrckzhbdxxList" parameterMap="TgjjGrckzhbdxx" resultMap="TgjjGrckzhbdxxResult">
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjGrckzhbdxx" parameterMap="TgjjGrckzhbdxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_grckzhbdxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="GRZH != null">GRZH,</if>
             <if test="JZRQ != null">JZRQ,</if>
             <if test="GJHTQYWLX != null">GJHTQYWLX,</if>
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="GRZH != null">#{GRZH},</if>
             <if test="JZRQ != null">#{JZRQ},</if>
             <if test="GJHTQYWLX != null">#{GJHTQYWLX},</if>
@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjGrckzhbdxx" parameterMap="TgjjGrckzhbdxx">
         update tgjj_grckzhbdxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="GRZH != null">GRZH = #{GRZH},</if>
             <if test="JZRQ != null">JZRQ = #{JZRQ},</if>
             <if test="GJHTQYWLX != null">GJHTQYWLX = #{GJHTQYWLX},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrdkyqxx" type="com.sooka.model.bo.TgjjGrdkyqxx"></parameterMap>
 
     <sql id="selectTgjjGrdkyqxxVo">
-        select ID, IDXH, DKZH, YQQC, YQBJ, YQLX, YQFX, SSRQ, HKQC, SSYQBJJE, SSYQLXJE, SSYQFXJE, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grdkyqxx
+        select ID, IDXH, DKZH, YQQC, YQBJ, YQLX, YQFX, SSRQ, HKQC, SSYQBJJE, SSYQLXJE, SSYQFXJE, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grdkyqxx
     </sql>
 
     <select id="selectTgjjGrdkyqxxList" parameterMap="TgjjGrdkyqxx" resultMap="TgjjGrdkyqxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGrdkyqxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrdkyqxx" type="com.sooka.model.bo.TgjjGrdkyqxx"></parameterMap>
 
     <sql id="selectTgjjGrdkyqxxVo">
-        select ID, IDXH, DKZH, YQQC, YQBJ, YQLX, YQFX, SSRQ, HKQC, SSYQBJJE, SSYQLXJE, SSYQFXJE, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grdkyqxx
+        select ID, IDXH, DKZH, YQQC, YQBJ, YQLX, YQFX, SSRQ, HKQC, SSYQBJJE, SSYQLXJE, SSYQFXJE, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grdkyqxx
     </sql>
 
     <select id="selectTgjjGrdkyqxxList" parameterMap="TgjjGrdkyqxx" resultMap="TgjjGrdkyqxxResult">
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjGrdkyqxx" parameterMap="TgjjGrdkyqxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_grdkyqxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="IDXH != null">IDXH,</if>
             <if test="DKZH != null">DKZH,</if>
             <if test="YQQC != null">YQQC,</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="IDXH != null">#{IDXH},</if>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="YQQC != null">#{YQQC},</if>
@@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjGrdkyqxx" parameterMap="TgjjGrdkyqxx">
         update tgjj_grdkyqxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="IDXH != null">IDXH = #{IDXH},</if>
             <if test="DKZH != null">DKZH = #{DKZH},</if>
             <if test="YQQC != null">YQQC = #{YQQC},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrdkzhbdxx" type="com.sooka.model.bo.TgjjGrdkzhbdxx"></parameterMap>
 
     <sql id="selectTgjjGrdkzhbdxxVo">
-        select ID, DKZH, YWLSH, DKYWMXLX, YWFSRQ, DKYHDM, FSE, BJJE, LXJE, FXJE, DQQC, ZCZYQBJJE, YQZZCBJJE, JZRQ, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grdkzhbdxx
+        select ID, DKZH, YWLSH, DKYWMXLX, YWFSRQ, DKYHDM, FSE, BJJE, LXJE, FXJE, DQQC, ZCZYQBJJE, YQZZCBJJE, JZRQ, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grdkzhbdxx
     </sql>
 
     <select id="selectTgjjGrdkzhbdxxList" parameterMap="TgjjGrdkzhbdxx" resultMap="TgjjGrdkzhbdxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGrdkzhbdxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrdkzhbdxx" type="com.sooka.model.bo.TgjjGrdkzhbdxx"></parameterMap>
 
     <sql id="selectTgjjGrdkzhbdxxVo">
-        select ID, DKZH, YWLSH, DKYWMXLX, YWFSRQ, DKYHDM, FSE, BJJE, LXJE, FXJE, DQQC, ZCZYQBJJE, YQZZCBJJE, JZRQ, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grdkzhbdxx
+        select ID, DKZH, YWLSH, DKYWMXLX, YWFSRQ, DKYHDM, FSE, BJJE, LXJE, FXJE, DQQC, ZCZYQBJJE, YQZZCBJJE, JZRQ, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grdkzhbdxx
     </sql>
 
     <select id="selectTgjjGrdkzhbdxxList" parameterMap="TgjjGrdkzhbdxx" resultMap="TgjjGrdkzhbdxxResult">
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjGrdkzhbdxx" parameterMap="TgjjGrdkzhbdxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_grdkzhbdxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DKZH != null">DKZH,</if>
             <if test="YWLSH != null">YWLSH,</if>
             <if test="DKYWMXLX != null">DKYWMXLX,</if>
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="YWLSH != null">#{YWLSH},</if>
             <if test="DKYWMXLX != null">#{DKYWMXLX},</if>
@@ -98,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjGrdkzhbdxx" parameterMap="TgjjGrdkzhbdxx">
         update tgjj_grdkzhbdxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DKZH != null">DKZH = #{DKZH},</if>
             <if test="YWLSH != null">YWLSH = #{YWLSH},</if>
             <if test="DKYWMXLX != null">DKYWMXLX = #{DKYWMXLX},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrdkzhxx" type="com.sooka.model.bo.TgjjGrdkzhxx"></parameterMap>
 
     <sql id="selectTgjjGrdkzhxxVo">
-        select ID, DKZH, JKHTBH, DKFXDJ, DKFFE, DKFFRQ, DKYE, DKLL, DQJHHKJE, DQJHGHBJ, DQJHGHLX, DQYHJE, DQYHBJ, DQYHLX, DQYHFX, DKJQRQ, HSBJZE, HSLXZE, FXZE, TQGHBJZE, YQBJZE, YQLXZE, LJYQQS, DKZT, ZXBH, LAST_UPDATE_TIME, SCHKFSRQ, CLLX from tgjj_grdkzhxx
+        select ID, DKZH, JKHTBH, DKFXDJ, DKFFE, DKFFRQ, DKYE, DKLL, DQJHHKJE, DQJHGHBJ, DQJHGHLX, DQYHJE, DQYHBJ, DQYHLX, DQYHFX, DKJQRQ, HSBJZE, HSLXZE, FXZE, TQGHBJZE, YQBJZE, YQLXZE, LJYQQS, DKZT, ZXBH, LAST_UPDATE_TIME lastUpdateTime, SCHKFSRQ, CLLX from tgjj_grdkzhxx
     </sql>
 
     <select id="selectTgjjGrdkzhxxList" parameterMap="TgjjGrdkzhxx" resultMap="TgjjGrdkzhxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGrdkzhxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrdkzhxx" type="com.sooka.model.bo.TgjjGrdkzhxx"></parameterMap>
 
     <sql id="selectTgjjGrdkzhxxVo">
-        select ID, DKZH, JKHTBH, DKFXDJ, DKFFE, DKFFRQ, DKYE, DKLL, DQJHHKJE, DQJHGHBJ, DQJHGHLX, DQYHJE, DQYHBJ, DQYHLX, DQYHFX, DKJQRQ, HSBJZE, HSLXZE, FXZE, TQGHBJZE, YQBJZE, YQLXZE, LJYQQS, DKZT, ZXBH, LAST_UPDATE_TIME, SCHKFSRQ, CLLX from tgjj_grdkzhxx
+        select ID, DKZH, JKHTBH, DKFXDJ, DKFFE, DKFFRQ, DKYE, DKLL, DQJHHKJE, DQJHGHBJ, DQJHGHLX, DQYHJE, DQYHBJ, DQYHLX, DQYHFX, DKJQRQ, HSBJZE, HSLXZE, FXZE, TQGHBJZE, YQBJZE, YQLXZE, LJYQQS, DKZT, ZXBH, LAST_UPDATE_TIME lastUpdateTime, SCHKFSRQ, CLLX from tgjj_grdkzhxx
     </sql>
 
     <select id="selectTgjjGrdkzhxxList" parameterMap="TgjjGrdkzhxx" resultMap="TgjjGrdkzhxxResult">
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjGrdkzhxx" parameterMap="TgjjGrdkzhxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_grdkzhxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DKZH != null">DKZH,</if>
             <if test="JKHTBH != null">JKHTBH,</if>
             <if test="DKFXDJ != null">DKFXDJ,</if>
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DKZH != null">#{DKZH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="DKFXDJ != null">#{DKFXDJ},</if>
@@ -131,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjGrdkzhxx" parameterMap="TgjjGrdkzhxx">
         update tgjj_grdkzhxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DKZH != null">DKZH = #{DKZH},</if>
             <if test="JKHTBH != null">JKHTBH = #{JKHTBH},</if>
             <if test="DKFXDJ != null">DKFXDJ = #{DKFXDJ},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrxx" type="com.sooka.model.bo.TgjjGrxx"></parameterMap>
 
     <sql id="selectTgjjGrxxVo">
-        select ID, GRZH, XINGMING, XMQP, XINGBIE, GDDHHM, SJHM, ZJLX, ZJHM, CSNY, HYZK, ZHIYE, ZHICHEN, ZHIWU, XUELI, YZBM, JTZZ, JTYSR, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grxx
+        select ID, GRZH, XINGMING, XMQP, XINGBIE, GDDHHM, SJHM, ZJLX, ZJHM, CSNY, HYZK, ZHIYE, ZHICHEN, ZHIWU, XUELI, YZBM, JTZZ, JTYSR, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grxx
     </sql>
 
     <select id="selectTgjjGrxxList" parameterMap="TgjjGrxx" resultMap="TgjjGrxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGrxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrxx" type="com.sooka.model.bo.TgjjGrxx"></parameterMap>
 
     <sql id="selectTgjjGrxxVo">
-        select ID, GRZH, XINGMING, XMQP, XINGBIE, GDDHHM, SJHM, ZJLX, ZJHM, CSNY, HYZK, ZHIYE, ZHICHEN, ZHIWU, XUELI, YZBM, JTZZ, JTYSR, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grxx
+        select ID, GRZH, XINGMING, XMQP, XINGBIE, GDDHHM, SJHM, ZJLX, ZJHM, CSNY, HYZK, ZHIYE, ZHICHEN, ZHIWU, XUELI, YZBM, JTZZ, JTYSR, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grxx
     </sql>
 
     <select id="selectTgjjGrxxList" parameterMap="TgjjGrxx" resultMap="TgjjGrxxResult">
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjGrxx" parameterMap="TgjjGrxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_grxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="GRZH != null and GRZH != ''">GRZH,</if>
             <if test="XINGMING != null">XINGMING,</if>
             <if test="XMQP != null">XMQP,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="GRZH != null and GRZH != ''">#{GRZH},</if>
             <if test="XINGMING != null">#{XINGMING},</if>
             <if test="XMQP != null">#{XMQP},</if>
@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjGrxx" parameterMap="TgjjGrxx">
         update tgjj_grxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="GRZH != null and GRZH != ''">GRZH = #{GRZH},</if>
             <if test="XINGMING != null">XINGMING = #{XINGMING},</if>
             <if test="XMQP != null">XMQP = #{XMQP},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGrzhxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrzhxx" type="com.sooka.model.bo.TgjjGrzhxx"></parameterMap>
 
     <sql id="selectTgjjGrzhxxVo">
-        select ID, DWZH, GRJCBL, JZNY, GRZH, GRJCJS, GRZHZT, KHRQ, GRZHYE, GRZHSNJZYE, GRZHDNGJYE, GRYJCE, DWYJCE, XHRQ, XHYY, GRCKZHHM, GRCKZHKHYHMC, GRCKZHKHYHDM, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grzhxx
+        select ID, DWZH, GRJCBL, JZNY, GRZH, GRJCJS, GRZHZT, KHRQ, GRZHYE, GRZHSNJZYE, GRZHDNGJYE, GRYJCE, DWYJCE, XHRQ, XHYY, GRCKZHHM, GRCKZHKHYHMC, GRCKZHKHYHDM, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grzhxx
     </sql>
 
     <select id="selectTgjjGrzhxxList" parameterMap="TgjjGrzhxx" resultMap="TgjjGrzhxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGrzhxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGrzhxx" type="com.sooka.model.bo.TgjjGrzhxx"></parameterMap>
 
     <sql id="selectTgjjGrzhxxVo">
-        select ID, DWZH, GRJCBL, JZNY, GRZH, GRJCJS, GRZHZT, KHRQ, GRZHYE, GRZHSNJZYE, GRZHDNGJYE, GRYJCE, DWYJCE, XHRQ, XHYY, GRCKZHHM, GRCKZHKHYHMC, GRCKZHKHYHDM, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_grzhxx
+        select ID, DWZH, GRJCBL, JZNY, GRZH, GRJCJS, GRZHZT, KHRQ, GRZHYE, GRZHSNJZYE, GRZHDNGJYE, GRYJCE, DWYJCE, XHRQ, XHYY, GRCKZHHM, GRCKZHKHYHMC, GRCKZHKHYHDM, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_grzhxx
     </sql>
 
     <select id="selectTgjjGrzhxxList" parameterMap="TgjjGrzhxx" resultMap="TgjjGrzhxxResult">
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjGrzhxx" parameterMap="TgjjGrzhxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_grzhxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DWZH != null">DWZH,</if>
             <if test="GRJCBL != null">GRJCBL,</if>
             <if test="JZNY != null">JZNY,</if>
@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DWZH != null">#{DWZH},</if>
             <if test="GRJCBL != null">#{GRJCBL},</if>
             <if test="JZNY != null">#{JZNY},</if>
@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjGrzhxx" parameterMap="TgjjGrzhxx">
         update tgjj_grzhxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DWZH != null">DWZH = #{DWZH},</if>
             <if test="GRJCBL != null">GRJCBL = #{GRJCBL},</if>
             <if test="JZNY != null">JZNY = #{JZNY},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjGtjkrxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjGtjkrxx" type="com.sooka.model.bo.TgjjGtjkrxx"></parameterMap>
 
     <sql id="selectTgjjGtjkrxxVo">
-        select ID, GTJKRGJJZH, JKHTBH, GTJKRXM, GTJKRZJLX, GTJKRZJHM, YSR, CDGX, SJHM, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_gtjkrxx
+        select ID, GTJKRGJJZH, JKHTBH, GTJKRXM, GTJKRZJLX, GTJKRZJHM, YSR, CDGX, SJHM, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_gtjkrxx
     </sql>
 
     <select id="selectTgjjGtjkrxxList" parameterMap="TgjjGtjkrxx" resultMap="TgjjGtjkrxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjGtjkrxxMapper2.xml

@@ -20,7 +20,7 @@
     <parameterMap id="TgjjGtjkrxx" type="com.sooka.model.bo.TgjjGtjkrxx"></parameterMap>
 
     <sql id="selectTgjjGtjkrxxVo">
-        select ID, GTJKRGJJZH, JKHTBH, GTJKRXM, GTJKRZJLX, GTJKRZJHM, YSR, CDGX, SJHM, ZXBH, LAST_UPDATE_TIME, CLLX from tgjj_gtjkrxx
+        select ID, GTJKRGJJZH, JKHTBH, GTJKRXM, GTJKRZJLX, GTJKRZJHM, YSR, CDGX, SJHM, ZXBH, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_gtjkrxx
     </sql>
 
     <select id="selectTgjjGtjkrxxList" parameterMap="TgjjGtjkrxx" resultMap="TgjjGtjkrxxResult">
@@ -51,7 +51,7 @@
     <insert id="insertTgjjGtjkrxx" parameterMap="TgjjGtjkrxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_gtjkrxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="GTJKRGJJZH != null">GTJKRGJJZH,</if>
             <if test="JKHTBH != null">JKHTBH,</if>
             <if test="GTJKRXM != null">GTJKRXM,</if>
@@ -65,7 +65,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="GTJKRGJJZH != null">#{GTJKRGJJZH},</if>
             <if test="JKHTBH != null">#{JKHTBH},</if>
             <if test="GTJKRXM != null">#{GTJKRXM},</if>
@@ -83,6 +83,7 @@
     <update id="updateTgjjGtjkrxx" parameterMap="TgjjGtjkrxx">
         update tgjj_gtjkrxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="GTJKRGJJZH != null">GTJKRGJJZH = #{GTJKRGJJZH},</if>
             <if test="JKHTBH != null">JKHTBH = #{JKHTBH},</if>
             <if test="GTJKRXM != null">GTJKRXM = #{GTJKRXM},</if>

+ 1 - 1
test-api/src/main/resources/mapper/TgjjHmdxxMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjHmdxx" type="com.sooka.model.bo.TgjjHmdxx"></parameterMap>
 
     <sql id="selectTgjjHmdxxVo">
-        select ID, BLJLID, XINGMING, ZJLX, ZJHM, BLXXFL, BLXXDJ, BLXXZT, START_TIME, END_TIME, SYMS, ZXBH, LXYQQS, LAST_UPDATE_TIME, CLLX from tgjj_hmdxx
+        select ID, BLJLID, XINGMING, ZJLX, ZJHM, BLXXFL, BLXXDJ, BLXXZT, START_TIME, END_TIME, SYMS, ZXBH, LXYQQS, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_hmdxx
     </sql>
 
     <select id="selectTgjjHmdxxList" parameterMap="TgjjHmdxx" resultMap="TgjjHmdxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjHmdxxMapper2.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjHmdxx" type="com.sooka.model.bo.TgjjHmdxx"></parameterMap>
 
     <sql id="selectTgjjHmdxxVo">
-        select ID, BLJLID, XINGMING, ZJLX, ZJHM, BLXXFL, BLXXDJ, BLXXZT, START_TIME, END_TIME, SYMS, ZXBH, LXYQQS, LAST_UPDATE_TIME, CLLX from tgjj_hmdxx
+        select ID, BLJLID, XINGMING, ZJLX, ZJHM, BLXXFL, BLXXDJ, BLXXZT, START_TIME, END_TIME, SYMS, ZXBH, LXYQQS, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_hmdxx
     </sql>
 
     <select id="selectTgjjHmdxxList" parameterMap="TgjjHmdxx" resultMap="TgjjHmdxxResult">
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTgjjHmdxx" parameterMap="TgjjHmdxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_hmdxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="BLJLID != null">BLJLID,</if>
             <if test="XINGMING != null">XINGMING,</if>
             <if test="ZJLX != null">ZJLX,</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLLX != null">CLLX,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="BLJLID != null">#{BLJLID},</if>
             <if test="XINGMING != null">#{XINGMING},</if>
             <if test="ZJLX != null">#{ZJLX},</if>
@@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTgjjHmdxx" parameterMap="TgjjHmdxx">
         update tgjj_hmdxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="BLJLID != null">BLJLID = #{BLJLID},</if>
             <if test="XINGMING != null">XINGMING = #{XINGMING},</if>
             <if test="ZJLX != null">ZJLX = #{ZJLX},</if>

Plik diff jest za duży
+ 1 - 1
test-api/src/main/resources/mapper/TgjjKjhzbMapper.xml


Plik diff jest za duży
+ 4 - 3
test-api/src/main/resources/mapper/TgjjKjhzbMapper2.xml


+ 1 - 1
test-api/src/main/resources/mapper/TgjjZcxxMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <parameterMap id="TgjjZcxx" type="com.sooka.model.bo.TgjjZcxx"></parameterMap>
 
     <sql id="selectTgjjZcxxVo">
-        select ID, DWJCBLSX, DWJCBLXX, GRJCBLSX, GRJCBLXX, YJCESX, YJCEXX, GRZFDKZCNX, GRZFDKZGED, GRZFDKZGDKBL, XMDKZCNX, XMDKZGDKBL, DJCZGZGDKED, ZXBH, JCJSSX, JCJSXX, GRZFDKYGSR, DKJCYS, ZFTQJCYS, LAST_UPDATE_TIME, CLLX from tgjj_zcxx
+        select ID, DWJCBLSX, DWJCBLXX, GRJCBLSX, GRJCBLXX, YJCESX, YJCEXX, GRZFDKZCNX, GRZFDKZGED, GRZFDKZGDKBL, XMDKZCNX, XMDKZGDKBL, DJCZGZGDKED, ZXBH, JCJSSX, JCJSXX, GRZFDKYGSR, DKJCYS, ZFTQJCYS, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_zcxx
     </sql>
 
     <select id="selectTgjjZcxxList" parameterMap="TgjjZcxx" resultMap="TgjjZcxxResult">

+ 4 - 3
test-api/src/main/resources/mapper/TgjjZcxxMapper2.xml

@@ -19,7 +19,7 @@
     <parameterMap id="TgjjZcxx" type="com.sooka.model.bo.TgjjZcxx"></parameterMap>
 
     <sql id="selectTgjjZcxxVo">
-        select ID, DWJCBLSX, DWJCBLXX, GRJCBLSX, GRJCBLXX, YJCESX, YJCEXX, GRZFDKZCNX, GRZFDKZGED, GRZFDKZGDKBL, XMDKZCNX, XMDKZGDKBL, DJCZGZGDKED, ZXBH, JCJSSX, JCJSXX, GRZFDKYGSR, DKJCYS, ZFTQJCYS, LAST_UPDATE_TIME, CLLX from tgjj_zcxx
+        select ID, DWJCBLSX, DWJCBLXX, GRJCBLSX, GRJCBLXX, YJCESX, YJCEXX, GRZFDKZCNX, GRZFDKZGED, GRZFDKZGDKBL, XMDKZCNX, XMDKZGDKBL, DJCZGZGDKED, ZXBH, JCJSSX, JCJSXX, GRZFDKYGSR, DKJCYS, ZFTQJCYS, LAST_UPDATE_TIME lastUpdateTime, CLLX from tgjj_zcxx
     </sql>
 
     <select id="selectTgjjZcxxList" parameterMap="TgjjZcxx" resultMap="TgjjZcxxResult">
@@ -59,7 +59,7 @@
     <insert id="insertTgjjZcxx" parameterMap="TgjjZcxx" useGeneratedKeys="true" keyProperty="ID">
         insert into tgjj_zcxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ID != null">ID,</if>
+            <include refid="global_name"></include>
             <if test="DWJCBLSX != null">DWJCBLSX,</if>
             <if test="DWJCBLXX != null">DWJCBLXX,</if>
             <if test="GRJCBLSX != null">GRJCBLSX,</if>
@@ -82,7 +82,7 @@
             <if test="CLLX != null">CLLX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ID != null">#{ID},</if>
+            <include refid="global_value"></include>
             <if test="DWJCBLSX != null">#{DWJCBLSX},</if>
             <if test="DWJCBLXX != null">#{DWJCBLXX},</if>
             <if test="GRJCBLSX != null">#{GRJCBLSX},</if>
@@ -109,6 +109,7 @@
     <update id="updateTgjjZcxx" parameterMap="TgjjZcxx">
         update tgjj_zcxx
         <trim prefix="SET" suffixOverrides=",">
+            <include refid="update_sql"></include>
             <if test="DWJCBLSX != null">DWJCBLSX = #{DWJCBLSX},</if>
             <if test="DWJCBLXX != null">DWJCBLXX = #{DWJCBLXX},</if>
             <if test="GRJCBLSX != null">GRJCBLSX = #{GRJCBLSX},</if>

+ 4 - 4
test-api/target/classes/application-dev.yml

@@ -46,9 +46,9 @@ spring:
         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
             connection-timeout: 30000
               # 最小连接数
-            minimum-idle: 5
+            minimum-idle: 500
         # 最大连接数
-            maximum-pool-size: 15
+            maximum-pool-size: 15000
         # 自动提交
             auto-commit: true
         # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
@@ -75,9 +75,9 @@ spring:
         # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
             connection-timeout: 30000
               # 最小连接数
-            minimum-idle: 5
+            minimum-idle: 500
         # 最大连接数
-            maximum-pool-size: 15
+            maximum-pool-size: 15000
         # 自动提交
             auto-commit: true
         # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟

Plik diff jest za duży
+ 4 - 551
test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml


Plik diff jest za duży
+ 1 - 29
test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt


BIN
test-api/target/test-api-0.0.1-SNAPSHOT.jar.original