From c1dac2372301d8b636efbd445aae5054d00e3bb3 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 6 Aug 2024 10:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bracelet/vo/EquipmentReqDataVo.java | 5 +++++ .../bracelet/mapper/EquipmentReqMapper.java | 4 ++-- .../service/impl/EquipmentReqServiceImpl.java | 12 +++++++--- .../mapper/bracelet/EquipmentReqMapper.xml | 22 ++++++++++++++----- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java index 37d60f2..a8d6225 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/EquipmentReqDataVo.java @@ -77,4 +77,9 @@ public class EquipmentReqDataVo { * 领用时间 */ private Date lyTime = new Date(); + + /** + * 领用人类型 0正常 1临时人员 + */ + private Integer userType = 0; } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java index 3d6fedc..2691061 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java @@ -58,7 +58,7 @@ public interface EquipmentReqMapper { * @author cwchen * @date 2024/8/5 17:02 */ - void updateShBoxData(@Param("vo") EquipmentReqDataVo vo, @Param("equipment") EquipmentReqDataVo.Equipment equipment); + void updateDeviceData(@Param("vo") EquipmentReqDataVo vo, @Param("equipment") EquipmentReqDataVo.Equipment equipment,@Param("type")int type); /** * 判断设备是否已经归还 @@ -87,7 +87,7 @@ public interface EquipmentReqMapper { * @author cwchen * @date 2024/8/6 9:16 */ - void updateshBoxData(BraceletParamsDto dto); + void updateReturnDeviceData(@Param("params") BraceletParamsDto dto,@Param("type") int type); /** * 更新设备归还状态 diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java index 75865ce..c25a32b 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java @@ -70,9 +70,12 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { mapper.addDevUseData(vo); mapper.addDevUseDetailData(vo); for (EquipmentReqDataVo.Equipment equipment : vo.getList()) { - // 更新手环箱状态 if(Objects.equals(equipment.getDevType(), BusinessConstants.SHX)){ - mapper.updateShBoxData(vo,equipment); + // 更新手环箱状态 + mapper.updateDeviceData(vo,equipment,1); + }else{ + // 更新其他设备状态 + mapper.updateDeviceData(vo,equipment,2); } } return AjaxResult.success(); @@ -100,7 +103,10 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { try { if(Objects.equals(dto.getDevType(), BusinessConstants.SHX)){ // 设备类型为手环箱更新手环箱状态 - mapper.updateshBoxData(dto); + mapper.updateReturnDeviceData(dto,1); + }else{ + // 设备类型为其他设备更新设备状态 + mapper.updateReturnDeviceData(dto,2); } mapper.returnDevice(dto); return AjaxResult.success(); diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml index d63033a..b9b78df 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml @@ -40,13 +40,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - - - UPDATE tb_sh_box SET team_id = #{vo.teamId},pro_id = #{vo.proId},gt_id = #{vo.powerId} WHERE id = #{equipment.devId} + + + + UPDATE tb_sh_box SET team_id = #{vo.teamId},pro_id = #{vo.proId},gt_id = #{vo.powerId} WHERE id = #{equipment.devId} + + + UPDATE tb_dev_ly SET pro_id = #{vo.proId},team_id = #{vo.teamId},ly_user = #{vo.createUser},ly_status = 0,ly_time = #{vo.lyTime},user_type = #{vo.userType},gt_id = #{vo.powerId} WHERE dev_id = #{equipment.devId} + - - - UPDATE tb_sh_box SET team_id = null,pro_id = null,gt_id = null WHERE id = #{devId} + + + + UPDATE tb_sh_box SET team_id = null,pro_id = null,gt_id = null WHERE id = #{params.devId} + + + UPDATE tb_dev_ly SET pro_id = null,team_id = null,ly_user = null,ly_status = null,ly_time = null,user_type = null,gt_id = null WHERE dev_id = #{params.devId} +