haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

APP修改

This commit is contained in:
cwchen 2024-04-26 11:27:12 +08:00
parent 81162d395d
commit fdbc2bf232
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/VehicleVo.java
View File

@ -48,6 +48,8 @@ public class VehicleVo {
private String bidCode; private String bidCode;
private String proName;
private String date; private String date;
private String startDate; private String startDate;
@ -59,5 +61,4 @@ public class VehicleVo {
private String value; private String value;
} }

8
securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/AppServiceImpl.java
View File

@ -104,9 +104,9 @@ public class AppServiceImpl implements IAppService {
String data = mapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1); String data = mapper.getUserAccessStatus(vo.getUserId(), Constant.ACCESS_TYPE, 1);
if (StringUtils.isNotEmpty(data)) { if (StringUtils.isNotEmpty(data)) {
String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2); String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
vo.setStatus(StringUtils.isEmpty(value) ? "离场" : value); vo.setStatus(StringUtils.isEmpty(value) ? "出" : value);
}else{ }else{
vo.setStatus("离场"); vo.setStatus("出");
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -135,9 +135,9 @@ public class AppServiceImpl implements IAppService {
String data = mapper.getUserAccessStatus(vo.getCarNum(), Constant.ACCESS_TYPE, 1); String data = mapper.getUserAccessStatus(vo.getCarNum(), Constant.ACCESS_TYPE, 1);
if (StringUtils.isNotEmpty(data)) { if (StringUtils.isNotEmpty(data)) {
String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2); String value = mapper.getUserAccessStatus(data, Constant.ACCESS_TYPE, 2);
vo.setAccessType(StringUtils.isEmpty(value) ? "离场" : value); vo.setAccessType(StringUtils.isEmpty(value) ? "出" : value);
}else{ }else{
vo.setAccessType("离场"); vo.setAccessType("出");
} }
} }
} catch (Exception e) { } catch (Exception e) {

2
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/AppMapper.xml
View File

@ -81,7 +81,7 @@
tw.warn_content AS warnContent, tw.warn_content AS warnContent,
IF(status = '1','已处理','未处理') AS status IF(status = '1','已处理','未处理') AS status
FROM tb_warn tw FROM tb_warn tw
WHERE tw.bid_code = #{bidCode} AND tw.warn_time BETWEEN CONCAT(CURRENT_DATE,' 00:00:00') AND CONCAT(CURRENT_DATE,' 23:59:59') WHERE tw.bid_code = #{bidCode}
ORDER BY warn_time DESC,status ASC ORDER BY warn_time DESC,status ASC
</select> </select>
<!--工程工序计划--> <!--工程工序计划-->

2
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/VehicleMapper.xml
View File

@ -4,7 +4,7 @@
<!--获取列表--> <!--获取列表-->
<select id="getVehicleLists" resultType="com.securitycontrol.entity.background.vo.VehicleVo"> <select id="getVehicleLists" resultType="com.securitycontrol.entity.background.vo.VehicleVo">
SELECT tc.id,tc.car_num as carNum,tc.user_name as userName,tc.phone ,tp.bid_code as bidCode SELECT tc.id,tc.car_num as carNum,tc.user_name as userName,tc.phone ,tp.bid_code as bidCode,tp.pro_name AS proName
FROM tb_car tc FROM tb_car tc
LEFT JOIN tb_project tp ON tp.bid_code = tc.bid_code LEFT JOIN tb_project tp ON tp.bid_code = tc.bid_code
where tc.del_flag = '0' where tc.del_flag = '0'