bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安全漏洞升级，推送逻辑优化

This commit is contained in:
15856 2024-11-15 09:33:12 +08:00
parent a0f8909f4d
commit 0aa51bfcf4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -265,9 +265,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
} }
// 更新 (ma_machine 设备表)的状态 // 更新 (ma_machine 设备表)的状态
leaseOutDetailsMapper.updateMaMachineStatus(record); leaseOutDetailsMapper.updateMaMachineStatus(record);
log.error("check0010"); log.error("check0010{}",record.getMaId());
//查询装备是否推送到租赁 //查询装备是否推送到租赁
/* MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(Long.valueOf(record.getMaId())); MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(Long.valueOf(record.getMaId()));
log.error("check0011"); log.error("check0011");
if (maMachine != null && maMachine.getPushStatus().equals(1)) { if (maMachine != null && maMachine.getPushStatus().equals(1)) {
//同步租赁商城机具状态 //同步租赁商城机具状态
@ -284,7 +284,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
log.error("同步租赁商城机具状态失败"); log.error("同步租赁商城机具状态失败");
throw new RuntimeException("同步租赁商城机具状态失败"); throw new RuntimeException("同步租赁商城机具状态失败");
} }
}*/ }
log.error("check0012"); log.error("check0012");
} }
} }

2
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
<select id="selectMaMachineByMaId" parameterType="Long" resultMap="MaMachineResult"> <select id="selectMaMachineByMaId" parameterType="Long" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code, select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code, m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType, m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,