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

门口门禁记录

pull/14/head
liulixin 2024-01-19 16:56:47 +08:00
parent 34f27ebfd4
commit 63cc479f4f
5 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java
View File

@ -55,16 +55,14 @@ public class GateCarIOController extends BaseController {
} }
@RequestMapping(value = "/getIORecords") @RequestMapping(value = "/getIORecords")
public ReturnMap getIORecord(Page page) { public ReturnMap getIORecord() {
PageData pageData = this.getPageData(); return ReturnMap.ok().put("data", gateCarIOService.getIORecord(this.getPageData()));
page.setPd(pageData);
return ReturnMap.ok().put("data", gateCarIOService.getIORecord(page));
} }
@RequestMapping(value = "/getEQCount") @RequestMapping(value = "/getEQCount")
public ReturnMap getTodayEQCount() { public ReturnMap getTodayEQCount() {
PageData pageData = this.getPageData(); PageData page = this.getPageData();
return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(pageData)); return ReturnMap.ok().put("data", gateCarIOService.getTodayEQCount(page));
} }
} }

10
src/main/java/com/zcloud/mapper/datasource/gatemachine/CzksGateCarIOMapper.java
View File

@ -16,7 +16,11 @@ public interface CzksGateCarIOMapper {
void saveMineral(PageData pageData); void saveMineral(PageData pageData);
List<PageData> getIORecord(Page page); List<PageData> getIORecord(PageData pd);
PageData countGroceryEnterAndQuit(PageData pageData); PageData countGroceryEnterAndQuit(PageData pd);
PageData countMineralEnterAndQuit(PageData pageData); PageData countMineralEnterAndQuit(PageData pd);
List<PageData> getGroceryIORecords(PageData page);
List<PageData> getMineralIORecords(PageData page);
} }

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

@ -10,7 +10,7 @@ public interface GateCarIOService {
List<PageData> getDatalistpage(Page page); List<PageData> getDatalistpage(Page page);
List<PageData> getIORecord(Page page); List<PageData> getIORecord(PageData page);
void edit(PageData pd); void edit(PageData pd);

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

@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -29,8 +30,12 @@ public class GateCarIOServiceImpl implements GateCarIOService {
} }
@Override @Override
public List<PageData> getIORecord(Page page) { public List<PageData> getIORecord(PageData page) {
return czksGateCarIOMapper.getIORecord(page); if (page.get("areaType") != null && "1".equals(page.get("areaType").toString())) {
return czksGateCarIOMapper.getGroceryIORecords(page);
} else {
return czksGateCarIOMapper.getMineralIORecords(page);
}
} }
@Override @Override
@ -60,10 +65,10 @@ public class GateCarIOServiceImpl implements GateCarIOService {
} }
@Override @Override
public PageData getTodayEQCount(PageData PageData) { public PageData getTodayEQCount(PageData page) {
PageData pageData = new PageData(); PageData pageData = new PageData();
pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(PageData)); pageData.put("grocery", czksGateCarIOMapper.countGroceryEnterAndQuit(page));
pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(PageData)); pageData.put("mineral", czksGateCarIOMapper.countMineralEnterAndQuit(page));
return pageData; return pageData;
} }
} }

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

@ -63,23 +63,33 @@
#{OPERATOR}, #{OPERATOR},
#{OPERATTIME}) #{OPERATTIME})
</insert> </insert>
<select id="getIORecord" resultType="com.zcloud.entity.PageData"> <select id="getGroceryIORecords" resultType="com.zcloud.entity.PageData" parameterType="pd">
select * from select * from
<if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '0'">
`qa-czks-prevention`.`work_grocery_io_record` f `qa-czks-prevention`.`work_grocery_io_record` f
where 1=1
<if test="JGSJ != null and JGSJ != ''">
and f.JGSJ = #{JGSJ}
</if> </if>
<if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '1'"> <if test="LX != null and LX != ''">
`qa-czks-prevention`.`work_mineral_io_record` f and f.LX = #{LX}
</if> </if>
where <if test="TRUCK_NO != null and TRUCK_NO != ''">
<if test="pd.JGSJ != null and pd.JGSJ != ''"> and f.TRUCK_NO like CONCAT(CONCAT('%', #{TRUCK_NO}),'%')
f.JGSJ = #{pd.JGSJ}
</if> </if>
<if test="pd.LX != null and pd.LX != ''"> order by f.OPERATTIME desc
and f.LX = #{pd.LX} </select>
<select id="getMineralIORecords" resultType="com.zcloud.entity.PageData" parameterType="pd">
select * from
`qa-czks-prevention`.`work_grocery_io_record` f
where 1=1
<if test="JGSJ != null and JGSJ != ''">
and f.JGSJ = #{JGSJ}
</if> </if>
<if test="pd.TRUCK_NO != null and pd.TRUCK_NO != ''"> <if test="LX != null and LX != ''">
f.TRUCK_NO like CONCAT(CONCAT('%', #{pd.TRUCK_NO}),'%') and f.LX = #{LX}
</if>
<if test="TRUCK_NO != null and TRUCK_NO != ''">
and f.TRUCK_NO like CONCAT(CONCAT('%', #{TRUCK_NO}),'%')
</if> </if>
order by f.OPERATTIME desc order by f.OPERATTIME desc
</select> </select>
@ -106,10 +116,10 @@
OPERATTIME=#{OPERATTIME} OPERATTIME=#{OPERATTIME}
where 1=1 where 1=1
<if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '0'"> <if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '0'">
f.grocery_record_id=#{grocery_record_id} and f.grocery_record_id=#{grocery_record_id}
</if> </if>
<if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '1'"> <if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '1'">
f.mineral_record_id=#{mineral_record_id} and f.mineral_record_id=#{mineral_record_id}
</if> </if>
</update> </update>
<update id="removeByIds"> <update id="removeByIds">
@ -123,10 +133,10 @@
set ISDELETE = 1 set ISDELETE = 1
where 1=1 where 1=1
<if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '0'"> <if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '0'">
f.grocery_record_id=#{grocery_record_id} and f.grocery_record_id=#{grocery_record_id}
</if> </if>
<if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '1'"> <if test="pd.areaType != null and pd.areaType != '' and pd.areaType == '1'">
f.mineral_record_id=#{mineral_record_id} and f.mineral_record_id=#{mineral_record_id}
</if> </if>
</update> </update>
<select id="countGroceryEnterAndQuit" resultType="com.zcloud.entity.PageData" parameterType="pageData"> <select id="countGroceryEnterAndQuit" resultType="com.zcloud.entity.PageData" parameterType="pageData">