diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java index 75cdbe5d91..80c3da0aca 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java @@ -53,6 +53,7 @@ import java.util.Date; @ApiModel(value = "盘库记录 视图数据对象", description = "盘库记录 视图数据对象") public class ScmVehicleInventoryVo implements Vo { + private String id; // id private String sid; // sid @ApiModelProperty("车架号") @@ -73,4 +74,6 @@ public class ScmVehicleInventoryVo implements Vo { private String InventoryState; // 盘库结果 @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("创建组织") + private String createOrgSid; // 创建组织 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java index a6075bd4d6..97b6bb77cf 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeign.java @@ -61,6 +61,11 @@ public interface ScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("查询待巡检记录列表") + @PostMapping("/stayListPage") + @ResponseBody + public ResultBean> stayListPage(@RequestBody PagerQuery pq); + @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java index f34cee5ef3..41001fc3b5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionFeignFallback.java @@ -54,6 +54,11 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol return rb.setMsg("接口anrui_scm/scmvehiclepatrolinspection/listPage无法访问"); } + @Override + public ResultBean> stayListPage(PagerQuery pq) { + return null; + } + @Override public ResultBean save(ScmVehiclePatrolinspectionDto dto){ return ResultBean.fireFail().setMsg("接口anrui_scm/scmvehiclepatrolinspection/save无法访问"); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java index fd59018e76..77bb3f0173 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionQuery.java @@ -50,7 +50,7 @@ import lombok.Data; public class ScmVehiclePatrolinspectionQuery implements Query { @ApiModelProperty("车架号") - private String mainSid; // 车架号 + private String vinNo; // 车架号 @ApiModelProperty("存放地点sid") private String locationSid; // 存放地点sid @ApiModelProperty("巡检开始日期") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java index 7e2588345c..f0a05fa4e7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java @@ -49,6 +49,7 @@ import lombok.Data; @ApiModel(value = "巡检记录 视图数据对象", description = "巡检记录 视图数据对象") public class ScmVehiclePatrolinspectionVo implements Vo { + private String id; // id private String sid; // sid @ApiModelProperty("车架号") @@ -65,4 +66,6 @@ public class ScmVehiclePatrolinspectionVo implements Vo { private String patrolInspectionState; // 巡检状态（通过/不通过） @ApiModelProperty("巡检状态（通过/不通过）") private String patrolInspectionStateKey; // 巡检状态（通过/不通过） + @ApiModelProperty("创建组织") + private String createOrgSid; // 创建组织 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java index 8240ed3510..df876428b4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthQuery.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; @@ -49,15 +50,12 @@ import lombok.Data; @ApiModel(value = "月度日常管理记录 查询条件", description = "月度日常管理记录 查询条件") public class ScmVehPatrolinspectionmonthQuery implements Query { - @ApiModelProperty("编号（yyyyMMdd）") - private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") - private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") - private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("创建开始日期") + private String createStartTime; // 创建开始日期 + @ApiModelProperty("创建结束日期") + private String createEndTime; // 创建结束日期 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java index 2f137d2b84..877a267a0e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java @@ -49,20 +49,29 @@ import lombok.Data; @ApiModel(value = "月度日常管理记录 视图数据对象", description = "月度日常管理记录 视图数据对象") public class ScmVehPatrolinspectionmonthVo implements Vo { - private String sid; // sid - - @ApiModelProperty("编号（yyyyMMdd）") - private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") - private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") - private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建人") + private String sid; + @ApiModelProperty("编号") + private String billNo; + @ApiModelProperty("创建人员") private String createByName; - @ApiModelProperty("巡检报告生成状态") + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("创建时间") + private String createTime; + @ApiModelProperty("剩余巡检记录数量") + private String surplusNumber; + @ApiModelProperty("巡检记录总数数量") + private String totalNumber; + @ApiModelProperty("未处理数量") + private String unHandledNumber; + @ApiModelProperty("已处理数量") + private String processedNumber; + @ApiModelProperty("未巡检数量") + private String notHandledNumber; + @ApiModelProperty("实际巡检数量") + private String actualNumber; + @ApiModelProperty("报告状态") private int state; + @ApiModelProperty("是否显示生成报告按钮") + private Boolean showReportBtn; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java index cef29e52cc..c851a6caa0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java @@ -76,7 +76,6 @@ public interface ScmVehicleInventoryMapper extends BaseMapper getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); @@ -143,4 +142,5 @@ public interface ScmVehicleInventoryMapper extends BaseMapper getInventoryAll(String useOrgSid); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml index c6c619f267..14b81f7793 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml @@ -171,5 +171,4 @@ where svi.useOrgSid = #{useOrgSid} order by id desc - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index f0056a8c64..823d479abc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -139,6 +139,17 @@ public class ScmVehicleInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmVehicleInventoryVo record : pagging.getRecords()) { + String vinNo = record.getVinNo(); + String createOrgSid = record.getCreateOrgSid(); + String id = record.getId(); + List scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid); + if (scmVehicleStayInventoryVos.size() > 0){ + ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0); + record.setInventoryName(scmVehicleStayInventoryVo.getLastName()); + record.setInventoryDate(scmVehicleStayInventoryVo.getLastDate()); + } + } for (ScmVehicleInventoryVo record : pagging.getRecords()) { record.setInventoryState(""); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java index 4074a315fc..0245dab480 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionRest.java @@ -70,6 +70,13 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio return rb.success().setData(pv); } + @Override + public ResultBean> stayListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehiclePatrolinspectionService.stayListPage(pq); + return rb.success().setData(pv); + } + @Override @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index e32c89bcee..bddcb50867 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -84,23 +84,52 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("createOrgSid", query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getMainSid())) { - qw.like("mainSid", query.getMainSid()); + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("vinNo", query.getVinNo()); } if (StringUtils.isNotBlank(query.getLocationSid())) { - qw.like("locationSid", query.getLocationSid()); + qw.eq("locationSid", query.getLocationSid()); } String patrolInspectionStartDate = query.getPatrolInspectionStartDate(); String patrolInspectionEndDate = query.getPatrolInspectionEndDate(); qw.apply(StringUtils.isNotEmpty(patrolInspectionStartDate), "date_format (patrolInspectionDate,'%Y-%m-%d') >= date_format('" + patrolInspectionStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(patrolInspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolInspectionEndDate + "','%Y-%m-%d')" ); + qw.ne("patrolInspectionStateKey",""); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } + public PagerVo stayListPage(PagerQuery pq) { + ScmVehiclePatrolinspectionQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid", query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("vinNo", query.getVinNo()); + } + if (StringUtils.isNotBlank(query.getLocationSid())) { + qw.eq("locationSid", query.getLocationSid()); + } + qw.eq("patrolInspectionStateKey",""); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmVehiclePatrolinspectionVo record : pagging.getRecords()) { + String vinNo = record.getVinNo(); + String id = record.getId(); + String createOrgSid = record.getCreateOrgSid(); + List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(vinNo, id, createOrgSid); + if (scmVehicleStayPatrolinspectionVos.size() > 0){ + ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0); + record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName()); + record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate()); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public void saveOrUpdateDto(ScmVehiclePatrolinspectionDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { @@ -262,4 +291,5 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getMonthRemarksByMainSid(String sid, String stateKey) { return baseMapper.getMonthRemarksByMainSid(sid, stateKey); } + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 2aa23df133..13b77db897 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -411,6 +411,7 @@ public class ScmVehicleReturnService extends MybatisBaseService