From dd31b5bdc806dbf8e2b31167668d2adb7934eb3c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 6 Aug 2022 22:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=B7=BB=E5=8A=A0=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppScmVehiclePatroVo.java | 35 ++++++++++++++ .../ScmVehiclePatrolinspectionFeign.java | 7 +++ ...mVehiclePatrolinspectionFeignFallback.java | 6 ++- .../ScmVehicleExamineService.java | 6 +++ .../ScmVehicleGressionService.java | 3 +- .../ScmVehiclePatrolinspectionMapper.java | 2 + .../ScmVehiclePatrolinspectionMapper.xml | 48 +++++++++++++------ .../ScmVehiclePatrolinspectionRest.java | 5 ++ .../ScmVehiclePatrolinspectionService.java | 31 ++++++++++-- .../inspection/AppScmVehiclePatrolinVo.java | 46 ++++++++++++++++++ .../AppScmVehiclePatrolinspectionFeign.java | 5 ++ ...mVehiclePatrolinspectionFeignFallback.java | 5 ++ .../AppScmVehicleExamineFeign.java | 4 +- .../AppScmVehiclePatrolinspectionRest.java | 12 ++--- .../AppScmVehiclePatrolinspectionService.java | 28 +++++------ 15 files changed, 198 insertions(+), 45 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java 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/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java new file mode 100644 index 0000000000..ea5a0498c2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatroVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.scm.api.scmvehiclepatrolinspection; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/8/6 16:56 + * @Description + */ +@Data +public class AppScmVehiclePatroVo implements Vo { + private static final long serialVersionUID = 4433285895858153789L; + @ApiModelProperty("车架号") + private String mainSid; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("巡检日期") + private String patrolInspectionDate; + @ApiModelProperty("巡检人员") + private String patrolInspectionName; + @ApiModelProperty("存放地地点") + private String location; + @ApiModelProperty("巡检情况说明") + private String situationExplain; + @ApiModelProperty("存在的问题及处理结果") + private String problemsAndResults; + @ApiModelProperty("相关附件") + private List images; + @ApiModelProperty(value = "sid") + private String sid; +} 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 3b9e8f29a4..42e24a8798 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 @@ -78,4 +78,11 @@ public interface ScmVehiclePatrolinspectionFeign { @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 e7279c9a74..f715994887 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 @@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui_scm(anrui_scm)
* File: ScmVehiclePatrolinspectionFeignFallback.java
@@ -75,6 +73,10 @@ public class ScmVehiclePatrolinspectionFeignFallback implements ScmVehiclePatrol return null; } + @Override + public ResultBean getInspectionInfo(String recordSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 25a91d00a7..d93992d386 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -379,6 +379,9 @@ public class ScmVehicleExamineService extends MybatisBaseService scmVehicleGressionVos = baseMapper.getlastTimeEqual(dto.getVinNo(), dto.getTargetLocationSid()); if (scmVehicleGressionVos.size() > 0) { if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) { - if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("已终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { + if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) { return rb.setMsg("该申请已存在，请务重复提交！"); } } 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 ef419bc9f2..3af0543a7d 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 @@ -72,4 +72,6 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); + + AppScmVehiclePatroVo getInspectionInfo(String recordSid); } \ 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 5d530da42b..0566326c94 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 @@ -5,32 +5,52 @@ + + \ 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 eaca0a3132..c10b81b72c 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 @@ -105,4 +105,9 @@ 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 af1d981de4..5a72223821 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 @@ -29,18 +29,21 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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 org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.scm.biz.scmfile.ScmFileService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; /** * Project: anrui_scm(anrui_scm)
@@ -60,6 +63,10 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService createQueryWrapper(ScmVehiclePatrolinspectionQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -178,4 +185,20 @@ 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); + } } \ No newline at end of file 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 new file mode 100644 index 0000000000..2457bb9028 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java @@ -0,0 +1,46 @@ +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; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/8/6 16:45 + * @Description + */ +@Data +public class AppScmVehiclePatrolinVo implements Vo { + private static final long serialVersionUID = 6432538949747322376L; + @ApiModelProperty("车架号") + @JsonProperty("vin") + private String mainSid; + @ApiModelProperty("车型") + @JsonProperty("model") + private String model; + + @ApiModelProperty("巡检日期") + @JsonProperty("date") + private String patrolInspectionDate; + + @ApiModelProperty("巡检人员") + @JsonProperty("name") + private String patrolInspectionName; + + @ApiModelProperty("存放地地点") + @JsonProperty("warehouse") + private String location; + + @ApiModelProperty("巡检情况说明") + @JsonProperty("explain") + private String situationExplain; + + @ApiModelProperty("存在的问题及处理结果") + @JsonProperty("result") + private String problemsAndResults; + @ApiModelProperty("相关附件") + private List images; +} 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 a5929b07da..c82ad00b53 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 @@ -83,4 +83,9 @@ public interface AppScmVehiclePatrolinspectionFeign { @PostMapping("/submitInspection") @ResponseBody public ResultBean submitInspection(@RequestBody PatrolinspectionDto dto); + + @ApiOperation("手机端-巡检详情") + @GetMapping("/getInspectionInfo/{recordSid}") + @ResponseBody + public ResultBean getInspectionInfo(@PathVariable("recordSid") String recordSid); } \ 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 f4ee7248ac..0b146a4423 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 @@ -76,4 +76,9 @@ public class AppScmVehiclePatrolinspectionFeignFallback implements AppScmVehicle public ResultBean submitInspection(PatrolinspectionDto dto) { return null; } + + @Override + public ResultBean getInspectionInfo(String recordSid) { + 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/scmvehicleexamine/AppScmVehicleExamineFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java index b95a95b75f..7cae39e737 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleExamineFeign.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; - /** * Project: scm(scm)
* File: ScmVehicleExamineFeign.java
@@ -45,7 +43,7 @@ public interface AppScmVehicleExamineFeign { @ApiOperation("手机端-保存验车单") @PostMapping("/saveCarInspectedInfo") @ResponseBody - public ResultBean saveCarInspectedInfo(@Valid @RequestBody AppExamineDto dto); + public ResultBean saveCarInspectedInfo(@RequestBody AppExamineDto dto); @ApiOperation("手机端-通过验车单") @PostMapping("/submitCarInspectedInfo") 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 c2565392db..84003ed6f1 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 @@ -25,19 +25,14 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.supplychain.inspection; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; import com.yxt.anrui.terminal.api.supplychain.inspection.*; -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; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; /** @@ -90,4 +85,9 @@ public class AppScmVehiclePatrolinspectionRest implements AppScmVehiclePatrolins public ResultBean submitInspection(PatrolinspectionDto dto) { return appScmVehiclePatrolinspectionService.submitInspection(dto); } + + @Override + public ResultBean getInspectionInfo(String recordSid) { + return appScmVehiclePatrolinspectionService.getInspectionInfo(recordSid); + } } 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 8d6cd25ab5..cf01e929ad 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,33 +26,23 @@ package com.yxt.anrui.terminal.biz.supplychain.inspection; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryInfoVo; -import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryPageQuery; -import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*; +import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.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; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetFeign; -import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo; import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionFeign; import com.yxt.anrui.terminal.api.supplychain.inspection.*; -import com.yxt.anrui.terminal.api.supplychain.scmvehicleenterlibrary.AppEnterlibraryInfoVo; -import com.yxt.anrui.terminal.api.supplychain.scmvehicleenterlibrary.AppEnterlibraryPageVo; import com.yxt.anrui.terminal.config.CoverUtils; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * Project: anrui_scm(anrui_scm)
@@ -132,4 +122,14 @@ public class AppScmVehiclePatrolinspectionService { return resultBean; } + public ResultBean getInspectionInfo(String recordSid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehiclePatrolinVo vo = new AppScmVehiclePatrolinVo(); + ResultBean getInspectionInfo = scmVehiclePatrolinspectionFeign.getInspectionInfo(recordSid); + if(!getInspectionInfo.getSuccess()){ + return rb.setMsg(getInspectionInfo.getMsg()); + } + BeanUtil.copyProperties(getInspectionInfo.getData(),vo); + return rb.success().setData(vo); + } } \ No newline at end of file