diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmInspectionItemVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmInspectionItemVo.java new file mode 100644 index 0000000000..454fd9b545 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmInspectionItemVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.scm.api.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppScmInspectionItemVo implements Vo { + + private static final long serialVersionUID = -5278556466193906664L; + @ApiModelProperty("项目sid") + private String sid; + @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") + private Integer result; + @ApiModelProperty("项目名称") + private String item; + @ApiModelProperty("图标路径") + private String iconUrl; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java index aab0bc9584..d8a9fee4a8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java @@ -52,6 +52,7 @@ public class AppScmVehicleExamineInfoVo implements Vo { @ApiModelProperty("保修卡卡号") private String guaranteeCardNo; // 保修卡卡号 - + @ApiModelProperty("检验项集合") + private List inspectList; } 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 new file mode 100644 index 0000000000..78f0d4cd15 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlDto.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.scm.api.scmvehinspectitem; + +import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppImgUrlDto implements Dto { + + + private static final long serialVersionUID = 3485266738861179994L; + @ApiModelProperty("照片名称") + private String title; + @ApiModelProperty("路径") + private String imgUrl; + @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 new file mode 100644 index 0000000000..38869a5f34 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppImgUrlVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.scm.api.scmvehinspectitem; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppImgUrlVo implements Vo { + + private static final long serialVersionUID = -9046180627016594155L; + + @ApiModelProperty("照片名称") + private String title; + @ApiModelProperty("路径") + private String imgUrl; + @ApiModelProperty("照片路径") + private List files; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemDto.java new file mode 100644 index 0000000000..9f277d995e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemDto.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehinspectitem; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-scm(供应链)
+ * File: ScmVehinspectItemDto.java
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto
+ * Description: 验车单中的检查表项目 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-07-14 00:17:21
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单中的检查表项目 数据传输对象", description = "验车单中的检查表项目 数据传输对象") +public class AppScmVehinspectItemDto implements Dto { + + private static final long serialVersionUID = 4815903953419395568L; + + @ApiModelProperty("项目sid") + private String sid; + + @ApiModelProperty("项目名称") + private String item; + + @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") + private Integer result; + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("项目照片") + private List imgUrl; + + @ApiModelProperty("照片示例") + private List imgTempUrl; + + @ApiModelProperty("验车单sid") + private String vehInspectSid; + +} \ No newline at end of file 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 new file mode 100644 index 0000000000..c5e25eb38f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.scm.api.scmvehinspectitem; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppScmVehinspectItemInfoVo implements Vo { + + private static final long serialVersionUID = -6169838249336661987L; + @ApiModelProperty("项目sid") + private String sid; + + @ApiModelProperty("项目名称") + private String itemConten; + + @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") + private Integer result; + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("项目照片") + private List imgUrl; + + @ApiModelProperty("照片示例") + private List imgTempUrl; + + @ApiModelProperty("验车单sid") + private String vehInspectSid; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java index d7983aa37f..4650a58aed 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.scm.api.scmvehinspectitem; +import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +18,10 @@ public class ScmResultImageDto implements Dto { @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") private Integer result; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("相关图片") - private ScmVehinspectItemimgVo scmVehinspectItemimgVo; + private ScmVehinspectItemimgDto scmVehinspectItemimgDto; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java index feb7338c06..9f5c0f7a20 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java @@ -84,4 +84,22 @@ public interface ScmVehinspectItemFeign { @PostMapping("/saveResultImage") @ResponseBody public ResultBean saveResultImage(@RequestBody ScmVehinspectItemResultImageDto dto); + + + /** + * 移动端根据检查表sid 获取检验项内容 + * + * @param sid + * @return + */ + @ApiOperation("根据检查表sid 获取检验项内容") + @GetMapping("/getInspectItemBysid/{sid}") + @ResponseBody + public ResultBean getInspectItemBysid(@PathVariable("sid") String sid); + + + @ApiOperation("保存检查结果及相关照片") + @PostMapping("/saveInspectItem") + @ResponseBody + public ResultBean saveInspectItem(@RequestBody AppScmVehinspectItemDto dto); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java index ed190b7496..9b022187da 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java @@ -53,7 +53,7 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign { public ResultBean save(ScmVehinspectItemDto dto) { return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehinspectitem/save无法访问"); } - + @Override public ResultBean> getVehinspectItemInfo(String vehInspectSid) { return null; @@ -63,4 +63,14 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign { public ResultBean saveResultImage(ScmVehinspectItemResultImageDto dto) { return null; } + + @Override + public ResultBean getInspectItemBysid(String sid) { + return null; + } + + @Override + public ResultBean saveInspectItem(AppScmVehinspectItemDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemVo.java index 95ae20e183..17889cbc48 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemVo.java @@ -51,6 +51,8 @@ public class ScmVehinspectItemVo implements Vo { private static final long serialVersionUID = -3060872902597363879L; + @ApiModelProperty("项目sid") + private String sid; @ApiModelProperty("验车单sid") private String vehInspectSid; @ApiModelProperty("项目名称") @@ -59,5 +61,7 @@ public class ScmVehinspectItemVo implements Vo { private Integer sortNo; @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") private Integer result; + @ApiModelProperty("图标路径") + private String iconUrl; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java new file mode 100644 index 0000000000..ae2ea4edad --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.scm.api.scmvehinspectitemimg; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class ScmVehinspectItemimgDto implements Dto { + private static final long serialVersionUID = -5242396515365105708L; + @ApiModelProperty("检查表sid") + private String mainSid; + @ApiModelProperty("照片名称") + private String imgTitle; + @ApiModelProperty("照片路径") + private String imgUrl; + @ApiModelProperty("照片路径集合") + private List imgUrlList; + @ApiModelProperty("照片模板路径") + private String imgPath; +} 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 405b4f83d7..b957ec0dce 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 @@ -36,8 +36,11 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.AppScmVehicleEnterlibraryCarWarehousingDto; import com.yxt.anrui.scm.api.scmvehicleexamine.*; +import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemInfoVo; +import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehicleenterlibrary.ScmVehicleEnterlibraryService; +import com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -89,6 +92,9 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -239,6 +245,19 @@ public class ScmVehicleExamineService extends MybatisBaseService scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid); + List inspectionItemVos = new ArrayList<>(); + for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) { + AppScmInspectionItemVo appScmInspectionItemVo = new AppScmInspectionItemVo(); + appScmInspectionItemVo.setItem(scmVehinspectItemVo.getItem()); + appScmInspectionItemVo.setSid(scmVehinspectItemVo.getSid()); + appScmInspectionItemVo.setResult(scmVehinspectItemVo.getResult()); + appScmInspectionItemVo.setIconUrl(scmVehinspectItemVo.getIconUrl()); + inspectionItemVos.add(appScmInspectionItemVo); + } + vo.setInspectList(inspectionItemVos); + if (vo.getPrice() == null || vo.getPrice().equals("")) { BigDecimal bigDecimal = new BigDecimal("0.00"); vo.setPrice(bigDecimal); @@ -303,7 +322,7 @@ public class ScmVehicleExamineService extends MybatisBaseService { * @param sid * @param result */ - void updateByVehInspectSid(@Param("sid") String sid, @Param("result") Integer result); + void updateByVehInspectSid(@Param("sid") String sid,@Param("remarks") String remarks, @Param("result") Integer result); + + /** + * 移动端 根据验车单查询项目集合 + * + * @param inspectedSid + * @return + */ + List selInfoByVehInspectSid(@Param("inspectedSid") String inspectedSid); } \ 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 6acb4898eb..f5f20da605 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 @@ -31,9 +31,22 @@ ORDER BY svi.sortNo + + update scm_vehinspect_item - set `result` = #{result} + set `result` = #{result}, + remarks = #{remarks} where sid = #{sid} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java index ee889746e8..ad677bf6dc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java @@ -25,10 +25,7 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehinspectitem; -import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; -import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign; -import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemInfoVo; -import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemResultImageDto; +import com.yxt.anrui.scm.api.scmvehinspectitem.*; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -79,4 +76,16 @@ public class ScmVehinspectItemRest implements ScmVehinspectItemFeign { public ResultBean saveResultImage(ScmVehinspectItemResultImageDto dto) { return scmVehinspectItemService.saveResultImage(dto); } + + @Override + public ResultBean getInspectItemBysid(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehinspectItemInfoVo vo = scmVehinspectItemService.getInspectItemBysid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean saveInspectItem(AppScmVehinspectItemDto dto) { + return scmVehinspectItemService.saveInspectItem(dto); + } } 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 9b3fdbf108..ea0c00845d 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 @@ -30,6 +30,7 @@ import com.yxt.anrui.scm.api.scmvehinspectitem.*; import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmItemDetailVo; import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetail; import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetailVo; +import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmItemImgVo; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimg; import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo; @@ -42,6 +43,7 @@ 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.Collections; import java.util.List; @@ -105,14 +107,87 @@ public class ScmVehinspectItemService extends MybatisBaseService scmResultImageDtos = dto.getScmResultImageDtos(); for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) { - baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getResult()); - ScmVehinspectItemimgVo scmVehinspectItemimgVo = scmResultImageDto.getScmVehinspectItemimgVo(); - List imgUrlList = scmVehinspectItemimgVo.getImgUrlList(); + baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult()); + ScmVehinspectItemimgDto scmVehinspectItemimgDto = scmResultImageDto.getScmVehinspectItemimgDto(); + List imgUrlList = scmVehinspectItemimgDto.getImgUrlList(); String imgUrl = null; for (int i = 0; i < imgUrlList.size(); i++) { imgUrl = imgUrlList.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; } - scmVehinspectItemimgService.updateByMainSid(scmResultImageDto.getSid(), imgUrl, scmVehinspectItemimgVo.getImgTitle()); + scmVehinspectItemimgService.updateByMainSid(scmResultImageDto.getSid(), imgUrl, scmVehinspectItemimgDto.getImgTitle()); + } + return rb.success().setMsg("保存成功"); + } + + /** + * 移动端 根据验车单查询项目集合 + * + * @param inspectedSid + * @return + */ + public List selInfoByVehInspectSid(String inspectedSid) { + return baseMapper.selInfoByVehInspectSid(inspectedSid); + } + + /** + * 移动端根据检查表sid 获取检验项内容 + * + * @param sid + * @return + */ + public AppScmVehinspectItemInfoVo getInspectItemBysid(String sid) { + String itemConten = null; + AppScmVehinspectItemInfoVo vo = new AppScmVehinspectItemInfoVo(); + List imgUrlVo = new ArrayList<>(); + List files = new ArrayList<>(); + + ScmVehinspectItem scmVehinspectItem = fetchBySid(sid); + vo.setSid(sid); + vo.setResult(scmVehinspectItem.getResult()); + vo.setRemarks(scmVehinspectItem.getRemarks()); + List itemDetailVoList = scmVehinspectItemdetailService.getInfoByMainSid(sid); + + for (int i = 0; i < itemDetailVoList.size(); i++) { + itemConten = itemDetailVoList.get(i).getItemContent() + "\n"; + vo.setItemConten(itemConten); + } + + 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); + } + 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); + } + vo.setImgTempUrl(imgUrlVo); + return vo; + } + + public ResultBean saveInspectItem(AppScmVehinspectItemDto dto) { + ResultBean rb = ResultBean.fireFail(); + List vos = baseMapper.getInfoByVehInspectSid(dto.getVehInspectSid()); + if (vos.size() <= 0) { + return rb.setMsg("该验车项目不存在"); + } + baseMapper.updateByVehInspectSid(dto.getSid(), dto.getRemarks(), dto.getResult()); + String imgUrls = null; + List imgUrl = dto.getImgUrl(); + for (AppImgUrlDto appImgUrlDto : imgUrl) { + List files = appImgUrlDto.getFiles(); + for (int i = 0; i < files.size(); i++) { + imgUrls = files.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; + } + appImgUrlDto.setImgUrl(imgUrls); + scmVehinspectItemimgService.updateByMainSid(dto.getSid(), appImgUrlDto.getImgUrl(), appImgUrlDto.getTitle()); } return rb.success().setMsg("保存成功"); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.java index 5c2de876f3..a0e86af543 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.java @@ -29,6 +29,7 @@ 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.scmvehinspectitem.AppImgUrlVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -78,4 +79,8 @@ public interface ScmVehinspectItemimgMapper extends BaseMapper getAppImgByMainSid(@Param("sid") String sid); + + List getAppImgTempByMainSid(@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/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml index 3a9c004b65..6a76cf100a 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 @@ -28,6 +28,19 @@ WHERE mainSid = #{sid} + + + update scm_vehinspect_itemimg set imgTitle =#{imgTitle}, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgService.java index cd67020f19..83abc8b5be 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehinspectitemimg; 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.scm.api.scmvehinspectitem.AppImgUrlVo; import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -91,4 +92,12 @@ public class ScmVehinspectItemimgService extends MybatisBaseService getAppImgByMainSid(String sid) { + return baseMapper.getAppImgByMainSid(sid); + } + + public List getAppImgTempByMainSid(String sid) { + return baseMapper.getAppImgTempByMainSid(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeign.java new file mode 100644 index 0000000000..87e5195b57 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeign.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.carInspected; + +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.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(供应链)
+ * File: ScmVehinspectItemFeign.java
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign
+ * Description: 验车单中的检查表项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-07-14 00:17:21
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "验车单中的检查表项目") +@FeignClient( + contextId = "anrui-scm-ScmVehinspectItem", + name = "anrui-terminal", + path = "/supplychain/v1/carInspected", + fallback = AppScmVehinspectItemFeignFallback.class) +public interface AppScmVehinspectItemFeign { + + + @ApiOperation("根据检查表sid 获取检验项内容") + @GetMapping("/getInspectItemBysid/{sid}") + @ResponseBody + public ResultBean getInspectItemBysid(@PathVariable("sid") String sid); + + @ApiOperation("保存检查结果及相关照片") + @PostMapping("/saveInspectItem") + @ResponseBody + public ResultBean saveInspectItem(@RequestBody ItemDto dto); +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeignFallback.java new file mode 100644 index 0000000000..5b347bb3f8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeignFallback.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.carInspected; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(供应链)
+ * File: ScmVehinspectItemFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeignFallback
+ * Description: 验车单中的检查表项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-07-14 00:17:21
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class AppScmVehinspectItemFeignFallback implements AppScmVehinspectItemFeign { + + + @Override + public ResultBean getInspectItemBysid(String sid) { + return null; + } + + @Override + public ResultBean saveInspectItem(ItemDto dto) { + 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/carInspected/ImgUrlDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java new file mode 100644 index 0000000000..f1a7f195c2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.supplychain.carInspected; + +import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ImgUrlDto implements Dto { + + + private static final long serialVersionUID = -896072904271608090L; + @ApiModelProperty("照片名称") + private String title; + @ApiModelProperty("照片路径") + private String files; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java new file mode 100644 index 0000000000..b96ffb2845 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.terminal.api.supplychain.carInspected; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ImgUrlVo implements Vo { + + private static final long serialVersionUID = -9046180627016594155L; + + @ApiModelProperty("照片名称") + private String title; + @ApiModelProperty("照片路径") + private String files; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ItemDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ItemDto.java new file mode 100644 index 0000000000..76d384dae2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ItemDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.supplychain.carInspected; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class ItemDto implements Dto { + private static final long serialVersionUID = 7875329337448356091L; + + @ApiModelProperty("项目sid") + private String sid; + + @ApiModelProperty("项目名称") + private String item; + + @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") + private Integer result; + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("项目照片") + private List imgUrl; + + @ApiModelProperty("照片示例") + private List imgTempUrl; + + @ApiModelProperty("验车单sid") + private String vehInspectSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ItemInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ItemInfoVo.java new file mode 100644 index 0000000000..b0438dce43 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ItemInfoVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.supplychain.carInspected; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class ItemInfoVo implements Vo { + private static final long serialVersionUID = -3640078013489158647L; + + @ApiModelProperty("项目sid") + private String sid; + + @ApiModelProperty("项目名称") + private String itemConten; + + @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") + private Integer result; + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("项目照片") + private List imgUrl; + + @ApiModelProperty("照片示例") + private List imgTempUrl; + + @ApiModelProperty("验车单sid") + private String vehInspectSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java index 524821a2f2..e543752929 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java @@ -46,4 +46,7 @@ public class AppExamineInfoVo implements Vo { @ApiModelProperty("洗车费") private BigDecimal price; + @ApiModelProperty("检验项集合") + private List inspectList; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/InspectionItemVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/InspectionItemVo.java new file mode 100644 index 0000000000..d8479f0fd0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/InspectionItemVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class InspectionItemVo implements Vo { + private static final long serialVersionUID = -3087838434003064445L; + @ApiModelProperty("项目sid") + private String sid; + @ApiModelProperty("检查结果:1是,0否,2无结果,默认2") + private Integer result; + @ApiModelProperty("项目名称") + private String item; + @ApiModelProperty("图标路径") + private String iconUrl; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemRest.java new file mode 100644 index 0000000000..82dfcdc799 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemRest.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.supplychain.carInspected; + +import com.yxt.anrui.scm.api.scmvehinspectitem.*; +import com.yxt.anrui.terminal.api.supplychain.carInspected.AppScmVehinspectItemFeign; +import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto; +import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo; +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.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(供应链)
+ * File: ScmVehinspectItemFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemRest
+ * Description: 验车单中的检查表项目.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-07-14 00:17:21
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "验车单中的检查表项目") +@RestController("com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemRest") +@RequestMapping("v1/scmvehinspectitem") +public class AppScmVehinspectItemRest implements AppScmVehinspectItemFeign { + + @Autowired + private AppScmVehinspectItemService appScmVehinspectItemService; + + + @Override + public ResultBean getInspectItemBysid(String sid) { + return appScmVehinspectItemService.getInspectItemBysid(sid); + } + + @Override + public ResultBean saveInspectItem(ItemDto dto) { + return appScmVehinspectItemService.saveInspectItem(dto); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemService.java new file mode 100644 index 0000000000..ce389500fc --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemService.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.supplychain.carInspected; + +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.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo; +import com.yxt.anrui.scm.api.scmvehinspectitem.*; +import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetailVo; +import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo; +import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemDto; +import com.yxt.anrui.terminal.api.supplychain.carInspected.ItemInfoVo; +import com.yxt.anrui.terminal.api.supplychain.inspection.PatrolinspectionInfoVo; +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 java.util.List; + +/** + * Project: anrui-scm(供应链)
+ * File: ScmVehinspectItemService.java
+ * Class: com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemService
+ * Description: 验车单中的检查表项目 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-07-14 00:17:21
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AppScmVehinspectItemService { + + @Autowired + ScmVehinspectItemFeign scmVehinspectItemFeign; + + public ResultBean getInspectItemBysid(String sid) { + ResultBean rb = ResultBean.fireFail(); + ItemInfoVo vo = new ItemInfoVo(); + ResultBean resultBean = scmVehinspectItemFeign.getInspectItemBysid(sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + AppScmVehinspectItemInfoVo appScmVehinspectItemInfoVo = resultBean.getData(); + BeanUtil.copyProperties(appScmVehinspectItemInfoVo, vo); + return rb.success().setData(vo); + } + + public ResultBean saveInspectItem(ItemDto dto) { + AppScmVehinspectItemDto appScmVehinspectItemDto = new AppScmVehinspectItemDto(); + BeanUtil.copyProperties(dto, appScmVehinspectItemDto); + ResultBean resultBean = scmVehinspectItemFeign.saveInspectItem(appScmVehinspectItemDto); + return resultBean; + } +} \ No newline at end of file