From e185fac396430926ae259a0461c1a248741644a0 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Wed, 30 Oct 2024 17:41:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=82=A8=E6=8E=A5=E6=94=B6=E7=A7=9F?= =?UTF-8?q?=E8=B5=81=E8=A3=85=E5=A4=87=E6=8E=A8=E9=80=81=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E7=A7=9F=E8=B5=81=E9=80=80=E7=A7=9F?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=A3=85=E5=A4=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/MaReceiveController.java | 17 ++++++++++++++++- .../sgzb/base/domain/DataReceiveDetail.java | 3 +++ .../bonus/sgzb/base/mapper/MaReceiveMapper.java | 4 ++++ .../sgzb/base/service/MaReceiveService.java | 4 ++++ .../base/service/impl/MaReceiveServiceImpl.java | 10 ++++++++++ .../resources/mapper/base/MaReceiveMapper.xml | 15 ++++++++++++++- 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java index 000ec39..5f1f811 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java @@ -9,6 +9,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; @@ -46,7 +47,7 @@ public class MaReceiveController extends BaseController { } - @ApiOperation(value = "获取推送数据") + @ApiOperation(value = "查询推送数据") @GetMapping("/getDataReceive") public TableDataInfo getDataReceive(DataReceiveInfo dataReceiveInfo) { startPage(); @@ -92,4 +93,18 @@ public class MaReceiveController extends BaseController { List dateReceiveMachine = maReceiveService.getDateReceiveMachine(dataReceiveDetail); return getDataTable(dateReceiveMachine); } + + @ApiOperation(value = "获取租赁设备状态") + @GetMapping("/getItemStatus") + public AjaxResult getDataReceiveDetailsById(Long itemId) { + Long itemStatus = maReceiveService.getItemStatus(itemId); + return success(itemStatus); + } + + @ApiOperation(value = "修改租赁设备状态") + @GetMapping("/updateItemStatus") + public AjaxResult updateItemStatus(Long itemId) { + Integer itemStatus = maReceiveService.updateItemStatus(itemId); + return success(itemStatus); + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java index f209d30..12e3110 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java @@ -87,4 +87,7 @@ public class DataReceiveDetail { @ApiModelProperty(value = "接收人") private String userIds; + + @ApiModelProperty(value = "租赁商城装备id") + private Long itemId; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java index 769f583..7cbd4d5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaReceiveMapper.java @@ -26,4 +26,8 @@ public interface MaReceiveMapper { List getDateReceiveMachine(DataReceiveDetail dataReceiveDetail); int updateInfoStatus(@Param("id") Integer id); + + Long selectMaMachineByItemId(Long itemId); + + Integer updateItemStatus(Long itemId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java index 427acd2..87891dd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java @@ -20,4 +20,8 @@ public interface MaReceiveService { int saveMachine(DataReceiveInfo dataReceiveInfo); List getDateReceiveMachine(DataReceiveDetail dataReceiveDetail); + + Long getItemStatus(Long itemId); + + Integer updateItemStatus(Long itemId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java index 3bb9806..35568bb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java @@ -129,4 +129,14 @@ public class MaReceiveServiceImpl implements MaReceiveService { List dateReceiveMachine = maReceiveMapper.getDateReceiveMachine(dataReceiveDetail); return dateReceiveMachine; } + + @Override + public Long getItemStatus(Long itemId) { + return maReceiveMapper.selectMaMachineByItemId(itemId); + } + + @Override + public Integer updateItemStatus(Long itemId) { + return maReceiveMapper.updateItemStatus(itemId); + } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml index 791331c..1b002df 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml @@ -24,6 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SET receive_status = 1 where id = #{id} + + UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id + SET mm.ma_status = 130 + where drd.item_id = #{itemId} + SELECT * FROM data_receive_detail WHERE receive_id = #{receiveId} + \ No newline at end of file