app验车检查单接口，出库申请修改

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;
+
+}

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<AppScmInspectionItemVo> inspectList;
 
 }

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<String> files;
+}

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<String> files;
+}

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(供应链) <br/>
+ * File: ScmVehinspectItemDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto <br/>
+ * Description: 验车单中的检查表项目 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @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<AppImgUrlDto> imgUrl;
+
+    @ApiModelProperty("照片示例")
+    private List<AppImgUrlDto> imgTempUrl;
+
+    @ApiModelProperty("验车单sid")
+    private String vehInspectSid;
+
+}

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<AppImgUrlVo> imgUrl;
+
+    @ApiModelProperty("照片示例")
+    private List<AppImgUrlVo> imgTempUrl;
+
+    @ApiModelProperty("验车单sid")
+    private String vehInspectSid;
+
+}

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;
 
 }

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<AppScmVehinspectItemInfoVo> getInspectItemBysid(@PathVariable("sid") String sid);
+
+
+    @ApiOperation("保存检查结果及相关照片")
+    @PostMapping("/saveInspectItem")
+    @ResponseBody
+    public ResultBean saveInspectItem(@RequestBody AppScmVehinspectItemDto dto);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java

@@ -63,4 +63,14 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign {
     public ResultBean saveResultImage(ScmVehinspectItemResultImageDto dto) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppScmVehinspectItemInfoVo> getInspectItemBysid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveInspectItem(AppScmVehinspectItemDto dto) {
+        return null;
+    }
 }

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;
 
 }

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<String> imgUrlList;
+    @ApiModelProperty("照片模板路径")
+    private String imgPath;
+}

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<ScmVehicleExami
     @Autowired
     ScmVehicleEnterlibraryService scmVehicleEnterlibraryService;
 
+    @Autowired
+    ScmVehinspectItemService scmVehinspectItemService;
+
     private QueryWrapper<ScmVehicleExamine> 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<ScmVehicleExami
         String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
 
         AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
+
+        List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
+        List<AppScmInspectionItemVo> 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<ScmVehicleExami
         scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
         scmVehicleExamine.setUseOrgSid(useOrgSid);
         scmVehicleExamine.setUseOrgName(data.getName());
-        BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine,"sid");
+        BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid");
         save(scmVehicleExamine);
         return rb.success();
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.java

