guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

门禁闸机功能

pull/14/head
liulixin 2024-01-25 11:20:21 +08:00
parent de49f0fa9c
commit a3e794bb31
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/service/gatemachine/impl/GateCarIOServiceImpl.java
View File

@ -35,7 +35,7 @@ public class GateCarIOServiceImpl implements GateCarIOService {
public List<PageData> getDatalistpage(Page page) { public List<PageData> getDatalistpage(Page page) {
if (page.getPd().get("GATE_AREA_TYPE") != null && "1".equals(page.getPd().get("GATE_AREA_TYPE"))) { if (page.getPd().get("GATE_AREA_TYPE") != null && "1".equals(page.getPd().get("GATE_AREA_TYPE"))) {
return czksGateCarIOMapper.getGroceryDatalistPage(page); return czksGateCarIOMapper.getGroceryDatalistPage(page);
} else if (page.getPd().get("GATE_AREA_TYPE") != null) { } else if (page.getPd().get("GATE_AREA_TYPE") != null && "2".equals(page.getPd().get("GATE_AREA_TYPE"))) {
return czksGateCarIOMapper.getMineralDatalistPage(page); return czksGateCarIOMapper.getMineralDatalistPage(page);
} }
return new ArrayList<>(); return new ArrayList<>();

38
src/main/resources/mybatis/datasource/gatemachine/CzksGateCarIOMapper.xml
View File

@ -174,10 +174,23 @@
<if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' "> <if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' ">
and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR} and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR}
</if> </if>
<if test="pd.JGSJ!=null and pd.JGSJ!='' and pd.CGSJ!=null and pd.CGSJ!=''">
and f.JGSJ <![CDATA[ >= ]]> #{pd.JGSJ ,jdbcType=VARCHAR} and f.CGSJ <![CDATA[ <= ]]> <if test="pd.startTime!=null and pd.startTime!='' and pd.endTime!=null and pd.endTime!=''">
#{pd.CGSJ ,jdbcType=VARCHAR} <if test="pd.IO!=null and pd.IO!=''">
<if test="pd.IO==0">
and f.PASS_TYPE=0 and f.JGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
#{pd.endTime ,jdbcType=VARCHAR}
</if> </if>
<if test="pd.IO==1">
and f.PASS_TYPE=1 and f.CGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
#{pd.endTime ,jdbcType=VARCHAR}
</if>
</if>
<if test="pd.IO==null or pd.IO=='' ">
and f.CREATTIME between #{pd.startTime ,jdbcType=VARCHAR} and #{pd.endTime ,jdbcType=VARCHAR}
</if>
</if>
<if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' "> <if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' ">
and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%') and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%')
</if> </if>
@ -193,10 +206,23 @@
<if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' "> <if test="pd.GATE_MACHINE_ID!=null and pd.GATE_MACHINE_ID!='' ">
and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR} and f.GATE_MACHINE_ID = #{pd.GATE_MACHINE_ID ,jdbcType=VARCHAR}
</if> </if>
<if test="pd.JGSJ!=null and pd.JGSJ!='' and pd.CGSJ!=null and pd.CGSJ!=''">
and f.JGSJ <![CDATA[ >= ]]> #{pd.JGSJ ,jdbcType=VARCHAR} and f.CGSJ <![CDATA[ <= ]]> <if test="pd.startTime!=null and pd.startTime!='' and pd.endTime!=null and pd.endTime!=''">
#{pd.CGSJ ,jdbcType=VARCHAR} <if test="pd.IO!=null and pd.IO!=''">
<if test="pd.IO==0">
and f.PASS_TYPE=0 and f.JGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
#{pd.endTime ,jdbcType=VARCHAR}
</if> </if>
<if test="pd.IO==1">
and f.PASS_TYPE=1 and f.CGSJ between #{pd.startTime ,jdbcType=VARCHAR} and
#{pd.endTime ,jdbcType=VARCHAR}
</if>
</if>
<if test="pd.IO==null or pd.IO=='' ">
and f.CREATTIME between #{pd.startTime ,jdbcType=VARCHAR} and #{pd.endTime ,jdbcType=VARCHAR}
</if>
</if>
<if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' "> <if test="pd.TRUCK_NO!=null and pd.TRUCK_NO!='' ">
and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%') and f.TRUCK_NO like CONCAT(CONCAT('%',#{pd.TRUCK_NO}),'%')
</if> </if>