diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceHgzVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceHgzVo.java new file mode 100644 index 0000000000..39ee03a29a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusRecordsInvoiceHgzVo.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.buscenter.api.bustransferrecords; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @description: 发票 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class BusRecordsInvoiceHgzVo implements Vo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("物品名称") + private String invoiceTitle; + @ApiModelProperty("移交数量") + private String invoiceType; + @ApiModelProperty("物品单位") + private String invoicingName; + @ApiModelProperty("移交部门") + private String transferDept; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交备注") + private String transferRemarks; + @ApiModelProperty("移交附件") + private String transferFiles; + @ApiModelProperty("移交附件") + private List filePathList = new ArrayList<>(); + @ApiModelProperty("接收部门") + private String receiveDept; + @ApiModelProperty("接收人") + private String receiveName; + @ApiModelProperty("接收时间") + private String receiveTime; + @ApiModelProperty("接收状态:0待接收,1已接收") + private String receiveState; + @ApiModelProperty("接收备注") + private String receiveRemarks; + @ApiModelProperty("接收附件") + private String receiveFiles; + @ApiModelProperty("接收附件") + private List receiveFilesList = new ArrayList<>(); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java index be995a0a62..e0533e3463 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java @@ -28,6 +28,14 @@ public interface BusTransferRecordsFeign { @PostMapping("/pagerList") public ResultBean> pagerList(@RequestBody PagerQuery pq); + @ApiOperation("合格证移交记录分页列表") + @PostMapping("/hgzPagerList") + public ResultBean> hgzPagerList(@RequestBody PagerQuery pq); + + @ApiOperation("合格证移交记录详情") + @GetMapping("/getInvoiceInfoHgz") + ResultBean getInvoiceInfoHgz(@RequestParam("sid") String sid); + @ApiOperation("新增") @PostMapping("/saveRecords") ResultBean saveRecords(@RequestBody BusTransferRecordsDto dto); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsHgzQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsHgzQuery.java new file mode 100644 index 0000000000..526c67755b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsHgzQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.buscenter.api.bustransferrecords; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class BusTransferRecordsHgzQuery implements Query { + + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("组织全路径") + private String orgPath; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsHgzVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsHgzVo.java new file mode 100644 index 0000000000..2c1dcac5c7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsHgzVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.buscenter.api.bustransferrecords; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class BusTransferRecordsHgzVo implements Vo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("移交部门") + private String transferDept; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("接收部门") + private String receiveDept; + @ApiModelProperty("接收人") + private String receiveName; + @ApiModelProperty("移交时间") + private String createTime; + @ApiModelProperty("接收状态:0待接收,1已接收") + private String receiveState; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("物品名称") + private String goodsName; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java index 5bfb057f51..c8af752f16 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusRecordsInvoiceHgzVo; import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsHgzVo; import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -25,4 +28,9 @@ public interface BusTransferRecordsMapper extends BaseMapper @Delete("DELETE FROM bus_transfer_records WHERE goodsSid = #{sourceSid}") void delBySourceSid(String sourceSid); + + IPage hgzPagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + @Select("select * from bus_transfer_records where sid = #{sid}") + BusRecordsInvoiceHgzVo getInvoiceInfoHgz(String sid); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml index 24aeb63fea..a5e52f4c9c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml @@ -3,13 +3,13 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java index 1cea939c31..cc6662f62d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java @@ -29,6 +29,18 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign { return rb.success().setData(pv); } + @Override + public ResultBean> hgzPagerList(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busTransferRecordsService.hgzPagerList(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean getInvoiceInfoHgz(String sid) { + return busTransferRecordsService.getInvoiceInfoHgz(sid); + } + @Override public ResultBean saveRecords(BusTransferRecordsDto dto) { return busTransferRecordsService.saveRecords(dto); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java index 3495d39517..2cdab59d1c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java @@ -127,12 +127,12 @@ public class BusTransferRecordsService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectBySid(record.getReceiveSid()); - if(sysUserInfoVoResultBean.getData() != null){ + if (sysUserInfoVoResultBean.getData() != null) { record.setReceiveMobile(sysUserInfoVoResultBean.getData().getMobile()); } String receiveFile = record.getReceiveFiles(); - if(StringUtils.isNotBlank(receiveFile)){ - List receiveFileList = Arrays.asList(receiveFile.split(",")).stream().map(v->fileUploadComponent.getUrlPrefix()+v).collect(Collectors.toList()); + if (StringUtils.isNotBlank(receiveFile)) { + List receiveFileList = Arrays.asList(receiveFile.split(",")).stream().map(v -> fileUploadComponent.getUrlPrefix() + v).collect(Collectors.toList()); record.setReceiveFilesList(receiveFileList); } } @@ -140,6 +140,20 @@ public class BusTransferRecordsService extends MybatisBaseService hgzPagerList(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + BusTransferRecordsHgzQuery pagerQuery = pq.getParams(); + String orgPath = pagerQuery.getOrgPath(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + qw.eq("vinSid", pagerQuery.getVehSid()); + qw.eq("useOrgSid", useOrgSid); + qw.eq("goodsTypeKey", "02"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.hgzPagerList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean saveRecords(BusTransferRecordsDto dto) { ResultBean rb = ResultBean.fireFail(); BusTransferRecords BusTransferRecords = new BusTransferRecords(); @@ -279,4 +293,32 @@ public class BusTransferRecordsService extends MybatisBaseService getInvoiceInfoHgz(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusRecordsInvoiceHgzVo busRecordsInvoiceHgzVo = baseMapper.getInvoiceInfoHgz(sid); + String transferFiles = busRecordsInvoiceHgzVo.getTransferFiles(); + List filePathList = new ArrayList<>(); + if (StringUtils.isNotBlank(transferFiles)){ + String[] yjFiles = transferFiles.split(","); + for (String yjFile : yjFiles) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + yjFile = urlPrefix + yjFile; + filePathList.add(yjFile); + } + } + busRecordsInvoiceHgzVo.setFilePathList(filePathList); + String receiveFiles = busRecordsInvoiceHgzVo.getReceiveFiles(); + List receiveFilesList = new ArrayList<>(); + if (StringUtils.isNotBlank(receiveFiles)){ + String[] jsFiles = receiveFiles.split(","); + for (String jsFile : jsFiles) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + jsFile = urlPrefix + jsFile; + receiveFilesList.add(jsFile); + } + } + busRecordsInvoiceHgzVo.setReceiveFilesList(receiveFilesList); + return rb.success().setData(busRecordsInvoiceHgzVo); + } }