@@ -78,5 +78,13 @@ public interface ScmVehinspectItemMapper extends BaseMapper<ScmVehinspectItem> {
      * @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<ScmVehinspectItemVo> selInfoByVehInspectSid(@Param("inspectedSid") String inspectedSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemMapper.xml

@@ -31,9 +31,22 @@
         ORDER BY svi.sortNo
     </select>
 
+    <select id="selInfoByVehInspectSid"
+            resultType="com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemVo">
+        SELECT svi.sid,
+               svi.item,
+               svi.sortNo,
+               svi.`result`,
+               svi.remarks,
+               svi.iconUrl
+        FROM scm_vehinspect_item svi
+        WHERE svi.vehInspectSid = #{inspectedSid}
+    </select>
+
     <update id="updateByVehInspectSid">
         update scm_vehinspect_item
-        set `result` = #{result}
+        set `result` = #{result},
+            remarks  = #{remarks}
         where sid = #{sid}
     </update>
 

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.*;
-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.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<AppScmVehinspectItemInfoVo> 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);
+    }
 }

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<ScmVehinspectIt
         }
         List<ScmResultImageDto> scmResultImageDtos = dto.getScmResultImageDtos();
         for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) {
-            baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getResult());
+            baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult());
-            ScmVehinspectItemimgVo scmVehinspectItemimgVo = scmResultImageDto.getScmVehinspectItemimgVo();
+            ScmVehinspectItemimgDto scmVehinspectItemimgDto = scmResultImageDto.getScmVehinspectItemimgDto();
-            List<String> imgUrlList = scmVehinspectItemimgVo.getImgUrlList();
+            List<String> 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<ScmVehinspectItemVo> selInfoByVehInspectSid(String inspectedSid) {
+        return baseMapper.selInfoByVehInspectSid(inspectedSid);
+    }
+
+    /**
+     * 移动端根据检查表sid 获取检验项内容
+     *
+     * @param sid
+     * @return
+     */
+    public AppScmVehinspectItemInfoVo getInspectItemBysid(String sid) {
+        String itemConten = null;
+        AppScmVehinspectItemInfoVo vo = new AppScmVehinspectItemInfoVo();
+        List<AppImgUrlVo> imgUrlVo = new ArrayList<>();
+        List<String> files = new ArrayList<>();
+
+        ScmVehinspectItem scmVehinspectItem = fetchBySid(sid);
+        vo.setSid(sid);
+        vo.setResult(scmVehinspectItem.getResult());
+        vo.setRemarks(scmVehinspectItem.getRemarks());
+        List<ScmVehinspectItemdetailVo> itemDetailVoList = scmVehinspectItemdetailService.getInfoByMainSid(sid);
+
+        for (int i = 0; i < itemDetailVoList.size(); i++) {
+            itemConten = itemDetailVoList.get(i).getItemContent() + "\n";
+            vo.setItemConten(itemConten);
+        }
+
+        List<AppImgUrlVo> 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<AppImgUrlVo> 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<ScmVehinspectItemInfoVo> vos = baseMapper.getInfoByVehInspectSid(dto.getVehInspectSid());
+        if (vos.size() <= 0) {
+            return rb.setMsg("该验车项目不存在");
+        }
+        baseMapper.updateByVehInspectSid(dto.getSid(), dto.getRemarks(), dto.getResult());
+        String imgUrls = null;
+        List<AppImgUrlDto> imgUrl = dto.getImgUrl();
+        for (AppImgUrlDto appImgUrlDto : imgUrl) {
+            List<String> 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("保存成功");
     }

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<ScmVehinspectItem
      * @return
      */
     void updateByMainSid(@Param("sid") String sid, @Param("imgUrl") String imgUrl, @Param("imgTitle") String imgTitle);
+
+    List<AppImgUrlVo> getAppImgByMainSid(@Param("sid") String sid);
+
+    List<AppImgUrlVo> getAppImgTempByMainSid(@Param("sid") String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml

@@ -28,6 +28,19 @@
         WHERE mainSid = #{sid}
     </select>
 
+    <select id="getAppImgByMainSid" resultType="com.yxt.anrui.scm.api.scmvehinspectitem.AppImgUrlVo">
+        SELECT imgTitle as title,
+               imgUrl
+        FROM scm_vehinspect_itemimg
+        WHERE mainSid = #{sid}
+    </select>
+    <select id="getAppImgTempByMainSid" resultType="com.yxt.anrui.scm.api.scmvehinspectitem.AppImgUrlVo">
+        SELECT imgTitle as title,
+               imgPath  as imgUrl
+        FROM scm_vehinspect_itemimg
+        WHERE mainSid = #{sid}
+    </select>
+
     <update id="updateByMainSid">
         update scm_vehinspect_itemimg
         set imgTitle =#{imgTitle},

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<ScmVehinspec
     public void updateByMainSid(String sid, String imgUrl, String imgTitle) {
         baseMapper.updateByMainSid(sid,imgUrl,imgTitle);
     }
+
+    public List<AppImgUrlVo> getAppImgByMainSid(String sid) {
+        return baseMapper.getAppImgByMainSid(sid);
+    }
+
+    public List<AppImgUrlVo> getAppImgTempByMainSid(String sid) {
+        return baseMapper.getAppImgTempByMainSid(sid);
+    }
 }

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(供应链) <br/>
+ * File: ScmVehinspectItemFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign <br/>
+ * Description: 验车单中的检查表项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @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<ItemInfoVo> getInspectItemBysid(@PathVariable("sid") String sid);
+
+    @ApiOperation("保存检查结果及相关照片")
+    @PostMapping("/saveInspectItem")
+    @ResponseBody
+    public ResultBean saveInspectItem(@RequestBody ItemDto dto);
+}

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(供应链) <br/>
+ * File: ScmVehinspectItemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeignFallback <br/>
+ * Description: 验车单中的检查表项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppScmVehinspectItemFeignFallback implements AppScmVehinspectItemFeign {
+
+
+    @Override
+    public ResultBean<ItemInfoVo> getInspectItemBysid(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveInspectItem(ItemDto dto) {
+        return null;
+    }
+}

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;
+}

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;
+}

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<ImgUrlDto> imgUrl;
+
+    @ApiModelProperty("照片示例")
+    private List<ImgUrlDto> imgTempUrl;
+
+    @ApiModelProperty("验车单sid")
+    private String vehInspectSid;
+}

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<ImgUrlVo> imgUrl;
+
+    @ApiModelProperty("照片示例")
+    private List<ImgUrlVo> imgTempUrl;
+
+    @ApiModelProperty("验车单sid")
+    private String vehInspectSid;
+}

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<InspectionItemVo> inspectList;
+
 }

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;
+}

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(供应链) <br/>
+ * File: ScmVehinspectItemFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemRest <br/>
+ * Description: 验车单中的检查表项目. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @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<ItemInfoVo> getInspectItemBysid(String sid) {
+        return appScmVehinspectItemService.getInspectItemBysid(sid);
+    }
+
+    @Override
+    public ResultBean saveInspectItem(ItemDto dto) {
+        return appScmVehinspectItemService.saveInspectItem(dto);
+    }
+}

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(供应链) <br/>
+ * File: ScmVehinspectItemService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemService <br/>
+ * Description: 验车单中的检查表项目 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-14 00:17:21 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppScmVehinspectItemService {
+
+    @Autowired
+    ScmVehinspectItemFeign scmVehinspectItemFeign;
+
+    public ResultBean<ItemInfoVo> getInspectItemBysid(String sid) {
+        ResultBean<ItemInfoVo> rb = ResultBean.fireFail();
+        ItemInfoVo vo = new ItemInfoVo();
+        ResultBean<AppScmVehinspectItemInfoVo> 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;
+    }
+}