From 14dedd4725278feee88c7f2e2a5ff2b8cc6694ff Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 7 Nov 2024 18:23:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=93=E5=82=A8=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E8=A3=85=E5=A4=87=E6=8E=A8=E9=80=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E7=A7=9F=E8=B5=81=E9=80=80?= =?UTF-8?q?=E7=A7=9F=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/controller/MaReceiveController.java | 8 ++++---- .../bonus/sgzb/base/service/MaReceiveService.java | 4 ++-- .../base/service/impl/MaReceiveServiceImpl.java | 14 +++++++++++--- .../main/resources/mapper/base/MaMachineMapper.xml | 2 +- 4 files changed, 18 insertions(+), 10 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 caf0428..8628c69 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 @@ -96,15 +96,15 @@ public class MaReceiveController extends BaseController { @ApiOperation(value = "获取租赁设备状态") @GetMapping("/getItemStatus") - public AjaxResult getDataReceiveDetailsById(Long itemId) { - Long itemStatus = maReceiveService.getItemStatus(itemId); + public AjaxResult getDataReceiveDetailsById(@RequestBody String maMachineRequest) { + Long itemStatus = maReceiveService.getItemStatus(maMachineRequest); return success(itemStatus); } @ApiOperation(value = "修改租赁设备状态") @GetMapping("/updateItemStatus") - public AjaxResult updateItemStatus(DataReceiveDetail dataReceiveDetail) { - Integer itemStatus = maReceiveService.updateItemStatus(dataReceiveDetail); + public AjaxResult updateItemStatus(@RequestBody String maMachineRequest) { + Integer itemStatus = maReceiveService.updateItemStatus(maMachineRequest); return success(itemStatus); } } 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 f292bf0..4f7bf15 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 @@ -21,7 +21,7 @@ public interface MaReceiveService { List getDateReceiveMachine(DataReceiveDetail dataReceiveDetail); - Long getItemStatus(Long itemId); + Long getItemStatus(String itemId); - Integer updateItemStatus(DataReceiveDetail dataReceiveDetail); + Integer updateItemStatus(String dataReceiveDetail); } 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 ab70286..374f1cf 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 @@ -150,13 +150,21 @@ public class MaReceiveServiceImpl implements MaReceiveService { } @Override - public Long getItemStatus(Long itemId) { - return maMachineMapper.selectMaMachineByItemId(itemId); + public Long getItemStatus(String itemId) { + log.info("获取状态{}", itemId); + JSONObject object = JSONObject.parseObject(itemId); + itemId = object.getString("body"); + DataReceiveDetail dataReceiveDetail = JSONObject.parseObject(itemId, DataReceiveDetail.class); + return maMachineMapper.selectMaMachineByItemId(dataReceiveDetail.getItemId()); } - public Integer updateItemStatus(DataReceiveDetail dataReceiveDetail) { + public Integer updateItemStatus(String dataReceiveDetailReq) { + log.info("修改状态{}", dataReceiveDetailReq); + JSONObject object = JSONObject.parseObject(dataReceiveDetailReq); + dataReceiveDetailReq = object.getString("body"); + DataReceiveDetail dataReceiveDetail = JSONObject.parseObject(dataReceiveDetailReq, DataReceiveDetail.class); if (dataReceiveDetail!=null && dataReceiveDetail.getOrderOverTime()!= null){ return maReceiveMapper.updateOrderOverTime(dataReceiveDetail); }else { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml index c02534d..4c1a216 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml @@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UPDATE ma_machine mm LEFT JOIN data_receive_detail drd on mm.ma_id = drd.ma_id - SET mm.ma_status = 130 + SET mm.ma_status = #{maStatus} where drd.item_id = #{itemId} From 6d05324a96e4950a21ac4773a55cb1bd9ae134c8 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Fri, 8 Nov 2024 16:51:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=93=E5=82=A8=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=9A=84=E6=97=B6=E5=80=99=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/base/MaReceiveMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0fe67f6..0f15677 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 @@ -12,10 +12,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into data_receive_detail(receive_id,check_code,check_unit,check_date,is_new,ma_id, ma_user_name,next_check_date,out_factory_time,rent_price,rent_time, supplier,type_id,unit_id,order_over_time,ma_user_phone,ma_user_id_card, - ma_user_sex,ma_user_age) + ma_user_sex,ma_user_age,item_id) values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName}, #{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId}, - #{orderOverTime},#{maUserPhone},#{maUserIdCard},#{maUserSex},#{maUserAge}) + #{orderOverTime},#{maUserPhone},#{maUserIdCard},#{maUserSex},#{maUserAge},#{itemId}) UPDATE data_receive_detail