From 90ce9f0f3f3e7b763d0b5f344f84613a292d087f Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 31 Oct 2024 18:34:57 +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 | 6 ++--- .../sgzb/base/domain/DataReceiveDetail.java | 21 ++++++++++++++++ .../base/domain/EnterpriseDriverFile.java | 24 +++++++++++++++++++ .../mapper/EnterpriseDriverFileMapper.java | 14 +++++++++++ .../sgzb/base/mapper/MaMachineMapper.java | 4 ++++ .../sgzb/base/mapper/MaReceiveMapper.java | 4 ---- .../service/impl/MaReceiveServiceImpl.java | 24 ++++++++++++++++--- .../resources/mapper/base/MaMachineMapper.xml | 11 +++++++++ .../resources/mapper/base/MaReceiveMapper.xml | 22 +++++++---------- .../base/enterpriseDriverFileMapper.xml | 15 ++++++++++++ 10 files changed, 121 insertions(+), 24 deletions(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/EnterpriseDriverFileMapper.java create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml 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 5f1f811..288b1e4 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 @@ -30,9 +30,9 @@ public class MaReceiveController extends BaseController { private MaReceiveService maReceiveService; /** - * 数据推送接收 + * 接收租赁推送的数据 */ - @ApiOperation(value = "获取推送数据") + @ApiOperation(value = "接收租赁推送的数据") @PostMapping("/dataReceive") public AjaxResult getProjectInfoAll(@RequestBody String maMachineRequest) { if (StringUtils.isEmpty(maMachineRequest)) { @@ -86,7 +86,7 @@ public class MaReceiveController extends BaseController { } - @ApiOperation(value = "数据接收") + @ApiOperation(value = "查看数据接收详情") @GetMapping("/getDateReceiveMachine") public TableDataInfo getDateReceiveMachine(DataReceiveDetail dataReceiveDetail) { startPage(); 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 12e3110..44dd866 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 @@ -6,6 +6,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +import java.util.List; /** * @Author：liang.chao @@ -41,6 +42,11 @@ public class DataReceiveDetail { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date rentTime; + @ApiModelProperty(value = "租赁结束日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date orderOverTime; + @ApiModelProperty(value = "租赁价格") private String rentPrice; @@ -77,6 +83,18 @@ public class DataReceiveDetail { @ApiModelProperty(value = "机手姓名") private String maUserName; + @ApiModelProperty(value = "机手电话") + private String maUserPhone; + + @ApiModelProperty(value = "机手身份证号") + private String maUserIdCard; + + @ApiModelProperty(value = "机手性别(0女 1男)") + private Integer maUserSex; + + @ApiModelProperty(value = "机手年龄") + private Integer maUserAge; + @ApiModelProperty(value = "关键字") private String keyWord; @@ -90,4 +108,7 @@ public class DataReceiveDetail { @ApiModelProperty(value = "租赁商城装备id") private Long itemId; + + @ApiModelProperty(value = "机手附件信息") + private List enterpriseDriverFile; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java new file mode 100644 index 0000000..dedaa71 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java @@ -0,0 +1,24 @@ +package com.bonus.sgzb.base.domain; + + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class EnterpriseDriverFile { + + @ApiModelProperty(value = "ID") + private Integer id; + + @ApiModelProperty(value = "推送详情id") + private Integer receiveDetailId; + + @ApiModelProperty(value = "附件名称") + private String file_name; + + @ApiModelProperty(value = "附件地址") + private String fileUrl; + + @ApiModelProperty(value = "附件类型（0反面，1正面，2持证信息）") + private Integer fileType; +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/EnterpriseDriverFileMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/EnterpriseDriverFileMapper.java new file mode 100644 index 0000000..85227fc --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/EnterpriseDriverFileMapper.java @@ -0,0 +1,14 @@ +package com.bonus.sgzb.base.mapper; + + +import com.bonus.sgzb.base.domain.EnterpriseDriverFile; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface EnterpriseDriverFileMapper { + void insertEnterpriseDriverFile(EnterpriseDriverFile enterpriseDriverFile); + + List selectEnterpriseDriverFileByReceiveDetailId(Integer id); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java index 37aef1c..095bcea 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java @@ -48,4 +48,8 @@ public interface MaMachineMapper { * @return */ int updateNum(long typeId); + + Long selectMaMachineByItemId(Long itemId); + + Integer updateItemStatus(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 7cbd4d5..769f583 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,8 +26,4 @@ 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/impl/MaReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java index 35568bb..dd952d5 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 @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.domain.DataReceiveDetail; import com.bonus.sgzb.base.domain.DataReceiveInfo; +import com.bonus.sgzb.base.domain.EnterpriseDriverFile; +import com.bonus.sgzb.base.mapper.EnterpriseDriverFileMapper; import com.bonus.sgzb.base.mapper.MaMachineMapper; import com.bonus.sgzb.base.mapper.MaReceiveMapper; import com.bonus.sgzb.base.mapper.MaTypeMapper; @@ -34,6 +36,9 @@ public class MaReceiveServiceImpl implements MaReceiveService { @Resource private MaTypeMapper maTypeMapper; + @Resource + private EnterpriseDriverFileMapper enterpriseDriverFileMapper; + @Override @Transactional public int saveDataReceiveInfo(String maMachineRequest) { @@ -60,10 +65,19 @@ public class MaReceiveServiceImpl implements MaReceiveService { @Transactional public int saveDataReceiveDetails(DataReceiveDetail dataReceiveDetail) { int i = 0; + //保存推送详情 i = maReceiveMapper.saveDataReceiveDetails(dataReceiveDetail); if (i == 0) { throw new RuntimeException("保存失败"); } + //保存机手附件信息 + List enterpriseDriverFileList = dataReceiveDetail.getEnterpriseDriverFile(); + if (enterpriseDriverFileList != null && !enterpriseDriverFileList.isEmpty()){ + for (EnterpriseDriverFile enterpriseDriverFile : enterpriseDriverFileList) { + enterpriseDriverFile.setReceiveDetailId(dataReceiveDetail.getId()); + enterpriseDriverFileMapper.insertEnterpriseDriverFile(enterpriseDriverFile); + } + } return i; } @@ -82,7 +96,11 @@ public class MaReceiveServiceImpl implements MaReceiveService { @Override public List getDataReceiveDetails(DataReceiveDetail dataReceiveDetail) { - return maReceiveMapper.getDataReceiveDetails(dataReceiveDetail); + List dataReceiveDetails = maReceiveMapper.getDataReceiveDetails(dataReceiveDetail); + dataReceiveDetails.forEach(dataReceiveDetail1 -> { + dataReceiveDetail1.setEnterpriseDriverFile(enterpriseDriverFileMapper.selectEnterpriseDriverFileByReceiveDetailId(dataReceiveDetail1.getId())); + }); + return dataReceiveDetails; } @Override @@ -132,11 +150,11 @@ public class MaReceiveServiceImpl implements MaReceiveService { @Override public Long getItemStatus(Long itemId) { - return maReceiveMapper.selectMaMachineByItemId(itemId); + return maMachineMapper.selectMaMachineByItemId(itemId); } @Override public Integer updateItemStatus(Long itemId) { - return maReceiveMapper.updateItemStatus(itemId); + return maMachineMapper.updateItemStatus(itemId); } } 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 da529bd..9aa520c 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 @@ -272,6 +272,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_type set num = num - 1 where type_id = #{typeId} + + 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} + delete from ma_machine where ma_id in @@ -369,4 +374,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file 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 1b002df..f1272f9 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 @@ -8,9 +8,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into data_receive_info(push_num,receive_date) values(#{pushNum},now()) - - 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) - values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName},#{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId}) + + 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) + values(#{receiveId},#{checkCode},#{checkUnit},#{checkDate},#{isNew},#{maId},#{maUserName}, + #{nextCheckDate},#{outFactoryTime},#{rentPrice},#{rentTime},#{supplier},#{typeId},#{unitId}, + #{orderOverTime},#{maUserPhone},#{maUserIdCard},#{maUserSex},#{maUserAge}) UPDATE data_receive_detail @@ -24,11 +29,6 @@ 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 diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml new file mode 100644 index 0000000..0ef3c0a --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml @@ -0,0 +1,15 @@ + + + + + + insert into base_enterprise_driver_file(receive_detail_id,file_name,file_url,file_type) + values(#{receiveDetailId},#{fileName},#{fileUrl},#{fileType}) + + + \ No newline at end of file