1.各种调整

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java

@@ -370,6 +370,9 @@ public class DmYdjh implements Serializable {
     private String lphqrry;
     private String lphqrrq;
 
+    private String zyq;
+    private String zyq1;
+
 
     @TableField(exist = false)
     private Long bs;

src/main/java/com/dsic/gj_erp/config/JapConfig.java

@@ -91,8 +91,12 @@ public class JapConfig {
     public DataSourceInitializer manDataSourceInitializer() {//6
         DataSourceInitializer dsInitializer = new DataSourceInitializer();
         HikariDataSource dataSource = (HikariDataSource) jpaDataSource();
-        dataSource.setMaximumPoolSize(9999);
-        dataSource.setLeakDetectionThreshold(2000);
+        dataSource.setConnectionTimeout(30000);
+        dataSource.setIdleTimeout(60000);
+        dataSource.setMaximumPoolSize(200);
+        dataSource.setLeakDetectionThreshold(60000);
+        dataSource.setMinimumIdle(40);
+        dataSource.setMaxLifetime(1800000);
         dsInitializer.setDataSource(dataSource);
         ResourceDatabasePopulator dbPopulator = new ResourceDatabasePopulator();
         dsInitializer.setDatabasePopulator(dbPopulator);

src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java

@@ -1145,7 +1145,7 @@ public class PgdSljhController {
             pwExportExcel.setSldw(qgKwMap.get(slKc.getSLDW()));
             pwExportExcel.setDcth(slKc.getDCTH());
             num++;
-
+            excels.add(pwExportExcel);
         }
 
 

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -67,5 +67,6 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
     List<Map<String,Object>> getWcl();
 
     List<Map<String,Object>> getYdjhByZt(String zyq,String zt,String wgzt,String wclzt,String from, String to);
+
     void xzylbs(String dcch,String dcpl);
 }

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -931,7 +931,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
             </if>
         from
             dm_ydjh
-        where zt>=11 and zt>=#{zt}
+        where zt>=11 and zt>=#{zt} and (zyq=#{zyq} or zyq1=#{zyq})
         <if test="wgzt=='62'">
             and isnull(qgfkrq,'')=''
         </if>