From 2072d6a79db5fbe9133f56ab2302abdf65d58f8c Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Tue, 19 Jul 2022 11:17:22 +0800 Subject: [PATCH] =?UTF-8?q?app=E9=AA=8C=E8=BD=A6bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/scmvehinspectitem/AppImgUrlDto.java | 2 + .../api/scmvehinspectitem/AppImgUrlVo.java | 5 +- .../AppScmVehinspectItemInfoVo.java | 5 +- .../ScmVehicleExamineService.java | 135 ++++++++++-------- .../ScmVehinspectItemMapper.java | 10 +- .../ScmVehinspectItemMapper.xml | 6 + .../ScmVehinspectItemService.java | 75 +++++++--- .../ScmVehinspectItemimgMapper.xml | 8 +- .../AppScmVehinspectItemFeign.java | 2 +- .../supplychain/carInspected/ImgUrlDto.java | 4 +- .../supplychain/carInspected/ImgUrlVo.java | 4 +- .../AppScmVehinspectItemRest.java | 5 +- 12 files changed, 165 insertions(+), 96 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlDto.java index 78f0d4cd15..24241002b6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlDto.java @@ -16,6 +16,8 @@ public class AppImgUrlDto implements Dto { private String title; @ApiModelProperty("路径") private String imgUrl; + @ApiModelProperty("照片sid") + private String imgSid; @ApiModelProperty("照片路径") private List files; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlVo.java index 38869a5f34..ede9075e09 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -15,6 +16,8 @@ public class AppImgUrlVo implements Vo { private String title; @ApiModelProperty("路径") private String imgUrl; + @ApiModelProperty("照片sid") + private String imgSid; @ApiModelProperty("照片路径") - private List files; + private List files = new ArrayList<>(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java index c5e25eb38f..9e7ecf837a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -23,10 +24,10 @@ public class AppScmVehinspectItemInfoVo implements Vo { private String remarks; @ApiModelProperty("项目照片") - private List imgUrl; + private List imgUrl = new ArrayList<>(); @ApiModelProperty("照片示例") - private List imgTempUrl; + private List imgTempUrl = new ArrayList<>(); @ApiModelProperty("验车单sid") private String vehInspectSid; 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 b957ec0dce..3946561ea6 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 @@ -95,6 +95,7 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -253,7 +254,7 @@ public class ScmVehicleExamineService extends MybatisBaseService factoryImage = dto.getFactoryImage(); - for (String s : factoryImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + Boolean aBoolean = scmVehinspectItemService.selByTrueAndFalse(dto.getInspectedSid()); + if (aBoolean) { + ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid()); + if ("1".equals(scmVehicleExamine.getInspectionResult())) { + scmVehicleExamine.setVinNo(dto.getVin()); + scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); + scmVehicleExamine.setModelName(dto.getModel()); + scmVehicleExamine.setConfigName(dto.getConfig()); + scmVehicleExamine.setRemarks(dto.getRemarks()); + scmVehicleExamine.setAddress(dto.getAddress()); + scmVehicleExamine.setAddressCode(dto.getLocation()); + scmVehicleExamine.setInspectionResult("2"); + scmVehicleExamine.setPrice(dto.getPrice()); + scmVehicleExamine.setInspection(data.getName()); + scmVehicleExamine.setModelDifferenceExplain(dto.getModelDifferenceExplain()); + scmVehicleExamine.setGuaranteeCardNo(dto.getGuaranteeCardNo()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + String inspectionDate = simpleDateFormat.format(new Date()); + scmVehicleExamine.setInspectionDate(inspectionDate); + baseMapper.updateById(scmVehicleExamine); + // 通过验车 并保存入库单 + AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto(); + carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo()); + carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType()); + carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey()); + carWarehousingDto.setModelName(scmVehicleExamine.getModelName()); + carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate()); + carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate()); + carWarehousingDto.setInspection(scmVehicleExamine.getInspection()); + carWarehousingDto.setInboundState("1"); + carWarehousingDto.setUseOrgSid(data1.getSid()); + carWarehousingDto.setUseOrgName(data1.getName()); + scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto); + + scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); + List factoryImage = dto.getFactoryImage(); + for (String s : factoryImage) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile1 = new ScmFile(); + scmFile1.setAttachType("01"); + scmFile1.setFileName("厂家验车照片"); + scmFile1.setFilePath(s1); + scmFile1.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile1); } - ScmFile scmFile1 = new ScmFile(); - scmFile1.setAttachType("01"); - scmFile1.setFileName("厂家验车照片"); - scmFile1.setFilePath(s1); - scmFile1.setLinkSid(dto.getInspectedSid()); - scmFileService.save(scmFile1); - } - scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); - List carInspectedImage = dto.getCarInspectedImage(); - for (String s : carInspectedImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); + List carInspectedImage = dto.getCarInspectedImage(); + for (String s : carInspectedImage) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile2 = new ScmFile(); + scmFile2.setAttachType("02"); + scmFile2.setFileName("验车相关照片"); + scmFile2.setFilePath(s2); + scmFile2.setLinkSid(dto.getInspectedSid()); + scmFileService.save(scmFile2); } - ScmFile scmFile2 = new ScmFile(); - scmFile2.setAttachType("02"); - scmFile2.setFileName("验车相关照片"); - scmFile2.setFilePath(s2); - scmFile2.setLinkSid(dto.getInspectedSid()); - scmFileService.save(scmFile2); - } - return rb.success().setMsg("操作成功！"); + return rb.success().setMsg("操作成功！"); - } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { - return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); + } else if ("2".equals(scmVehicleExamine.getInspectionResult())) { + return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交"); + } + } else { + return rb.fail().setMsg("车辆检查表项目必须全部通过！"); } } return rb.fail().setMsg("操作失败！"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.java index ccf6edb8d8..2ac64be6ac 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.java @@ -78,7 +78,7 @@ public interface ScmVehinspectItemMapper extends BaseMapper { * @param sid * @param result */ - void updateByVehInspectSid(@Param("sid") String sid,@Param("remarks") String remarks, @Param("result") Integer result); + void updateByVehInspectSid(@Param("sid") String sid, @Param("remarks") String remarks, @Param("result") Integer result); /** * 移动端 根据验车单查询项目集合 @@ -87,4 +87,12 @@ public interface ScmVehinspectItemMapper extends BaseMapper { * @return */ List selInfoByVehInspectSid(@Param("inspectedSid") String inspectedSid); + + /** + * 查询项目状态 + * + * @param sid + * @return + */ + List selByTrueAndFalse(@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/scmvehinspectitem/ScmVehinspectItemMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.xml index f5f20da605..2834662600 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.xml @@ -43,6 +43,12 @@ WHERE svi.vehInspectSid = #{inspectedSid} + + update scm_vehinspect_item set `result` = #{result}, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java index ea0c00845d..0de5dd9dbb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java @@ -39,11 +39,13 @@ import com.yxt.anrui.scm.biz.scmvehinspectitemdetail.ScmVehinspectItemdetailServ import com.yxt.anrui.scm.biz.scmvehinspectitemimg.ScmVehinspectItemimgService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -91,6 +93,7 @@ public class ScmVehinspectItemService extends MybatisBaseService imgUrlVo = new ArrayList<>(); - List files = new ArrayList<>(); ScmVehinspectItem scmVehinspectItem = fetchBySid(sid); vo.setSid(sid); + vo.setVehInspectSid(scmVehinspectItem.getVehInspectSid()); vo.setResult(scmVehinspectItem.getResult()); vo.setRemarks(scmVehinspectItem.getRemarks()); List itemDetailVoList = scmVehinspectItemdetailService.getInfoByMainSid(sid); + String text = ""; for (int i = 0; i < itemDetailVoList.size(); i++) { - itemConten = itemDetailVoList.get(i).getItemContent() + "\n"; - vo.setItemConten(itemConten); + String itemConten = itemDetailVoList.get(i).getItemContent() + "\n"; + text = text + itemConten; } - + vo.setItemConten(text.substring(0, text.length() - 2)); List imgUrlVoList = scmVehinspectItemimgService.getAppImgByMainSid(sid); - for (AppImgUrlVo appImgUrlVo : imgUrlVoList) { - String url = fileUploadComponent.getUrlPrefix() + appImgUrlVo.getImgUrl().split(","); - files.add(url); - appImgUrlVo.setFiles(files); - imgUrlVo.add(appImgUrlVo); + for (int i = 0; i < imgUrlVoList.size(); i++) { + List files = new ArrayList<>(); + String imgUrl = imgUrlVoList.get(i).getImgUrl(); + if (StringUtils.isNotBlank(imgUrl)) { + String[] split = imgUrl.split(","); + for (String s : split) { + String imgUrls = fileUploadComponent.getUrlPrefix() + s; + files.add(imgUrls); + } + imgUrlVoList.get(i).setFiles(files); + vo.setImgUrl(imgUrlVoList); + } + vo.setImgUrl(imgUrlVoList); } - vo.setImgUrl(imgUrlVo); - List imgTempUrlVoList = scmVehinspectItemimgService.getAppImgTempByMainSid(sid); - for (AppImgUrlVo appImgUrlVo : imgTempUrlVoList) { - String url = fileUploadComponent.getUrlPrefix() + appImgUrlVo.getImgUrl().split(","); - files.add(url); - appImgUrlVo.setFiles(files); - imgUrlVo.add(appImgUrlVo); + for (int i = 0; i < imgTempUrlVoList.size(); i++) { + List files = new ArrayList<>(); + String imgUrl = imgTempUrlVoList.get(i).getImgUrl(); + if (StringUtils.isNotBlank(imgUrl)) { + String[] split = imgUrl.split(","); + for (String s : split) { + String imgUrls = fileUploadComponent.getUrlPrefix() + s; + files.add(imgUrls); + } + imgTempUrlVoList.get(i).setFiles(files); + vo.setImgTempUrl(imgTempUrlVoList); + } + vo.setImgTempUrl(imgTempUrlVoList); } - vo.setImgTempUrl(imgUrlVo); return vo; } @@ -179,7 +194,7 @@ public class ScmVehinspectItemService extends MybatisBaseService imgUrl = dto.getImgUrl(); for (AppImgUrlDto appImgUrlDto : imgUrl) { List files = appImgUrlDto.getFiles(); @@ -187,11 +202,29 @@ public class ScmVehinspectItemService extends MybatisBaseService list = baseMapper.selByTrueAndFalse(sid); + for (int i = 0; i < list.size(); i++) { + Integer result = list.get(i).getResult(); + if (result != 1) { + return false; + } + } + return true; + } + + public ResultBean saveItem(ScmVehinspectItemDto dto) { ResultBean rb = ResultBean.fireFail(); String vehInspectSid = dto.getVehInspectSid(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml index 6a76cf100a..72e26a4ed7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml @@ -29,13 +29,15 @@