From bf6fe21474279bd13cb4347bdafb4e6c9ad7a511 Mon Sep 17 00:00:00 2001 From: lzh Date: Sat, 24 Sep 2022 10:24:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?anrui=5Fbuscenter=E5=8A=A0=E5=85=A5Jenkins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-buscenter/anrui-buscenter-api/pom.xml | 10 ++++++++++ .../src/main/resources/application-test.yml | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/pom.xml b/anrui-buscenter/anrui-buscenter-api/pom.xml index e0343ba464..7f11a724b0 100644 --- a/anrui-buscenter/anrui-buscenter-api/pom.xml +++ b/anrui-buscenter/anrui-buscenter-api/pom.xml @@ -32,5 +32,15 @@ + + + nexus-releases + http://nexus3.yyundong.com/repository/yxt-mvn-releases/ + + + nexus-snapshots + http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml index 7d0380b5ca..af61324a0d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml @@ -1,16 +1,16 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.104.142.192:3306/anrui_buscenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/anrui_buscenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: anrui_@root + password: yxt_mysql_138 cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 172.18.0.5:8848 redis: database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 + host: 172.18.0.7 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制） From d6ff52b41023377f91cc6c61f398d68102147166 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Sat, 24 Sep 2022 12:05:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=98=E5=BA=93=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/AdministratorsListVo.java | 11 + .../api/basevehicle/BaseVehicleFeign.java | 12 +- .../basevehicle/BaseVehicleFeignFallback.java | 10 + .../api/basevehicle/InspectionVinQuery.java | 18 + .../base/api/basevehicle/InspectionVinVo.java | 30 + .../biz/basevehicle/BaseVehicleMapper.java | 5 +- .../biz/basevehicle/BaseVehicleMapper.xml | 15 + .../base/biz/basevehicle/BaseVehicleRest.java | 15 + .../biz/basevehicle/BaseVehicleService.java | 40 +- .../AppScmVehicleCarInventoryListPageVo.java | 3 + ...ppScmVehiclePatrolinspectionPageQuery.java | 6 + .../AppScmVehiclePatrolinspectionPageVo.java | 6 + .../ScmVehiclePatrolinspectionFeign.java | 13 +- ...mVehiclePatrolinspectionFeignFallback.java | 8 +- .../ScmVehiclePatrolinspectionVo.java | 16 +- .../AppLiableListDto.java | 14 + .../AppLiableListVo.java | 15 + .../AppPatrolinspectionDto.java | 25 + .../AppScmVehiclePatroVo.java | 26 +- ...ScmVehiclePatrolinspectionsheetInfoVo.java | 22 +- .../AppScmVehiclePatrolinspectionsheetVo.java | 79 +++ .../ScmVehiclePatrolinspectionsheet.java | 8 +- .../ScmVehiclePatrolinspectionsheetDto.java | 26 +- .../ScmVehiclePatrolinspectionsheetFeign.java | 6 + ...clePatrolinspectionsheetFeignFallback.java | 5 + ...pScmVehicleStayPatrolinspectionPageVo.java | 10 +- .../ScmVehicleStayPatrolinspectionFeign.java | 5 - ...icleStayPatrolinspectionFeignFallback.java | 4 - .../ScmVehicleStayPatrolinspectionVo.java | 4 - .../ScmVehInventorymonth.java | 12 +- .../ScmVehInventorymonthVo.java | 4 + .../AppScmVehPatrolinspectionmonthVo.java | 4 + .../ScmVehPatrolinspectionmonth.java | 12 +- .../ScmVehPatrolinspectionmonthFeign.java | 6 +- .../ScmVehPatrolinspectionmonthVo.java | 15 +- .../VehPatrolinspectionmonthVo.java | 2 + .../ScmVehPatrolinspectionreportFeign.java | 8 +- .../api/scmwarehouse/ScmWarehouseFeign.java | 4 + .../ScmWarehouseFeignFallback.java | 5 + .../ScmVehicleInventoryMapper.java | 3 + .../ScmVehicleInventoryMapper.xml | 30 +- .../ScmVehicleInventoryService.java | 22 + .../ScmVehiclePatrolinspectionMapper.java | 33 +- .../ScmVehiclePatrolinspectionMapper.xml | 80 ++- .../ScmVehiclePatrolinspectionRest.java | 18 +- .../ScmVehiclePatrolinspectionService.java | 141 +++-- ...ScmVehiclePatrolinspectionsheetMapper.java | 12 +- .../ScmVehiclePatrolinspectionsheetMapper.xml | 45 +- .../ScmVehiclePatrolinspectionsheetRest.java | 13 +- ...cmVehiclePatrolinspectionsheetService.java | 535 +++++++++++++++--- .../ScmVehicleStayPatrolinspectionMapper.java | 12 - .../ScmVehicleStayPatrolinspectionMapper.xml | 34 -- .../ScmVehicleStayPatrolinspectionRest.java | 10 - ...ScmVehicleStayPatrolinspectionService.java | 51 -- .../ScmVehInventorymonthMapper.java | 2 +- .../ScmVehInventorymonthMapper.xml | 3 +- .../ScmVehInventorymonthService.java | 26 +- .../ScmVehPatrolinspectionmonthMapper.java | 29 +- .../ScmVehPatrolinspectionmonthMapper.xml | 3 +- .../ScmVehPatrolinspectionmonthService.java | 95 +++- .../ScmVehPatrolinspectionreportRest.java | 7 +- .../biz/scmwarehouse/ScmWarehouseMapper.java | 4 + .../biz/scmwarehouse/ScmWarehouseRest.java | 5 + .../biz/scmwarehouse/ScmWarehouseService.java | 6 + .../inspection/AppInspectionVinQuery.java | 17 + .../inspection/AppInspectionVinVo.java | 27 + .../inspection/AppScmVehiclePatrolinVo.java | 24 +- .../AppScmVehiclePatrolinspectionFeign.java | 13 +- ...mVehiclePatrolinspectionFeignFallback.java | 5 + .../supplychain/inspection/LiableListDto.java | 15 + .../supplychain/inspection/LiableListVo.java | 15 + .../inspection/PatrolinspectionDto.java | 44 +- .../inspection/PatrolinspectionInfoVo.java | 19 +- .../inspection/PatrolinspectionPageQuery.java | 6 + .../inspection/PatrolinspectionPageVo.java | 6 + .../StayPatrolinspectionPageVo.java | 10 +- .../AppScmVehiclePatrolinspectionRest.java | 5 + .../AppScmVehiclePatrolinspectionService.java | 19 +- doc/databases/scm_tables_vehicle.sql | 50 +- 79 files changed, 1564 insertions(+), 459 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AdministratorsListVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppPatrolinspectionDto.java rename anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/{scmvehiclepatrolinspection => scmvehiclepatrolinspectionsheet}/AppScmVehiclePatroVo.java (60%) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AdministratorsListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AdministratorsListVo.java new file mode 100644 index 0000000000..0521629874 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AdministratorsListVo.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AdministratorsListVo implements Vo { + private static final long serialVersionUID = 7538930552934742063L; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 7d68290abe..4e88d03800 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -7,6 +7,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -382,11 +383,20 @@ public interface BaseVehicleFeign { @PostMapping("/getPcVinByWarehouseSid") public ResultBean> getPcVinByWarehouseSid(@RequestBody PagerQuery pagerQuery); - @ApiOperation("根据用户sid 获取库存车辆信息") + @ApiOperation("盘库根据用户sid 获取库存车辆信息") @GetMapping("/selectInventoryRecords/{userSid}") public ResultBean> selectInventoryRecords(@PathVariable("userSid") String userSid); + @ApiOperation("巡检根据用户sid 获取库存车辆信息") + @GetMapping("/selectPatrolinspections") + public ResultBean> selectPatrolinspections(@RequestParam(value = "userSid") String userSid, @RequestParam(value = "vinNoList") List vinNoList); + @ApiOperation("根据车架号和分公司sid查询车辆信息") @PostMapping("/selectByVinNoAndOrgSid") ResultBean selectByVinNoAndOrgSid(@RequestParam("vinNo") String vinNo, @RequestParam("createOrgSid") String createOrgSid); + + @ApiOperation("巡检获取车价号") + @PostMapping("/getInspectionVinList") + @ResponseBody + public ResultBean> getInspectionVinList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 8dabaa09c0..08bd348de4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -296,9 +296,19 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> selectPatrolinspections(String userSid, List vinNoList) { + return null; + } + @Override public ResultBean selectByVinNoAndOrgSid(String vinNo, String createOrgSid) { return null; } + @Override + public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java new file mode 100644 index 0000000000..89c82da2c9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class InspectionVinQuery implements Query { + private static final long serialVersionUID = -2243140628415411304L; + + @ApiModelProperty("车架号") + private String name; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("分公司sid") + private String useOrgSid; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinVo.java new file mode 100644 index 0000000000..c226505d82 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/InspectionVinVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class InspectionVinVo implements Vo { + private static final long serialVersionUID = -4983969999493350392L; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("存放地点") + private String address; + @ApiModelProperty("存放地点") + private String addressSid; + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("车型Sid") + private String modelSid; + @ApiModelProperty("仓库管理员") + private String administratorsName; + @ApiModelProperty("仓库管理员Sid") + private String administratorsSid; + @ApiModelProperty("仓库管理员") + List administratorsList; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 0b5814c03d..a164f0669b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery; import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -452,7 +453,9 @@ public interface BaseVehicleMapper extends BaseMapper { @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}") void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid); - IPage specialRebateDisGetVehPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage specialRebateDisGetVehPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage getInspectionVinList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getVehBySpecialRebateSid(String specialRebateSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index cf63d0e035..cb779ab7be 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1143,4 +1143,19 @@ LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` WHERE ssv.`specialRebateSid` = #{specialRebateSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index f83bd8ee25..7de72ea0e8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -866,6 +866,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.selectInventoryRecords(userSid); } + @Override + public ResultBean> selectPatrolinspections(String userSid, List vinNoList) { + return baseVehicleService.selectPatrolinspections(userSid,vinNoList); + } + @Override public ResultBean selectByVinNoAndOrgSid(String vinNo, String createOrgSid) { ResultBean rb = ResultBean.fireFail(); @@ -873,5 +878,15 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(baseVehicle); } + @Override + public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { + if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { + new ResultBean<>().success().setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = baseVehicleService.getInspectionVinList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index fd9c613c63..9fcb95ffcb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -33,6 +33,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; @@ -96,6 +100,8 @@ public class BaseVehicleService extends MybatisBaseService> selectPatrolinspections(String userSid, List vinNoList) { + ResultBean rb = ResultBean.fireFail(); + String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + //条件：本分公司、非删除、库存或采购退库中或调入或调出中 + QueryWrapper qw = new QueryWrapper<>(); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); + qw.notIn("bv.vinNo", vinNoList); + List list = baseMapper.selectInventoryRecords(userOrgSid, qw); + return rb.success().setData(list); + } + public ResultBean> selExistingCar(String createOrgSid) { ResultBean rb = ResultBean.fireFail(); List stringList = baseVehinstallService.selectListVo(createOrgSid); @@ -2420,7 +2437,7 @@ public class BaseVehicleService extends MybatisBaseService 0){ + if (params.getVehSids().size() > 0) { qw.notIn("bv.sid", params.getVehSids()); } return baseMapper.specialRebateDisGetVehPageList(page, qw); @@ -2496,4 +2513,25 @@ public class BaseVehicleService extends MybatisBaseService baseSpecialRebateDisGetVehVos = baseMapper.getVehBySpecialRebateSid(specialRebateSid); return rb.success().setData(baseSpecialRebateDisGetVehVos); } + + public IPage getInspectionVinList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + pagerQuery.getParams().setUseOrgSid(useOrgSid); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) { + qw.eq("bv.vinNo", pagerQuery.getParams().getName()); + } + qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid()); + qw.eq("bv.isDelete", 0); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); + IPage iPage = baseMapper.getInspectionVinList(page, qw); + for (InspectionVinVo record : iPage.getRecords()) { + String addressSid = record.getAddressSid(); + ScmWarehouseVo data = scmWarehouseFeign.selectByAddressSid(addressSid).getData(); + record.setAdministratorsSid(data.getLibTubeSid()); + record.setAdministratorsName(data.getLibTubeName()); + } + return iPage; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageVo.java index 403b15d1e8..5efb99f656 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleCarInventoryListPageVo.java @@ -13,6 +13,9 @@ public class AppScmVehicleCarInventoryListPageVo implements Vo { @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("车架号") + private String mainSid; + @ApiModelProperty("合格证状态") private String certificateState; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java index d0b613fb20..5008114fba 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageQuery.java @@ -18,6 +18,12 @@ public class AppScmVehiclePatrolinspectionPageQuery implements Query { @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31") private String date; + @ApiModelProperty("巡检结果") + private String state; + + @ApiModelProperty("月度巡检sid") + private String reportSid; + @ApiModelProperty("盘库开始日期") @JsonProperty("patrolinspectionStartDate") private String patrolinspectionStartDate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java index a25e4df588..8f8b15f42b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java @@ -14,6 +14,12 @@ public class AppScmVehiclePatrolinspectionPageVo implements Vo { @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("巡检结果") + private String state; + + @ApiModelProperty("巡检结果") + private String stateKey; + @ApiModelProperty("月度管理sid") private String mainSid; 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 ce1a06b55c..a6075bd4d6 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 @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehiclepatrolinspection; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -74,15 +76,14 @@ public interface ScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("手机端-获取待巡检列表") + @PostMapping("/getInspectionList") + @ResponseBody + public ResultBean> getInspectionList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("手机端-获取巡检记录列表") @PostMapping("/getCarInspectionList") @ResponseBody public ResultBean> getCarInventoryList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("手机端-巡检详情") - @PostMapping("/getInspectionInfo/{recordSid}") - @ResponseBody - public ResultBean getInspectionInfo(@PathVariable("recordSid") String recordSid); - - } \ No newline at end of file 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 f715994887..f34cee5ef3 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 @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehiclepatrolinspection; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,14 +71,12 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol } @Override - public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { + public ResultBean> getInspectionList(PagerQuery pagerQuery) { return null; } @Override - public ResultBean getInspectionInfo(String recordSid) { + public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { return null; } - - } \ No newline at end of file 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 570f921377..7e2588345c 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 @@ -51,14 +51,18 @@ public class ScmVehiclePatrolinspectionVo implements Vo { private String sid; // sid - @ApiModelProperty("车架号") - private String mainSid; // 车架号 - @ApiModelProperty("存放地点") + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("月度巡检sid") + private String mainSid; // 月度巡检sid + @ApiModelProperty("存放地点") private String location; // 存放地点 - @ApiModelProperty("巡检日期") + @ApiModelProperty("巡检日期") private String patrolInspectionDate; // 巡检日期 - @ApiModelProperty("巡检人员") + @ApiModelProperty("巡检人员") private String patrolInspectionName; // 巡检人员 - @ApiModelProperty("巡检状态（通过/不通过）") + @ApiModelProperty("巡检状态（通过/不通过）") private String patrolInspectionState; // 巡检状态（通过/不通过） + @ApiModelProperty("巡检状态（通过/不通过）") + private String patrolInspectionStateKey; // 巡检状态（通过/不通过） } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListDto.java new file mode 100644 index 0000000000..6301b73494 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListDto.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLiableListDto implements Dto { + private static final long serialVersionUID = 6773133691586837274L; + @ApiModelProperty("相关责任人名称") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListVo.java new file mode 100644 index 0000000000..3d85043078 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppLiableListVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLiableListVo implements Vo { + + private static final long serialVersionUID = -6937435770815613231L; + @ApiModelProperty("相关责任人名称") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppPatrolinspectionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppPatrolinspectionDto.java new file mode 100644 index 0000000000..b37ab4a9bb --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppPatrolinspectionDto.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; + +import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppPatrolinspectionDto implements Dto { + private static final long serialVersionUID = -6618342081512558213L; + + @ApiModelProperty("巡检sid") + private String mainSid; + + @ApiModelProperty("消息内容") + private String msgContent; + + @ApiModelProperty("接收人sid") + private List list; + + @ApiModelProperty("接收人id") + private List receiveIdList; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatroVo.java similarity index 60% rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java rename to anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatroVo.java index 9e317ce965..a80da0892a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatroVo.java @@ -1,9 +1,10 @@ -package com.yxt.anrui.scm.api.scmvehiclepatrolinspection; +package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -14,8 +15,11 @@ import java.util.List; @Data public class AppScmVehiclePatroVo implements Vo { private static final long serialVersionUID = 4433285895858153789L; + + private String sid; + @ApiModelProperty("车架号") - private String mainSid; + private String vinNo; @ApiModelProperty("车型") private String model; @ApiModelProperty("巡检日期") @@ -26,14 +30,22 @@ public class AppScmVehiclePatroVo implements Vo { private String location; @ApiModelProperty("巡检情况说明") private String situationExplain; - @ApiModelProperty("存在的问题及处理结果") - private String problemsAndResults; + @ApiModelProperty("存在问题") + private String problems; + @ApiModelProperty("处理结果") + private String results; @ApiModelProperty("相关附件") - private List images; - @ApiModelProperty(value = "sid") - private String sid; + private List images = new ArrayList<>(); + @ApiModelProperty("相关责任人") + private List liableList = new ArrayList<>(); + @ApiModelProperty("相关责任人") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; @ApiModelProperty(value = "定位地址") private String address; @ApiModelProperty(value = "经纬度") private String addressCode; + @ApiModelProperty("巡检结果") + private String state; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java index 5a07d52603..8e42b5956e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java @@ -1,9 +1,11 @@ package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -20,20 +22,29 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo { @ApiModelProperty("车型") private String model; + @ApiModelProperty("车型Sid") + private String modelSid; + @ApiModelProperty("巡检情况说明") private String explain; - @ApiModelProperty("存在的问题及处理结果") - private String result; + @ApiModelProperty("存在问题") + private String problems; + + @ApiModelProperty("处理结果") + private String results; @ApiModelProperty("相关责任人") - private String liableName; + private List liableList = new ArrayList<>(); @ApiModelProperty("相关责任人") + private String liableName; + + @ApiModelProperty("相关责任人sid") private String liableSid; @ApiModelProperty("相关照片") - private List images; + private List images = new ArrayList<>(); @ApiModelProperty("经纬度") private String location; @@ -44,4 +55,7 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("用户sid") + private String userName; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetVo.java new file mode 100644 index 0000000000..12d351f977 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_scm(anrui_scm)
+ * File: ScmVehiclePatrolinspectionsheet.java
+ * Class: anrui_scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet
+ * Description: 巡检单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 14:30:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "巡检单", description = "巡检单") +@TableName("scm_vehicle_patrolinspectionsheet") +public class AppScmVehiclePatrolinspectionsheetVo implements Vo { + + private String sid; + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("巡检记录sid") + private String mainSid; // 巡检记录sid + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型") + private String model; // 车型 + @ApiModelProperty("巡检情况说明") + private String situationExplain; // 巡检情况说明 + @ApiModelProperty("存在问题及处理结果") + private String problemsAndResults; // 存在问题及处理结果 + @ApiModelProperty("相关责任人") + private String dutyName; + @ApiModelProperty("相关责任人sid") + private String dutySid; + @ApiModelProperty("经纬度") + private String location; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("创建组织") + private String createOrgSid; + @ApiModelProperty("使用组织") + private String useOrgSid; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java index c001b154f5..87f1fe7326 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheet.java @@ -59,8 +59,10 @@ public class ScmVehiclePatrolinspectionsheet extends BaseEntity { private String model; // 车型 @ApiModelProperty("巡检情况说明") private String situationExplain; // 巡检情况说明 - @ApiModelProperty("存在问题及处理结果") - private String problemsAndResults; // 存在问题及处理结果 + @ApiModelProperty("存在问题") + private String problems; + @ApiModelProperty("处理结果") + private String results; @ApiModelProperty("相关责任人") private String dutyName; @ApiModelProperty("相关责任人sid") @@ -72,6 +74,6 @@ public class ScmVehiclePatrolinspectionsheet extends BaseEntity { @ApiModelProperty("创建组织") private String createOrgSid; @ApiModelProperty("使用组织") - private String useOrgName; + private String useOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java index dfc53d2fe4..622dd18850 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -51,6 +52,7 @@ import java.util.List; @ApiModel(value = "巡检单 数据传输对象", description = "巡检单 数据传输对象") public class ScmVehiclePatrolinspectionsheetDto implements Dto { + private static final long serialVersionUID = -506609460264934786L; private String sid; @ApiModelProperty("车架号") private String vinNo; // 车架号 @@ -62,12 +64,12 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto { private String model; // 车型 @ApiModelProperty("巡检情况说明") private String situationExplain; // 巡检情况说明 - @ApiModelProperty("存在问题及处理结果") - private String problemsAndResults; // 存在问题及处理结果 + @ApiModelProperty("存在问题") + private String problems; + @ApiModelProperty("处理结果") + private String results; @ApiModelProperty("相关责任人") - private String dutyName; - @ApiModelProperty("相关责任人sid") - private String dutySid; + private List liableList; @ApiModelProperty("经纬度") private String location; @ApiModelProperty("详细地址") @@ -82,8 +84,14 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto { private String createOrgSid; @ApiModelProperty("使用组织") private String useOrgName; - - @ApiModelProperty(value = "state") - private int state; - + @ApiModelProperty("车况") + private String carConditionValue; + @ApiModelProperty("车况") + private String carConditionKey; + @ApiModelProperty("新增状态值") + private Boolean newAdd; + @ApiModelProperty("存放地点sid") + private String warehouseSid; + @ApiModelProperty("存放地点") + private String warehouse; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java index 1fb0c4d0b9..940b929ccc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -84,6 +85,11 @@ public interface ScmVehiclePatrolinspectionsheetFeign { @ResponseBody public ResultBean getInspection(@PathVariable("recordSid") String recordSid); + @ApiOperation("手机端-巡检详情") + @PostMapping("/getInspectionInfo/{recordSid}") + @ResponseBody + public ResultBean getInspectionInfo(@PathVariable("recordSid") String recordSid); + @ApiOperation("手机端-提交巡检操作") @PostMapping("/saveInspection") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeignFallback.java index e9215b6c5c..720954757e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetFeignFallback.java @@ -78,6 +78,11 @@ public class ScmVehiclePatrolinspectionsheetFeignFallback implements ScmVehicleP return null; } + @Override + public ResultBean getInspectionInfo(String recordSid) { + return null; + } + @Override public ResultBean saveInspection(ScmVehiclePatrolinspectionsheetDto dto) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageVo.java index 465d7412d6..37694c1e29 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/AppScmVehicleStayPatrolinspectionPageVo.java @@ -13,6 +13,9 @@ public class AppScmVehicleStayPatrolinspectionPageVo implements Vo { @ApiModelProperty("sid") private String sid; + @ApiModelProperty("月度巡检sid") + private String mainSid; + @ApiModelProperty("车架号") private String vin; @@ -28,7 +31,10 @@ public class AppScmVehicleStayPatrolinspectionPageVo implements Vo { @ApiModelProperty("车型") private String model; - @ApiModelProperty("暂存状态") - private boolean state; + @ApiModelProperty("巡检结果") + private String resultKey; + + @ApiModelProperty("巡检结果") + private String resultValue; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java index 58ca4dfba0..44b5e1f79f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeign.java @@ -75,11 +75,6 @@ public interface ScmVehicleStayPatrolinspectionFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("手机端-获取巡检列表") - @PostMapping("/getInspectionList") - @ResponseBody - public ResultBean> getInspectionList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("手机端-查询本分公司下代办数量") @GetMapping("/getToDoNum/{userSid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java index 7222f21a09..234da023ff 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionFeignFallback.java @@ -70,10 +70,6 @@ public class ScmVehicleStayPatrolinspectionFeignFallback implements ScmVehicleSt return rb.setMsg("接口anrui_scm/scmvehiclestaypatrolinspection/fetchDetailsBySid无法访问"); } - @Override - public ResultBean> getInspectionList(PagerQuery pagerQuery) { - return null; - } @Override public ResultBean getToDoNum(String userSid) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionVo.java index 72c00b86f7..2f1bbdd16b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionVo.java @@ -61,8 +61,4 @@ public class ScmVehicleStayPatrolinspectionVo implements Vo { private String patrolInspectionDate; // 上次巡检日期 @ApiModelProperty("上次巡检人员") private String patrolInspectionName; // 上次巡检人员 - @ApiModelProperty("车型sid") - private String modelSid; - @ApiModelProperty("车型名称") - private String modelName; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonth.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonth.java index 37ee4042f2..950b7e12ea 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonth.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonth.java @@ -50,15 +50,17 @@ import lombok.Data; public class ScmVehInventorymonth extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("编号（yyyyMMdd）") + @ApiModelProperty("编号（yyyyMMdd）") private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") + @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") + @ApiModelProperty("使用组织") private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建人") + private String createByName; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java index b14625be91..edbbbdfd6c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: aaa(aaa)
* File: ScmVehInventorymonthVo.java
@@ -53,6 +55,8 @@ public class ScmVehInventorymonthVo implements Vo { @ApiModelProperty("编号（yyyyMMdd）") private String billNo; // 编号（yyyyMMdd） + @ApiModelProperty("创建时间") + private Date createTime; // 使用组织名称 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 @ApiModelProperty("创建组织名称") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java index 67bc370179..befad5f3b9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthVo.java @@ -30,6 +30,10 @@ public class AppScmVehPatrolinspectionmonthVo implements Vo { private String notHandledNumber; @ApiModelProperty("实际巡检数量") private String actualNumber; + @ApiModelProperty("报告状态") + private int state; + @ApiModelProperty("是否显示生成报告按钮") + private Boolean showReportBtn; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java index b7692ba1e9..ced213c3bf 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonth.java @@ -50,15 +50,17 @@ import lombok.Data; public class ScmVehPatrolinspectionmonth extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("编号（yyyyMMdd）") + @ApiModelProperty("编号（yyyyMMdd）") private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") + @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") + @ApiModelProperty("使用组织") private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建人") + private String createByName; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java index 73a800f667..72bf73c691 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthFeign.java @@ -53,8 +53,8 @@ import java.util.List; */ @Api(tags = "月度日常管理记录") @FeignClient( - contextId = "aaa-ScmVehPatrolinspectionmonth", - name = "aaa", + contextId = "anrui-scm-ScmVehPatrolinspectionmonth", + name = "anrui-scm", path = "v1/scmvehpatrolinspectionmonth", fallback = ScmVehPatrolinspectionmonthFeignFallback.class) public interface ScmVehPatrolinspectionmonthFeign { @@ -85,7 +85,7 @@ public interface ScmVehPatrolinspectionmonthFeign { public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid); @ApiOperation("手机端-获取巡检报告列表") - @PostMapping("/getCarInventoryReportList") + @PostMapping("/getCarInspectionReportList") @ResponseBody public ResultBean> getCarInspectionReportList(@RequestBody PagerQuery pagerQuery); 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 510c8397d7..2f137d2b84 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 @@ -51,15 +51,18 @@ public class ScmVehPatrolinspectionmonthVo implements Vo { private String sid; // sid - @ApiModelProperty("编号（yyyyMMdd）") + @ApiModelProperty("编号（yyyyMMdd）") private String billNo; // 编号（yyyyMMdd） - @ApiModelProperty("创建组织") + @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("使用组织") + @ApiModelProperty("使用组织") private String useOrgSid; // 使用组织 - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - + @ApiModelProperty("创建人") + private String createByName; + @ApiModelProperty("巡检报告生成状态") + private int state; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java index 8be1f843c7..08a256abd7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/VehPatrolinspectionmonthVo.java @@ -27,4 +27,6 @@ public class VehPatrolinspectionmonthVo implements Vo { private int notHandledNumber; @ApiModelProperty("实际巡检数量") private int actualNumber; + @ApiModelProperty("正常的数量") + private int normalNumber; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java index ff9ef6c847..55c5f8990f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "日常管理报告") @FeignClient( - contextId = "aaa-ScmVehPatrolinspectionreport", - name = "aaa", + contextId = "anrui-scm-ScmVehPatrolinspectionreport", + name = "anrui-scm", path = "v1/scmvehpatrolinspectionreport", fallback = ScmVehPatrolinspectionreportFeignFallback.class) public interface ScmVehPatrolinspectionreportFeign { @@ -65,12 +65,12 @@ public interface ScmVehPatrolinspectionreportFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmVehPatrolinspectionreportDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java index de2171ab9e..f4bf356c13 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java @@ -67,4 +67,8 @@ public interface ScmWarehouseFeign { @ApiOperation("手机端-获取仓库") @GetMapping("/selectWarehouseByUserSid/{userSid}") public ResultBean> selectWarehouseByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("巡检获取仓库管理人") + @GetMapping("/selectByAddressSid/{addressSid}") + public ResultBean selectByAddressSid(@PathVariable("addressSid") String addressSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java index 5cba54bef6..c71d688781 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java @@ -73,4 +73,9 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign { public ResultBean> selectWarehouseByUserSid(String userSid) { return null; } + + @Override + public ResultBean selectByAddressSid(String addressSid) { + return null; + } } \ No newline at end of file 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 5bec7ce07d..cef29e52cc 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 @@ -140,4 +140,7 @@ public interface ScmVehicleInventoryMapper extends BaseMapper selectInventory(@Param("vin") String vin, @Param("id") String id, @Param("createOrgSid") String createOrgSid); List selectByUseOrgSid(@Param("createOrgSid") String createOrgSid); + + + List 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 6db8fc1c99..c6c619f267 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 @@ -51,7 +51,7 @@ ${ew.sqlSegment} - and concat(svi.vinNo,svi.InventoryName) LIKE concat('%', #{names}, '%') + and concat(svi.vinNo) LIKE concat('%', #{names}, '%') ORDER BY id DESC @@ -153,15 +153,23 @@ 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 fdea0ce8b0..3d2a364cb6 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 @@ -28,17 +28,20 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.itextpdf.text.pdf.PRAcroForm; import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleinventory.*; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto; import com.yxt.anrui.scm.api.scmvehiclestayinventory.*; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService; import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; @@ -49,6 +52,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -86,6 +90,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService createQueryWrapper(ScmVehicleInventoryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -433,6 +439,18 @@ public class ScmVehicleInventoryService extends MybatisBaseService getMonthRemarksByMainSid(String sid, String inventoryStateKey) { return baseMapper.getMonthRemarksByMainSid(sid, inventoryStateKey); } + + public List getInventoryAll(String useOrgSid) { + return baseMapper.getInventoryAll(useOrgSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java index b199601960..c785150358 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java @@ -31,10 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; +import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -61,8 +66,8 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from scm_vehicle_patrolinspection") - List selectListVo(); + @Select("select * from scm_vehicle_patrolinspection where useOrgSid = #{useOrgSid} ") + List selectListVo(@Param("useOrgSid") String useOrgSid); /** * 手机端-获取巡检记录列表 @@ -74,10 +79,26 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); - AppScmVehiclePatroVo getInspectionInfo(String recordSid); - - @Select("select count(*) from scm_vehicle_patrolinspection svp where svp.useOrgSid = #{useOrgSid} and patrolInspectionStateKey = '000' ") - int getPatrolinspectionState(String useOrgSid); VehPatrolinspectionmonthVo getMonthByMainSid(@Param("mainSid") String mainSid); + + /** + * 手机端-获取巡检列表 + * + * @param page + * @param qw + * @param names + * @return + */ + IPage getInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + + List selPatrolinspection(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid); + + + int updateByMainSid(@Param("stateKey") String stateKey, @Param("stateValue") String stateValue, @Param("newDate") String newDate, @Param("newName") String newName, @Param("mainSid") String mainSid); + + List getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey); + + @Select("update scm_vehicle_patrolinspection set isDelete = 1 where sid = #{sid} ") + void updateBySid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml index 5306c053b6..cd38747538 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml @@ -27,6 +27,8 @@ vinNo as vin, mainSid, location as warehouse, + patrolInspectionState as `state`, + patrolInspectionStateKey as stateKey, patrolInspectionDate as newInspectionDate, patrolInspectionName as newInspectionName FROM scm_vehicle_patrolinspection svp @@ -40,31 +42,67 @@ ORDER BY id DESC - - + + + + + + + update scm_vehicle_patrolinspection + set patrolInspectionStateKey = #{stateKey}, + patrolInspectionState =#{stateValue}, + patrolInspectionDate =#{newDate}, + patrolInspectionName =#{newName} + where sid = #{mainSid} + \ No newline at end of file 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 c10b81b72c..4074a315fc 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 @@ -27,6 +27,8 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -95,6 +97,17 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio return rb.success().setData(vo); } + @Override + public ResultBean> getInspectionList(PagerQuery pagerQuery) { + if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { + new ResultBean<>().success().setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = scmVehiclePatrolinspectionService.getInspectionList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + @Override public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { @@ -105,9 +118,4 @@ public class ScmVehiclePatrolinspectionRest implements ScmVehiclePatrolinspectio PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); return new ResultBean>().success().setData(pagerVo); } - - @Override - public ResultBean getInspectionInfo(String recordSid) { - return scmVehiclePatrolinspectionService.getInspectionInfo(recordSid); - } } 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 912b55c760..e32c89bcee 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 @@ -31,6 +31,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; +import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; +import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.common.base.config.component.FileUploadComponent; @@ -129,6 +133,51 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getInspectionList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + pagerQuery.getParams().setUseOrgSid(useOrgSid); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { + qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); + } + if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { + qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid()); + } + qw.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001"); + qw.eq("svp.isDelete", 0); + AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams(); + IPage iPage = baseMapper.getInventoryList(page, qw, params.getNames()); + List records = iPage.getRecords(); + for (AppScmVehicleStayPatrolinspectionPageVo record : records) { + List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid); + if (scmVehicleStayPatrolinspectionVos.size() > 0) { + for (ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo : scmVehicleStayPatrolinspectionVos) { + if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate() == null) { + record.setInspectionDate("无"); + } else { + record.setInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate()); + } + if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionName() == null) { + record.setInspectionName("无"); + } else { + record.setInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName()); + } + } + } else { + record.setInspectionDate("无"); + record.setInspectionName("无"); + } + } + return iPage; + } + /** * 手机端-获取巡检记录列表 * @@ -146,32 +195,46 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = appCarQueryWrapper(pagerQuery.getParams()); - AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams(); - IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getName()); - return iPage; - } - - /** - * 手机端-获取巡检记录列表 查询条件 - * - * @param query - * @return - */ - private QueryWrapper appCarQueryWrapper(AppScmVehiclePatrolinspectionPageQuery query) { QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("svp.createOrgSid", query.getUseOrgSid()); + if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { + qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("svp.locationSid", query.getWarehouseSid()); + if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { + qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid()); } - String patrolinspectionStartDate = query.getPatrolinspectionStartDate(); - String patrolinspectionEndDate = query.getPatrolinspectionEndDate(); + if (StringUtils.isNotBlank(pagerQuery.getParams().getReportSid())) { + qw.eq("svp.mainSid", pagerQuery.getParams().getReportSid()); + } + if (StringUtils.isNotBlank(pagerQuery.getParams().getState())) { + if ("01".equals(pagerQuery.getParams().getState())) { + qw.eq("svp.state", "1"); + } + if ("02".equals(pagerQuery.getParams().getState())) { + qw.ne("svp.patrolInspectionStateKey", "000"); + } + if ("000".equals(pagerQuery.getParams().getState())) { + qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState()); + } + if ("001".equals(pagerQuery.getParams().getState())) { + qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState()); + } + if ("002".equals(pagerQuery.getParams().getState())) { + qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState()); + } + if ("003".equals(pagerQuery.getParams().getState())) { + qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState()); + } + } else { + qw.eq("svp.patrolInspectionStateKey", "002").or().eq("svp.patrolInspectionStateKey", "003"); + } + String patrolinspectionStartDate = pagerQuery.getParams().getPatrolinspectionStartDate(); + String patrolinspectionEndDate = pagerQuery.getParams().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')" ); - return qw; + AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams(); + IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getName()); + return iPage; } /** @@ -181,38 +244,22 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService getInspectionInfo(String recordSid) { - ResultBean rb = ResultBean.fireFail(); - AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid); - String type1 = "06"; // 巡检相关照片 - List images = new ArrayList<>(); - List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); - if (scmFiles1.size() > 0) { - for (ScmFile scmFile : scmFiles1) { - images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); - } - vo.setImages(images); - } else { - vo.setImages(images); - } - return rb.success().setData(vo); - } - - public boolean getPatrolinspectionState(String userSid) { - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - int count = baseMapper.getPatrolinspectionState(useOrgSid); - if (count == 0) { - return false; - } - return true; + public List selectListAll(String useOrgSid) { + return baseMapper.selectListVo(useOrgSid); } public VehPatrolinspectionmonthVo getMonthByMainSid(String mainSid) { return baseMapper.getMonthByMainSid(mainSid); } + + public void updateByMainSid(String stateKey, String stateValue, String newDate, String newName, String mainSid) { + baseMapper.updateByMainSid(stateKey, stateValue, newDate, newName, mainSid); + } + + public List 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/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java index 7231b5864e..4c2706a04b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java @@ -29,10 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -76,10 +74,14 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper SELECT sid, - patrolInspectionSid as recordSid, - mainSid as vin, + mainSid as recordSid, + vinNo as vin, model, - situationExplain as `explain`, - problemsAndResults as `result`, - dutyName as liableName, - dutySid as liableSid, + modelSid, + situationExplain as `explain`, + problems, + results, + dutyName as liableName, + dutySid as liableSid, location, - address + address, + createBySid as userSid FROM scm_vehicle_patrolinspectionsheet - WHERE patrolInspectionSid = #{recordSid} + WHERE mainSid = #{recordSid} + SELECT * + FROM scm_vehicle_patrolinspectionsheet + WHERE mainSid = #{mainSid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetRest.java index 0c2547d04c..b037952c24 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetRest.java @@ -25,8 +25,12 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet; -import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -107,6 +111,13 @@ public class ScmVehiclePatrolinspectionsheetRest implements ScmVehiclePatrolinsp return rb.success().setData(vo); } + @Override + public ResultBean getInspectionInfo(String recordSid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehiclePatroVo vo = scmVehiclePatrolinspectionsheetService.getInspectionInfo(recordSid); + return rb.success().setData(vo); + } + @Override public ResultBean saveInspection(ScmVehiclePatrolinspectionsheetDto dto) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java index 049135f492..6ee3194620 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java @@ -26,19 +26,43 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*; -import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection; +import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto; +import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonth; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthFeign; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; import com.yxt.anrui.scm.biz.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionService; +import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService; +import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService; +import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.utils.JPushServer; +import com.yxt.messagecenter.api.message.AppMessageDto; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MsgTargetUriEnum; +import com.yxt.messagecenter.api.messagelist.MessageListDto; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; +import com.yxt.messagecenter.api.messagetype.MessageTypeFeign; +import com.yxt.messagecenter.api.messagetype.MessageTypeVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -52,9 +76,16 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; /** * Project: anrui_scm(anrui_scm)
@@ -81,9 +112,29 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService createQueryWrapper(ScmVehiclePatrolinspectionsheetQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -144,12 +195,26 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService images = new ArrayList<>(); AppScmVehiclePatrolinspectionsheetInfoVo vo = baseMapper.getInspection(recordSid); if (vo == null) { - AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = new AppScmVehiclePatrolinspectionsheetInfoVo(); - List stringList = new ArrayList<>(); - appScmVehiclePatrolinspectionsheetInfoVo.setImages(stringList); - appScmVehiclePatrolinspectionsheetInfoVo.setRecordSid(recordSid); - return appScmVehiclePatrolinspectionsheetInfoVo; + AppScmVehiclePatrolinspectionsheetInfoVo patrolinspectionsheetInfoVo = new AppScmVehiclePatrolinspectionsheetInfoVo(); + ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.fetchBySid(recordSid); + patrolinspectionsheetInfoVo.setVin(scmVehiclePatrolinspection.getVinNo()); + BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(scmVehiclePatrolinspection.getVinNo()).getData(); + patrolinspectionsheetInfoVo.setModel(data.getModelName()); + patrolinspectionsheetInfoVo.setModelSid(data.getModelSid()); + patrolinspectionsheetInfoVo.setRecordSid(recordSid); + return patrolinspectionsheetInfoVo; } + + List list = new ArrayList<>(); + List splitName = Arrays.asList(vo.getLiableName().split(",")); + List splitSid = Arrays.asList(vo.getLiableSid().split(",")); + for (int i = 0; i < splitName.size(); i++) { + AppLiableListVo v = new AppLiableListVo(); + v.setLiableName(splitName.get(i)); + v.setLiableSid(splitSid.get(i)); + list.add(v); + } + vo.setLiableList(list); List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); if (scmFiles1.size() > 0) { for (ScmFile scmFile : scmFiles1) { @@ -159,10 +224,40 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService list = new ArrayList<>(); + List splitName = Arrays.asList(vo.getLiableName().split(",")); + List splitSid = Arrays.asList(vo.getLiableSid().split(",")); + for (int i = 0; i < splitName.size(); i++) { + AppLiableListVo v = new AppLiableListVo(); + v.setLiableName(splitName.get(i)); + v.setLiableSid(splitSid.get(i)); + list.add(v); + } + vo.setLiableList(list); + } + List images = new ArrayList<>(); + List scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1); + if (scmFiles1.size() > 0) { + for (ScmFile scmFile : scmFiles1) { + images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setImages(images); + } else { + vo.setImages(images); + } + return vo; + } + /** * 手机端-保存巡检操作 * @@ -174,12 +269,49 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); + ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null; + if (monthVoList.size() > 0) { + scmVehPatrolinspectionmonthVo = monthVoList.get(0); + } else { + scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid()); + monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); + scmVehPatrolinspectionmonthVo = monthVoList.get(0); + } + ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); + scmVehiclePatrolinspection.setVinNo(dto.getVinNo()); + scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid()); + scmVehiclePatrolinspection.setLocation(dto.getWarehouse()); + scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid()); + scmVehiclePatrolinspection.setPatrolInspectionState(oneValue); + scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey); + scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection); + BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid"); + List liableList = dto.getLiableList(); + String DutyName = ""; + String DutySid = ""; + for (AppLiableListDto appLiableListDto : liableList) { + DutyName = appLiableListDto.getLiableName() + "," + DutyName; + DutySid = appLiableListDto.getLiableSid() + "," + DutySid; + } + scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); + scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid()); + scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid()); save(scmVehiclePatrolinspectionsheet); scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); List images = dto.getImages(); @@ -194,29 +326,235 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); + for (AppLiableListDto appLiableListDto : liableList) { + SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); } - scmFileService.deleteByLinkSidAndType(dto.getSid(), type1); - List images = dto.getImages(); - for (String s : images) { - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); + appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); + appPatrolinspectionDto.setList(liableList); + appPatrolinspectionDto.setMainSid(dto.getMainSid()); + appPatrolinspectionDto.setReceiveIdList(receiveIdList); + // 消息推送 + sendMessage(appPatrolinspectionDto); + return rb.success().setMsg("添加成功"); + } + BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid"); + scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid()); + List liableList = dto.getLiableList(); + String DutyName = ""; + String DutySid = ""; + for (AppLiableListDto appLiableListDto : liableList) { + DutyName = appLiableListDto.getLiableName() + "," + DutyName; + DutySid = appLiableListDto.getLiableSid() + "," + DutySid; + } + scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); + scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); + List images = dto.getImages(); + for (String s : images) { + if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType(type1); + scmFile1.setFileName("巡检相关照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid()); + scmFileService.save(scmFile1); + } + save(scmVehiclePatrolinspectionsheet); + scmVehiclePatrolinspectionService.updateByMainSid(oneKey, oneValue, newDate, sysUserVo.getName(), dto.getMainSid()); + List receiveIdList = new ArrayList<>(); + for (AppLiableListDto appLiableListDto : liableList) { + SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); + } + AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); + appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); + appPatrolinspectionDto.setList(liableList); + appPatrolinspectionDto.setMainSid(dto.getMainSid()); + appPatrolinspectionDto.setReceiveIdList(receiveIdList); + // 消息推送 + sendMessage(appPatrolinspectionDto); + return rb.success(); + } + + /** + * 手机端-盘库推送保存巡检操作 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean savePatrolinspectionsheet(ScmVehiclePatrolinspectionsheetDto dto) { + ResultBean rb = ResultBean.fireFail(); + String s1 = ""; + String type1 = "06"; //巡检相关照片 + String oneKey = "001"; + String oneValue = "问题未解决"; + + ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + //查询是否有月度巡检记录 + List monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); + ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null; + if (monthVoList.size() > 0) { // 有 根据生成巡检月度报告 判断 是否已生成报告 + + scmVehPatrolinspectionmonthVo = monthVoList.get(0); + + if (scmVehPatrolinspectionmonthVo.getState() == 0) { + // 否 继续走新增 + scmVehPatrolinspectionmonthVo = monthVoList.get(0); + + } else if (scmVehPatrolinspectionmonthVo.getState() == 1) { + // 是 先生成月度巡检 和 巡检记录 + scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid()); + monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); + scmVehPatrolinspectionmonthVo = monthVoList.get(0); + + } + } else { // 否 先生成月度巡检 和 巡检记录 + + scmVehPatrolinspectionmonthService.getInspectionRecords(dto.getUserSid()); + monthVoList = scmVehPatrolinspectionmonthService.selectListAll(); + scmVehPatrolinspectionmonthVo = monthVoList.get(0); + + } + + ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); + scmVehiclePatrolinspection.setVinNo(dto.getVinNo()); + scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid()); + scmVehiclePatrolinspection.setLocation(dto.getWarehouse()); + scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid()); + scmVehiclePatrolinspection.setPatrolInspectionState(oneValue); + scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey); + scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspection.setState(0); + scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection); + + BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid"); + ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(dto.getWarehouseSid()); + scmVehiclePatrolinspectionsheet.setDutyName(scmWarehouse.getLibTubeName()); + scmVehiclePatrolinspectionsheet.setDutySid(scmWarehouse.getLibTubeSid()); + scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid); + scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid()); + scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid); + scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid()); + BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData(); + scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName()); + scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid()); + save(scmVehiclePatrolinspectionsheet); + + scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1); + List images = dto.getImages(); + if (images != null) { + if (images.size() > 0) { + for (String s : images) { + if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType(type1); + scmFile1.setFileName("巡检相关照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid()); + scmFileService.save(scmFile1); } - ScmFile scmFile1 = new ScmFile(); - scmFile1.setAttachType(type1); - scmFile1.setFileName("巡检相关照片"); - scmFile1.setFilePath(s1); - scmFile1.setLinkSid(dto.getSid()); - scmFileService.save(scmFile1); } - return rb.success(); } + + List receiveIdList = new ArrayList<>(); + SysUserVo sysUserVos = sysUserFeign.fetchBySid(scmWarehouse.getLibTubeSid()).getData(); + Integer id = sysUserVos.getId(); + receiveIdList.add(String.valueOf(id)); + List liableList = new ArrayList<>(); + AppLiableListDto appLiableListDto = new AppLiableListDto(); + appLiableListDto.setLiableName(scmWarehouse.getLibTubeName()); + appLiableListDto.setLiableSid(scmWarehouse.getLibTubeSid()); + liableList.add(appLiableListDto); + AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto(); + appPatrolinspectionDto.setMsgContent(sysUserVo.getName()); + appPatrolinspectionDto.setList(liableList); + appPatrolinspectionDto.setMainSid(dto.getMainSid()); + appPatrolinspectionDto.setReceiveIdList(receiveIdList); + // 消息推送 + sendMessage(appPatrolinspectionDto); + return rb.success().setMsg("添加成功"); + } + + /** + * 保存消息、发出推送 + * + * @throws InterruptedException + */ + public void sendMessage(AppPatrolinspectionDto appPatrolinspectionDto) { + // 1、保存消息体 + AppMessageDto messageDto = new AppMessageDto(); + ResultBean> messageBean = messageTypeFeign.selectAppMsgTypeList(IDENTIFIER); + if (messageBean.getSuccess() && messageBean.getData() != null) { + List typeVoList = messageBean.getData(); + for (MessageTypeVo message : typeVoList) { + if (message.getMsgType().equals("供应链")) { + messageDto.setMsgTypeSid(message.getMsgTypeSid()); + messageDto.setMsgType(message.getMsgType()); + } + } + } + messageDto.setMsgTitle("月度巡检问题"); + messageDto.setMsgContent(appPatrolinspectionDto.getMsgContent() + "提交的月度巡检问题,请查阅"); + messageDto.setMsgSource("供应链"); + messageDto.setMsgTargetUri(MsgTargetUriEnum.GYLXJWT.getUri()); + messageDto.setApp_type("2"); + messageDto.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); + JSONObject json = new JSONObject(); + json.put("recordSid", appPatrolinspectionDto.getMainSid()); + messageDto.setArgs_json(json.toJSONString()); + String msgSid = (String) messageFeign.saveOrUpdateAppMessage(messageDto).getData(); + String msgTypeSid = messageDto.getMsgTypeSid(); + // 2、保存至消息列表 + List list = appPatrolinspectionDto.getList(); + // 使用多线程保存 + List> futures = new ArrayList>(); + ExecutorService executor = Executors.newFixedThreadPool(4); + for (AppLiableListDto appLiableListDto : list) { + Future f = executor.submit(new Runnable() { + @Override + public void run() { + try { + System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); + MessageListDto messageList = new MessageListDto(); + messageList.setMsgSid(msgSid); + messageList.setRDelStatus(0); + messageList.setSDelStatus(0); + messageList.setReceiverSid(appLiableListDto.getLiableSid()); + messageListFeign.save(messageList); +// Thread.sleep(5 * 1000); + System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + futures.add(f); + } + executor.shutdown(); + for (int i = 0; i < appPatrolinspectionDto.getReceiveIdList().size(); i++) { + /** + * msgTitle:排产申请 + * content:xxx的排产申请 + */ + JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, "供应链", appPatrolinspectionDto.getReceiveIdList().get(i)); + } // 3、推送 +// JPushServer.sendPushAll(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgTypeSid, messageDto.getMsgType()); +// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名 + System.out.println("process end"); } /** @@ -228,27 +566,35 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService liableList = dto.getLiableList(); + if (liableList.size() > 0) { + String DutyName = ""; + String DutySid = ""; + for (AppLiableListDto appLiableListDto : liableList) { + DutyName = appLiableListDto.getLiableName() + "," + DutyName; + DutySid = appLiableListDto.getLiableSid() + "," + DutySid; + } + patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); + patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); } - scmFileService.deleteByLinkSidAndType(dto.getSid(), type1); + scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1); List images = dto.getImages(); for (String s : images) { if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -258,57 +604,43 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService images = dto.getImages(); - for (String s : images) { - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + save(patrolinspectionsheet); + scmVehiclePatrolinspectionService.updateByMainSid(threeKey, threeValue, newDate, sysUserVo.getName(), dto.getMainSid()); + } else { + ScmVehiclePatrolinspectionsheet patrolinspectionsheet = fetchBySid(vo.getSid()); + BeanUtil.copyProperties(dto, patrolinspectionsheet, "sid"); + patrolinspectionsheet.setUseOrgSid(useOrgSid); + patrolinspectionsheet.setCreateOrgSid(useOrgSid); + patrolinspectionsheet.setCreateBySid(dto.getUserSid()); + List liableList = dto.getLiableList(); + String DutyName = ""; + String DutySid = ""; + for (AppLiableListDto appLiableListDto : liableList) { + DutyName = appLiableListDto.getLiableName() + "," + DutyName; + DutySid = appLiableListDto.getLiableSid() + "," + DutySid; } - ScmFile scmFile1 = new ScmFile(); - scmFile1.setAttachType(type1); - scmFile1.setFileName("巡检相关照片"); - scmFile1.setFilePath(s1); - scmFile1.setLinkSid(sid); - scmFileService.save(scmFile1); + patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1)); + patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1)); + scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1); + List images = dto.getImages(); + for (String s : images) { + if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType(type1); + scmFile1.setFileName("巡检相关照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(patrolinspectionsheet.getSid()); + scmFileService.save(scmFile1); + } + updateById(patrolinspectionsheet); + scmVehiclePatrolinspectionService.updateByMainSid(twoKey, twoValue, newDate, sysUserVo.getName(), dto.getMainSid()); } - ScmVehicleStayPatrolinspection scmVehicleStayPatrolinspection = scmVehicleStayPatrolinspectionService.fetchBySid(patrolInspectionSid); - scmVehicleStayPatrolinspectionService.updateByStaySid(patrolInspectionSid, newTime, dto.getUserName()); - ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection(); - scmVehiclePatrolinspection.setMainSid(scmVehicleStayPatrolinspection.getMainSid()); - scmVehiclePatrolinspection.setPatrolInspectionState("1"); - scmVehiclePatrolinspection.setLocation(scmVehicleStayPatrolinspection.getLocation()); - scmVehiclePatrolinspection.setLocationSid(scmVehicleStayPatrolinspection.getLocationSid()); - scmVehiclePatrolinspection.setPatrolInspectionDate(newTime); - scmVehiclePatrolinspection.setPatrolInspectionName(dto.getUserName()); - scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid); - scmVehiclePatrolinspection.setUseOrgSid(useOrgSid); - scmVehiclePatrolinspection.setSid(scmVehicleStayPatrolinspection.getSid()); - scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection); - scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid()); - save(scmVehiclePatrolinspectionsheet); - return rb.success().setMsg("操作成功"); + return rb.success(); } public ResultBean fetchSheetBySid(String sid) { @@ -334,4 +666,25 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService selectListVo(String orgSid); - /** - * 手机端-获取巡检列表 - * - * @param page - * @param qw - * @param name - * @return - */ - IPage getInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); - - void updateByStaySid(@Param("patrolInspectionSid") String patrolInspectionSid, @Param("newTime") String newTime, @Param("userName") String userName); - List selPatrolinspection(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid); @Select("SELECT count(*) FROM scm_vehicle_stay_patrolinspection WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ") int getToDoNum(@Param("useOrgSid") String useOrgSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml index 738c28d788..503cb7fc53 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml @@ -35,40 +35,6 @@ ${ew.sqlSegment} - - - - update scm_vehicle_stay_patrolinspection set isDelete = 1, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java index d6e3798c07..2bb642711b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionRest.java @@ -95,16 +95,6 @@ public class ScmVehicleStayPatrolinspectionRest implements ScmVehicleStayPatroli return rb.success().setData(vo); } - @Override - public ResultBean> getInspectionList(PagerQuery pagerQuery) { - if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { - new ResultBean<>().success().setMsg("用户sid不能为空"); - } - PagerVo page = new PagerVo<>(); - IPage iPage = scmVehicleStayPatrolinspectionService.getInspectionList(pagerQuery); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); - } @Override public ResultBean getToDoNum(String userSid) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java index 2265e0a01d..d3eed6b529 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java @@ -124,57 +124,6 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService getInspectionList(PagerQuery pagerQuery) { - IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); - QueryWrapper qw = appQueryWrapper(pagerQuery.getParams()); - AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams(); - IPage iPage = baseMapper.getInventoryList(page, qw, params.getNames()); - List records = iPage.getRecords(); - for (AppScmVehicleStayPatrolinspectionPageVo record : records) { - List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), useOrgSid); - - if (scmVehicleStayPatrolinspectionVos.size() <= 0) { - record.setInspectionDate("无"); - } else { - ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0); - record.setInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate()); - } - if (scmVehicleStayPatrolinspectionVos.size() <= 0) { - record.setInspectionName("无"); - } else { - ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0); - record.setInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName()); - } - } - return iPage; - } - - /** - * 手机端-获取巡检列表 查询条件 - * - * @param query - * @return - */ - private QueryWrapper appQueryWrapper(AppScmVehicleStayPatrolinspectionPageQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("svsp.createOrgSid", query.getUseOrgSid()); - } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("svsp.locationSid", query.getWarehouseSid()); - } - qw.eq("svsp.isDelete", 0); - return qw; - } - public void updateByStaySid(String patrolInspectionSid, String newTime, String userName) { baseMapper.updateByStaySid(patrolInspectionSid, newTime, userName); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java index 76369ed2cb..4be1f3f80d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.java @@ -62,7 +62,7 @@ public interface ScmVehInventorymonthMapper extends BaseMapper selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from scm_veh_inventorymonth") + @Select("select * from scm_veh_inventorymonth order by id desc") List selectListVo(); IPage getCarInventoryReportList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml index fb62f301e7..5c17002d35 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthMapper.xml @@ -20,13 +20,14 @@ billNo as reportId, DATE_FORMAT(svi.createTime, '%Y-%m-%d') as `date`, createBySid, + createByName as `name`, `state` FROM scm_veh_inventorymonth svi ${ew.sqlSegment} - and concat(svi.billNo) LIKE concat('%', #{names}, '%') + and concat(svi.billNo,svi.createByName) LIKE concat('%', #{names}, '%') ORDER BY id DESC diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index 4c6d1bb3c7..b444a1d6d5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -144,13 +144,34 @@ public class ScmVehInventorymonthService extends MybatisBaseService vehicleCarInventoryListPageVos = scmVehicleInventoryService.getInventoryAll(useOrgSid); + if (vehicleCarInventoryListPageVos != null) { + if (vehicleCarInventoryListPageVos.size() > 0) { + for (AppScmVehicleCarInventoryListPageVo vehicleCarInventoryListPageVo : vehicleCarInventoryListPageVos) { + ScmVehInventorymonth scmVehInventorymonth = fetchBySid(vehicleCarInventoryListPageVo.getMainSid()); + if (scmVehInventorymonth.getState() == 0) { + return rb.setMsg("上次盘库记录未生成报告，请先生成再操作！"); + } + } + } + } +// List scmVehInventorymonthVos = baseMapper.selectListVo(); +// if (scmVehInventorymonthVos.size() > 0) { +// Date oldDate = scmVehInventorymonthVos.get(0).getCreateTime(); +// Date newDate = new Date(); +// int days = (int) ((newDate.getTime() - oldDate.getTime()) / (1000 * 3600 * 24)); +// if (days < 30) { +// return rb.setMsg("未到盘库周期，盘库记录生成失败！"); +// } +// } List list = baseVehicleFeign.selectInventoryRecords(userSid).getData(); ScmVehInventorymonth scmVehInventorymonth = new ScmVehInventorymonth(); String billNo = getApplyCode(); scmVehInventorymonth.setBillNo(billNo); scmVehInventorymonth.setCreateBySid(userSid); + scmVehInventorymonth.setCreateByName(sysUserVo.getName()); scmVehInventorymonth.setState(0); scmVehInventorymonth.setCreateOrgSid(useOrgSid); scmVehInventorymonth.setCreateOrgName(sysStaffOrg.getOrgName()); @@ -220,9 +241,6 @@ public class ScmVehInventorymonthService extends MybatisBaseService { - //@Update("update scm_veh_patrolinspectionmonth set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_veh_patrolinspectionmonth") - List selectListVo(); + //@Update("update scm_veh_patrolinspectionmonth set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - String selectNum(String bill); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - IPage getCarInspectionReportList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_veh_patrolinspectionmonth") + List selectListVo(); + + @Select("select * from scm_veh_patrolinspectionmonth order by id desc ") + List selectListAll(); + + String selectNum(String bill); + + IPage getCarInspectionReportList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + + @Update("update scm_veh_patrolinspectionmonth set state = 1 where sid = #{sid}") + void updateBySidAndState(String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml index 7fda4b3585..d2a4bc3bb4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.xml @@ -28,13 +28,14 @@ billNo as reportId, DATE_FORMAT(svp.createTime, '%Y-%m-%d') as `date`, createBySid, + createByName as `name`, `state` FROM scm_veh_patrolinspectionmonth svp ${ew.sqlSegment} - and concat(svp.billNo) LIKE concat('%', #{names}, '%') + and concat(svp.billNo,svp.createByName) LIKE concat('%', #{names}, '%') ORDER BY id DESC diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java index 4e997e6433..cb66d74251 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java @@ -35,14 +35,14 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthQuery; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo; +import com.yxt.anrui.scm.api.scmvehinventorymonth.*; import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService; +import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -84,6 +85,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -141,19 +144,36 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService vinNoList = new ArrayList<>(); + List patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid); + List list = new ArrayList<>(); + if (patrolinspectionVos.size() > 0) { + for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) { + // 判断是否生成报告 + ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = fetchBySid(patrolinspectionVo.getMainSid()); + if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录 + return rb.setMsg("上次巡检记录未生成报告，请先生成再操作！"); + } + if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) { + String vinNo = patrolinspectionVo.getVinNo(); + vinNoList.add(vinNo); + } + if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) { + scmVehiclePatrolinspectionService.updatePatrolInspectionState(patrolinspectionVo.getSid()); + } + } + list = baseVehicleFeign.selectPatrolinspections(userSid, vinNoList).getData(); + } else { + list = baseVehicleFeign.selectInventoryRecords(userSid).getData(); } - List list = baseVehicleFeign.selectInventoryRecords(userSid).getData(); ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = new ScmVehPatrolinspectionmonth(); String billNo = getApplyCode(); scmVehPatrolinspectionmonth.setBillNo(billNo); scmVehPatrolinspectionmonth.setCreateBySid(userSid); + scmVehPatrolinspectionmonth.setCreateByName(sysUserVo.getName()); scmVehPatrolinspectionmonth.setState(0); scmVehPatrolinspectionmonth.setCreateOrgSid(useOrgSid); scmVehPatrolinspectionmonth.setCreateOrgName(sysStaffOrg.getOrgName()); @@ -201,6 +221,10 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService getCarInspectionReportList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); @@ -228,15 +252,17 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService rb = ResultBean.fireFail(); AppScmVehPatrolinspectionmonthInfoVo vo = new AppScmVehPatrolinspectionmonthInfoVo(); VehPatrolinspectionmonthVo vehPatrolinspectionmonthVo = scmVehiclePatrolinspectionService.getMonthByMainSid(sid); - vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber() - vehPatrolinspectionmonthVo.getNotHandledNumber())); + vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getNormalNumber() + vehPatrolinspectionmonthVo.getUnHandledNumber() + vehPatrolinspectionmonthVo.getProcessedNumber())); vo.setTotalNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber())); + String StateKey1 = "001"; + String StateKey2 = "002"; + List questions1 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(sid, StateKey1); + List questions2 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(sid, StateKey2); + + StringBuilder question = new StringBuilder(); - vo.setQuestion(""); + for (AppVinAndRemarksVo remark : questions1) { + // 问题未解决 + question.append(remark.getVinNo()); + question.append(remark.getRemarks()); + question.append("(问题已反馈)"); + question.append("\n"); + } + for (AppVinAndRemarksVo remark : questions2) { + // 问题已解决 + question.append(remark.getVinNo()); + question.append(remark.getRemarks()); + question.append("(问题已解决)"); + question.append("\n"); + } + if (StringUtils.isNotBlank(question)) { + vo.setQuestion(question.substring(0, question.length() - 1)); + } else { + vo.setQuestion(String.valueOf(question)); + } + ScmVehPatrolinspectionreport scmVehPatrolinspectionreport = new ScmVehPatrolinspectionreport(); + scmVehPatrolinspectionreport.setMainSid(sid); + if (StringUtils.isNotBlank(question)) { + scmVehPatrolinspectionreport.setReportContent(question.substring(0, question.length() - 1)); + } else { + scmVehPatrolinspectionreport.setReportContent(String.valueOf(question)); + } + scmVehPatrolinspectionreportService.save(scmVehPatrolinspectionreport); + baseMapper.updateBySidAndState(sid); return rb.success().setData(vo); } + + public List selectListAll() { + return baseMapper.selectListAll(); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java index 383eb11d55..37c726a16a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport; +import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportQuery; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportVo; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDetailsVo; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportDto; -import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportFeign; /** * Project: aaa(aaa)
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java index a3eb990cc6..ba80cffee9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmwarehouse.AppScmWarehouseVo; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -68,4 +69,7 @@ public interface ScmWarehouseMapper extends BaseMapper { List> fetchByUseOrgSid(String sid); List selectWarehouseByUserSid(@Param("useOrgSid") String useOrgSid); + + @Select("select * from scm_warehouse where sid =#{addressSid}") + ScmWarehouseVo selectByAddressSid(@Param("addressSid") String addressSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java index 5adaab1c13..3bd9a889d6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java @@ -117,4 +117,9 @@ public class ScmWarehouseRest implements ScmWarehouseFeign { } return scmWarehouseService.selectWarehouseByUserSid(userSid); } + + @Override + public ResultBean selectByAddressSid(String addressSid) { + return scmWarehouseService.selectByAddressSid(addressSid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java index 870e3021a4..2293557c1c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java @@ -151,4 +151,10 @@ public class ScmWarehouseService extends MybatisBaseService list = baseMapper.selectWarehouseByUserSid(useOrgSid); return new ResultBean>().success().setData(list); } + + public ResultBean selectByAddressSid(String addressSid) { + ResultBean rb = ResultBean.fireFail(); + ScmWarehouseVo scmWarehouseVo = baseMapper.selectByAddressSid(addressSid); + return rb.success().setData(scmWarehouseVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java new file mode 100644 index 0000000000..3207df5dc3 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.supplychain.inspection; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppInspectionVinQuery implements Query { + private static final long serialVersionUID = 3988923864600126962L; + + @ApiModelProperty("车架号") + private String name; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("分公司sid") + private String useOrgSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinVo.java new file mode 100644 index 0000000000..ed15da6e67 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppInspectionVinVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.supplychain.inspection; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppInspectionVinVo implements Vo { + private static final long serialVersionUID = 9073694108825056129L; + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("存放地点") + private String address; + @ApiModelProperty("存放地点") + private String addressSid; + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("车型Sid") + private String modelSid; + @ApiModelProperty("仓库管理员") + private String administratorsName; + @ApiModelProperty("仓库管理员Sid") + private String administratorsSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java index df3c293900..09a91eaac6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java @@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -15,12 +16,13 @@ import java.util.List; @Data public class AppScmVehiclePatrolinVo implements Vo { private static final long serialVersionUID = 6432538949747322376L; + + @ApiModelProperty("车架号") @JsonProperty("vin") - private String mainSid; + private String vinNo; @ApiModelProperty("车型") - @JsonProperty("model") private String model; @ApiModelProperty("巡检日期") @@ -39,16 +41,26 @@ public class AppScmVehiclePatrolinVo implements Vo { @JsonProperty("explain") private String situationExplain; - @ApiModelProperty("存在的问题及处理结果") + @ApiModelProperty("存在问题") + @JsonProperty("question") + private String problems; + + @ApiModelProperty("处理结果") @JsonProperty("result") - private String problemsAndResults; + private String results; @ApiModelProperty("相关附件") - private List images; + private List images = new ArrayList<>(); + + @ApiModelProperty("相关责任人") + private List liableList = new ArrayList<>(); @ApiModelProperty(value = "定位地址") private String address; - @ApiModelProperty(value = "定位经纬度") + @ApiModelProperty(value = "经纬度") private String addressCode; + + @ApiModelProperty("巡检结果") + private String state; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java index 6830038de7..2d65fde982 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeign.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.terminal.api.supplychain.inspection; +import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery; +import com.yxt.anrui.base.api.basevehicle.InspectionVinVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -60,7 +62,7 @@ public interface AppScmVehiclePatrolinspectionFeign { public ResultBean getInspectionRecords(@PathVariable("userSid") String userSid); @ApiOperation("手机端-获取巡检报告列表") - @PostMapping("/getCarInventoryReportList") + @PostMapping("/getCarInspectionReportList") @ResponseBody public ResultBean> getCarInspectionReportList(@RequestBody PagerQuery pagerQuery); @@ -69,7 +71,7 @@ public interface AppScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean getCarInspectionReport(@PathVariable("sid") String sid); - @ApiOperation("手机端-获取巡检列表") + @ApiOperation("手机端-获取待巡检列表") @PostMapping("/getInspectionList") @ResponseBody public ResultBean> getInspectionList(@RequestBody PagerQuery pagerQuery); @@ -84,7 +86,7 @@ public interface AppScmVehiclePatrolinspectionFeign { @ResponseBody public ResultBean getInspection(@PathVariable("recordSid") String recordSid); - @ApiOperation("手机端-保存巡检操作") + @ApiOperation("手机端-提交巡检操作") @PostMapping("/saveInspection") @ResponseBody public ResultBean saveInspection(@RequestBody PatrolinspectionDto dto); @@ -98,4 +100,9 @@ public interface AppScmVehiclePatrolinspectionFeign { @GetMapping("/getInspectionInfo/{recordSid}") @ResponseBody public ResultBean getInspectionInfo(@PathVariable("recordSid") String recordSid); + + @ApiOperation("巡检获取车价号") + @PostMapping("/getInspectionVinList") + @ResponseBody + public ResultBean> getInspectionVinList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java index ebf4422194..e6dac50be9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinspectionFeignFallback.java @@ -91,4 +91,9 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle public ResultBean getInspectionInfo(String recordSid) { return null; } + + @Override + public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListDto.java new file mode 100644 index 0000000000..aa4a1745df --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListDto.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.terminal.api.supplychain.inspection; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LiableListDto implements Dto { + private static final long serialVersionUID = 6962328180470052805L; + @ApiModelProperty("相关责任人名称") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListVo.java new file mode 100644 index 0000000000..2de836d513 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/LiableListVo.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.terminal.api.supplychain.inspection; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LiableListVo implements Vo { + private static final long serialVersionUID = 2369067075168143230L; + + @ApiModelProperty("相关责任人名称") + private String liableName; + @ApiModelProperty("相关责任人sid") + private String liableSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java index f494c45efb..3820457559 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionDto.java @@ -51,51 +51,63 @@ import java.util.List; @ApiModel(value = "巡检记录 数据传输对象", description = "巡检记录 数据传输对象") public class PatrolinspectionDto implements Dto { - @ApiModelProperty("记录sid") + @ApiModelProperty("巡检记录sid") @JsonProperty("recordSid") - private String patrolInspectionSid; + private String mainSid; @ApiModelProperty("车架号") @JsonProperty("vin") - private String mainSid; + private String vinNo; @ApiModelProperty("车型") - @JsonProperty("model") private String model; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("巡检情况说明") @JsonProperty("explain") private String situationExplain; - @ApiModelProperty("存在的问题及处理结果") - @JsonProperty("result") - private String problemsAndResults; + @ApiModelProperty("存在问题") + @JsonProperty("question") + private String problems; - @ApiModelProperty("相关责任人") - @JsonProperty("liableName") - private String dutyName; + @ApiModelProperty("处理结果") + @JsonProperty("result") + private String results; @ApiModelProperty("相关责任人") - @JsonProperty("liableSid") - private String dutySid; + private List liableList; @ApiModelProperty("相关照片") private List images; @ApiModelProperty("经纬度") - @JsonProperty("location") private String location; @ApiModelProperty("详细地址") - @JsonProperty("address") private String address; @ApiModelProperty("用户sid") - @JsonProperty("userSid") private String userSid; @ApiModelProperty("用户名称") - @JsonProperty("userName") private String userName; + @ApiModelProperty("车况") + private String carConditionValue; + + @ApiModelProperty("车况") + private String carConditionKey; + + @ApiModelProperty("新增状态值") + private Boolean newAdd; + + @ApiModelProperty("存放地点sid") + private String warehouseSid; + + @ApiModelProperty("存放地点") + private String warehouse; + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java index 50addb67cb..d70d0daf49 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.supplychain.inspection; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,17 +19,22 @@ public class PatrolinspectionInfoVo implements Vo { @ApiModelProperty("车型") private String model; + @ApiModelProperty("车型Sid") + private String modelSid; + @ApiModelProperty("巡检情况说明") private String explain; - @ApiModelProperty("存在的问题及处理结果") - private String result; + @ApiModelProperty("存在问题") + @JsonProperty("question") + private String problems; - @ApiModelProperty("相关责任人") - private String liableName; + @ApiModelProperty("处理结果") + @JsonProperty("result") + private String results; @ApiModelProperty("相关责任人") - private String liableSid; + private List liableList; @ApiModelProperty("相关照片") private List images; @@ -42,4 +48,7 @@ public class PatrolinspectionInfoVo implements Vo { @ApiModelProperty("用户sid") private String userSid; + @ApiModelProperty("用户sid") + private String userName; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java index cf1bd25f87..22f018120e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageQuery.java @@ -18,6 +18,12 @@ public class PatrolinspectionPageQuery implements Query { @ApiModelProperty("巡检日期 示例 2020-02-01至2022-03-31") private String date; + @ApiModelProperty("巡检结果") + private String state; + + @ApiModelProperty("月度巡检sid") + private String reportSid; + @ApiModelProperty("盘库开始日期") @JsonProperty("patrolinspectionStartDate") private String patrolinspectionStartDate; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageVo.java index 58d5a8c8a1..c942536af2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionPageVo.java @@ -13,6 +13,12 @@ public class PatrolinspectionPageVo implements Vo { @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("巡检结果") + private String state; + + @ApiModelProperty("巡检结果") + private String stateKey; + @ApiModelProperty("上次巡检日期") private String newInspectionDate; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageVo.java index ce28ce4863..23b4a15c9f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/StayPatrolinspectionPageVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.supplychain.inspection; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +14,9 @@ public class StayPatrolinspectionPageVo implements Vo { @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("月度巡检sid") + private String mainSid; + @ApiModelProperty("存放地点") private String warehouse; @@ -25,7 +29,9 @@ public class StayPatrolinspectionPageVo implements Vo { @ApiModelProperty("车型") private String model; - @ApiModelProperty("暂存状态") - private boolean state; + @ApiModelProperty("巡检结果") + private String resultKey; + @ApiModelProperty("巡检结果") + private String resultValue; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java index 5441208d3b..ec2b5b8c2c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionRest.java @@ -100,4 +100,9 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins public ResultBean getInspectionInfo(String recordSid) { return appScmVehiclePatrolinspectionService.getInspectionInfo(recordSid); } + + @Override + public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { + return appScmVehiclePatrolinspectionService.getInspectionVinList(pagerQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java index 35d2cacb97..424bbeb32e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/inspection/AppScmVehiclePatrolinspectionService.java @@ -26,7 +26,10 @@ package com.yxt.anrui.terminal.biz.supplychain.inspection; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatroVo; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.InspectionVinQuery; +import com.yxt.anrui.base.api.basevehicle.InspectionVinVo; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatroVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign; @@ -69,7 +72,8 @@ public class AppScmVehiclePatrolinspectionService { @Autowired ScmVehicleStayPatrolinspectionFeign scmVehicleStayPatrolinspectionFeign; - + @Autowired + BaseVehicleFeign baseVehicleFeign; @Autowired ScmVehiclePatrolinspectionsheetFeign scmVehiclePatrolinspectionsheetFeign; @Autowired @@ -89,7 +93,7 @@ public class AppScmVehiclePatrolinspectionService { public ResultBean> getInspectionList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> inspectionList = scmVehicleStayPatrolinspectionFeign.getInspectionList(pq); + ResultBean> inspectionList = scmVehiclePatrolinspectionFeign.getInspectionList(pq); PagerVo vo = CoverUtils.selectPagerVo(inspectionList.getData()); return rb.success().setData(vo); } @@ -131,7 +135,7 @@ public class AppScmVehiclePatrolinspectionService { public ResultBean getInspectionInfo(String recordSid) { ResultBean rb = ResultBean.fireFail(); AppScmVehiclePatrolinVo vo = new AppScmVehiclePatrolinVo(); - ResultBean getInspectionInfo = scmVehiclePatrolinspectionFeign.getInspectionInfo(recordSid); + ResultBean getInspectionInfo = scmVehiclePatrolinspectionsheetFeign.getInspectionInfo(recordSid); if (!getInspectionInfo.getSuccess()) { return rb.setMsg(getInspectionInfo.getMsg()); } @@ -159,4 +163,11 @@ public class AppScmVehiclePatrolinspectionService { } + public ResultBean> getInspectionVinList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> inspectionList = baseVehicleFeign.getInspectionVinList(pq); + PagerVo vo = CoverUtils.selectPagerVo(inspectionList.getData()); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/doc/databases/scm_tables_vehicle.sql b/doc/databases/scm_tables_vehicle.sql index 9377da2f95..f073f59ce9 100644 --- a/doc/databases/scm_tables_vehicle.sql +++ b/doc/databases/scm_tables_vehicle.sql @@ -325,4 +325,52 @@ CREATE TABLE `scm_veh_inventoryReport` PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB - DEFAULT CHARSET = utf8 COMMENT ='盘库报告'; \ No newline at end of file + DEFAULT CHARSET = utf8 COMMENT ='盘库报告'; + + +DROP TABLE IF EXISTS `scm_veh_patrolinspectionMonth`; +CREATE TABLE `scm_veh_patrolinspectionMonth` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '日常管理报告生成状态（0 未生成 1 已生成）', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `billNo` varchar(64) DEFAULT NULL COMMENT '编号（yyyyMMdd）', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织', + `createOrgName` varchar(64) DEFAULT NULL COMMENT '创建组织名称', + `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织名称', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='月度日常管理记录'; + +DROP TABLE IF EXISTS `scm_veh_patrolinspectionReport`; +CREATE TABLE `scm_veh_patrolinspectionReport` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '月度日常管理记录sid', + `receiverSids` varchar(64) DEFAULT NULL COMMENT '接收人sid', + `receiverNames` varchar(64) DEFAULT NULL COMMENT '接收人姓名', + `reportContent` varchar(64) DEFAULT NULL COMMENT '盘库报告内容', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='日常管理报告'; \ No newline at end of file From e3b24d1b7dabe4164a92cf5c4f92a1315be64a1b Mon Sep 17 00:00:00 2001 From: lzh Date: Sat, 24 Sep 2022 14:06:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?anrui=5Fcrm=E5=8A=A0=E5=85=A5Jenkins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-crm/anrui-crm-api/pom.xml | 11 +++++++++++ .../src/main/resources/application-test.yml | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/anrui-crm/anrui-crm-api/pom.xml b/anrui-crm/anrui-crm-api/pom.xml index 1fca7b5a42..377cc26b54 100644 --- a/anrui-crm/anrui-crm-api/pom.xml +++ b/anrui-crm/anrui-crm-api/pom.xml @@ -43,5 +43,16 @@ + + + nexus-releases + http://nexus3.yyundong.com/repository/yxt-mvn-releases/ + + + nexus-snapshots + http://nexus3.yyundong.com/repository/yxt-mvn-snapshot/ + + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml b/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml index 9700ac2351..e0b92f32ad 100644 --- a/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml +++ b/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml @@ -1,16 +1,16 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.104.142.192:3306/anrui_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true + url: jdbc:mysql://172.18.0.4:3306/anrui_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root - password: 123456 + password: yxt_mysql_138 cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 172.18.0.5:8848 redis: database: 3 # Redis数据库索引（默认为0） - host: 127.0.0.1 + host: 172.18.0.7 jedis: pool: max-active: -1 #连接池最大连接数（使用负值表示没有限制）