YL2767 2 天前
父节点
当前提交
dd5694b232

+ 7
- 7
src/main/resource/localhost/db.properties 查看文件

3
 #jdbc.user=root
3
 #jdbc.user=root
4
 #jdbc.password=root
4
 #jdbc.password=root
5
 
5
 
6
-#jdbc.driverClass=com.mysql.jdbc.Driver
7
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
8
-#jdbc.user=root
9
-#jdbc.password=root
10
-
11
 jdbc.driverClass=com.mysql.jdbc.Driver
6
 jdbc.driverClass=com.mysql.jdbc.Driver
12
-jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
7
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
13
 jdbc.user=root
8
 jdbc.user=root
14
-jdbc.password=122403
9
+jdbc.password=root
10
+
11
+#jdbc.driverClass=com.mysql.jdbc.Driver
12
+#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
13
+#jdbc.user=root
14
+#jdbc.password=122403

+ 7
- 2
src/main/resource/mapper/ware/InRecordMapper.xml 查看文件

354
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
354
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
355
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
355
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
356
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
356
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
357
-    and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
357
+    <if test="param15 != null and param15 != ''">
358
+      and ifnull(a.name,'*') = #{param15,jdbcType=VARCHAR}
359
+    </if>
360
+
358
 
361
 
359
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
362
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
360
     <if test="param18 != null and param18.size() !=0" >
363
     <if test="param18 != null and param18.size() !=0" >
405
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
408
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
406
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
409
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
407
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
410
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
408
-    and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
411
+    <if test="param15 != null and param15 != ''">
412
+      and ifnull(a.name,'*') = #{param15,jdbcType=VARCHAR}
413
+    </if>
409
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
414
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
410
     <if test="param18 != null and param18.size() !=0" >
415
     <if test="param18 != null and param18.size() !=0" >
411
       or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">
416
       or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">

+ 6
- 2
src/main/resource/mapper/ware/OutRecordMapper.xml 查看文件

425
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
425
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
426
    and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
426
    and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
427
    and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
427
    and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
428
-   and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
428
+    <if test="param15 != null and param15 != ''">
429
+      and ifnull(e.name,'*') = #{param15,jdbcType=VARCHAR}
430
+    </if>
429
     and ifnull(t.back_flag,0) &lt;> '1'
431
     and ifnull(t.back_flag,0) &lt;> '1'
430
     order by t.add_time desc
432
     order by t.add_time desc
431
   </select>
433
   </select>
452
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
454
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
453
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
455
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
454
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
456
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
455
-    and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
457
+    <if test="param15 != null and param15 != ''">
458
+      and ifnull(e.name,'*') = #{param15,jdbcType=VARCHAR}
459
+    </if>
456
     and ifnull(t.back_flag,0) &lt;> '1'
460
     and ifnull(t.back_flag,0) &lt;> '1'
457
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
461
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
458
     <if test="param18 != null and param18.size() !=0" >
462
     <if test="param18 != null and param18.size() !=0" >

+ 18
- 5
src/main/resource/mapper/ware/StoreMapper.xml 查看文件

495
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
495
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
496
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
496
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
497
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
497
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
498
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
499
-    and  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
498
+    <if test="param6 != null and param6 != ''">
499
+      and ifnull(d.name,'*') = #{param6,jdbcType=VARCHAR}
500
+    </if>
501
+    <if test="param9 != null and param9 != ''">
502
+      and ifnull(e.name,'*') = #{param9,jdbcType=VARCHAR}
503
+    </if>
500
 
504
 
501
       and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
505
       and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
502
     <if test="param13 != null and param13.size() !=0" >
506
     <if test="param13 != null and param13.size() !=0" >
556
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
560
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
557
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
561
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
558
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
562
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
559
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
560
-    and  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
563
+    <if test="param6 != null and param6 != ''">
564
+      and ifnull(d.name,'*') = #{param6,jdbcType=VARCHAR}
565
+    </if>
566
+    <if test="param9 != null and param9 != ''">
567
+      and ifnull(e.name,'*') = #{param9,jdbcType=VARCHAR}
568
+    </if>
561
 
569
 
562
     and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
570
     and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
563
     <if test="param13 != null and param13.size() !=0" >
571
     <if test="param13 != null and param13.size() !=0" >
673
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
681
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
674
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
682
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
675
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
683
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
676
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
684
+    <if test="param6 != null and param6 != ''">
685
+      and ifnull(d.name,'*') = #{param6,jdbcType=VARCHAR}
686
+    </if>
687
+    <if test="param9 != null and param9 != ''">
688
+      and ifnull(e.name,'*') = #{param9,jdbcType=VARCHAR}
689
+    </if>
677
     and  t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
690
     and  t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
678
     and t.cancel_flag = '0'
691
     and t.cancel_flag = '0'
679
     and t.out_flag = '0'
692
     and t.out_flag = '0'

正在加载...
取消
保存