From a6205cbf1a93ea8f77a771de2dbd68c8f1e52ebe Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 13:25:46 +0800
Subject: [PATCH] 电磁锁新增临时电子围栏查询修改提交
---
ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml | 20 ++++++++++++++++++--
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java | 8 +++++++-
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java
index b673448..ad8b921 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallTemporaryServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.service.impl;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -225,7 +226,12 @@
try{
ardTankWallTemporary.setCancelTime(processArray[1]);
}catch (Exception e){
- ardTankWallTemporary.setCancelTime("");
+ try{
+ Long cancelDate = this.sdf.parse(processArray[0]).getTime() + Long.parseLong(ardTankWallTemporary.getInterval()) * 60 * 1000;
+ ardTankWallTemporary.setCancelTime(this.sdf.format(cancelDate));
+ } catch (ParseException ex) {
+ ex.printStackTrace();
+ }
}
switch(ardTankWallTemporary.getProcessMark()){
case "1" : ardTankWallTemporary.setProcessInfo("鐢熸晥");break;
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml
index 91ddecb..f9172fa 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml
@@ -110,7 +110,7 @@
</foreach>
</delete>
- <select id="getArdTankWallTemporaryByCarId" parameterType="java.lang.String" resultMap="ArdTankWallTemporaryMarkResult">
+ <!--<select id="getArdTankWallTemporaryByCarId" parameterType="java.lang.String" resultMap="ArdTankWallTemporaryMarkResult">
select atwt.*,case process_mark
when '1' then 1
when '0' then 2
@@ -120,13 +120,29 @@
inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
where "asc".car_id = #{carId} order by mark asc,process_time desc
+ </select>-->
+
+ <select id="getArdTankWallTemporaryByCarId" parameterType="java.lang.String" resultMap="ArdTankWallTemporaryResult">
+ select atwt.* from ard_sy_car "asc"
+ inner join ard_tank_lock atl on "asc".car_id = atl.car_id
+ inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
+ inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
+ where "asc".car_id = #{carId} and atwt.process_mark = '1' order by process_time desc
</select>
+
+ <!--<select id="selectArdTankWallTemporaryTotalByCarId" parameterType="java.lang.String" resultType="java.lang.Long">
+ select count(distinct atwt.*) from ard_sy_car "asc"
+ inner join ard_tank_lock atl on "asc".car_id = atl.car_id
+ inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
+ inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
+ where "asc".car_id = #{carId}
+ </select>-->
<select id="selectArdTankWallTemporaryTotalByCarId" parameterType="java.lang.String" resultType="java.lang.Long">
select count(distinct atwt.*) from ard_sy_car "asc"
inner join ard_tank_lock atl on "asc".car_id = atl.car_id
inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
- where "asc".car_id = #{carId}
+ where "asc".car_id = #{carId} and atwt.process_mark = '1'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3