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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2024-11-11 13:55:50 +08:00
parent 6759bffa30 6d05324a96
commit e78eb49e31
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java
View File

@ -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);
}
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/MaReceiveService.java
View File

@ -21,7 +21,7 @@ public interface MaReceiveService {
List<DataReceiveDetail> getDateReceiveMachine(DataReceiveDetail dataReceiveDetail);
Long getItemStatus(Long itemId);
Long getItemStatus(String itemId);
Integer updateItemStatus(DataReceiveDetail dataReceiveDetail);
Integer updateItemStatus(String dataReceiveDetail);
}

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java
View File

@ -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 {

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

@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<update id="updateItemStatus">
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}
</update>

4
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaReceiveMapper.xml
View File

@ -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})
</insert>
<update id="updateStatus">
UPDATE data_receive_detail