app验车bug修改

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

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<String> files;
+    private List<String> files = new ArrayList<>();
 }

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

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<ScmVehicleExami
     @Autowired
     ScmVehinspectItemService scmVehinspectItemService;
 
+
     private QueryWrapper<ScmVehicleExamine> 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<ScmVehicleExami
             appScmInspectionItemVo.setItem(scmVehinspectItemVo.getItem());
             appScmInspectionItemVo.setSid(scmVehinspectItemVo.getSid());
             appScmInspectionItemVo.setResult(scmVehinspectItemVo.getResult());
-            appScmInspectionItemVo.setIconUrl(scmVehinspectItemVo.getIconUrl());
+            appScmInspectionItemVo.setIconUrl(fileUploadComponent.getUrlPrefix() + scmVehinspectItemVo.getIconUrl());
             inspectionItemVos.add(appScmInspectionItemVo);
         }
         vo.setInspectList(inspectionItemVos);
@@ -413,13 +414,16 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
     public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isBlank(dto.getVin())) {
-            return rb.setMsg("车架号不能为空");
+            return rb.setMsg("车架号不能为空!");
+        }
+        if (StringUtils.isBlank(dto.getPrice().toString())) {
+            return rb.setMsg("洗车费不能为空!");
         }
         if (dto.getCarInspectedImage().size() <= 0) {
-            return rb.setMsg("验车相关照片不能为空");
+            return rb.setMsg("验车相关照片不能为空!");
         }
         if (dto.getFactoryImage().size() <= 0) {
-            return rb.setMsg("厂家验车照片不能为空");
+            return rb.setMsg("厂家验车照片不能为空!");
         }
         String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
         SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData();
@@ -429,6 +433,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String type1 = "01"; //厂家验车照片
         String type2 = "02"; //验车相关照片
         if (StringUtils.isNotBlank(dto.getInspectedSid())) {
+            Boolean aBoolean = scmVehinspectItemService.selByTrueAndFalse(dto.getInspectedSid());
+            if (aBoolean) {
                 ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
                 if ("1".equals(scmVehicleExamine.getInspectionResult())) {
                     scmVehicleExamine.setVinNo(dto.getVin());
@@ -492,6 +498,9 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                 } else if ("2".equals(scmVehicleExamine.getInspectionResult())) {
                     return rb.fail().setMsg("当前车辆已验车完成，请勿重复提交");
                 }
+            } else {
+                return rb.fail().setMsg("车辆检查表项目必须全部通过！");
+            }
         }
         return rb.fail().setMsg("操作失败！");
     }

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

@@ -87,4 +87,12 @@ public interface ScmVehinspectItemMapper extends BaseMapper<ScmVehinspectItem> {
      * @return
      */
     List<ScmVehinspectItemVo> selInfoByVehInspectSid(@Param("inspectedSid") String inspectedSid);
+
+    /**
+     * 查询项目状态
+     *
+     * @param sid
+     * @return
+     */
+    List<ScmVehinspectItemVo> selByTrueAndFalse(@Param("sid")String sid);
 }

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

@@ -43,6 +43,12 @@
         WHERE svi.vehInspectSid = #{inspectedSid}
     </select>
 
+    <select id="selByTrueAndFalse" resultType="com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemVo">
+        SELECT svi.`result`
+        FROM scm_vehinspect_item svi
+        WHERE svi.vehInspectSid = #{sid}
+    </select>
+
     <update id="updateByVehInspectSid">
         update scm_vehinspect_item
         set `result` = #{result},

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<ScmVehinspectIt
             listVo.setItemImgVoList(itemImgVos);
         }
         return listVos;
+
     }
 
     /**
@@ -136,39 +139,51 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
      * @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.setVehInspectSid(scmVehinspectItem.getVehInspectSid());
         vo.setResult(scmVehinspectItem.getResult());
         vo.setRemarks(scmVehinspectItem.getRemarks());
         List<ScmVehinspectItemdetailVo> itemDetailVoList = scmVehinspectItemdetailService.getInfoByMainSid(sid);
 
+        String text = "";
         for (int i = 0; i < itemDetailVoList.size(); i++) {
-            itemConten = itemDetailVoList.get(i).getItemContent() + "\n";
+            String itemConten = itemDetailVoList.get(i).getItemContent() + "\n";
-            vo.setItemConten(itemConten);
+            text = text + itemConten;
         }
-
+        vo.setItemConten(text.substring(0, text.length() - 2));
         List<AppImgUrlVo> imgUrlVoList = scmVehinspectItemimgService.getAppImgByMainSid(sid);
-        for (AppImgUrlVo appImgUrlVo : imgUrlVoList) {
+        for (int i = 0; i < imgUrlVoList.size(); i++) {
-            String url = fileUploadComponent.getUrlPrefix() + appImgUrlVo.getImgUrl().split(",");
+            List<String> files = new ArrayList<>();
-            files.add(url);
+            String imgUrl = imgUrlVoList.get(i).getImgUrl();
-            appImgUrlVo.setFiles(files);
+            if (StringUtils.isNotBlank(imgUrl)) {
-            imgUrlVo.add(appImgUrlVo);
+                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<AppImgUrlVo> imgTempUrlVoList = scmVehinspectItemimgService.getAppImgTempByMainSid(sid);
-        for (AppImgUrlVo appImgUrlVo : imgTempUrlVoList) {
+        for (int i = 0; i < imgTempUrlVoList.size(); i++) {
-            String url = fileUploadComponent.getUrlPrefix() + appImgUrlVo.getImgUrl().split(",");
+            List<String> files = new ArrayList<>();
-            files.add(url);
+            String imgUrl = imgTempUrlVoList.get(i).getImgUrl();
-            appImgUrlVo.setFiles(files);
+            if (StringUtils.isNotBlank(imgUrl)) {
-            imgUrlVo.add(appImgUrlVo);
+                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<ScmVehinspectIt
             return rb.setMsg("该验车项目不存在");
         }
         baseMapper.updateByVehInspectSid(dto.getSid(), dto.getRemarks(), dto.getResult());
-        String imgUrls = null;
+        String imgUrls = "";
         List<AppImgUrlDto> imgUrl = dto.getImgUrl();
         for (AppImgUrlDto appImgUrlDto : imgUrl) {
             List<String> files = appImgUrlDto.getFiles();
@@ -187,11 +202,29 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
                 imgUrls = files.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
             }
             appImgUrlDto.setImgUrl(imgUrls);
-            scmVehinspectItemimgService.updateByMainSid(dto.getSid(), appImgUrlDto.getImgUrl(), appImgUrlDto.getTitle());
+            scmVehinspectItemimgService.updateByMainSid(appImgUrlDto.getImgSid(), appImgUrlDto.getImgUrl(), appImgUrlDto.getTitle());
         }
         return rb.success().setMsg("保存成功");
     }
 
+    /**
+     * 查询项目状态
+     *
+     * @param sid
+     * @return
+     */
+    public Boolean selByTrueAndFalse(String sid) {
+        List<ScmVehinspectItemVo> 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();

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

@@ -29,13 +29,15 @@
     </select>
 
     <select id="getAppImgByMainSid" resultType="com.yxt.anrui.scm.api.scmvehinspectitem.AppImgUrlVo">
-        SELECT imgTitle as title,
+        SELECT sid      as imgSid,
+               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,
+        SELECT sid      as imgSid,
+               imgTitle as title,
                imgPath  as imgUrl
         FROM scm_vehinspect_itemimg
         WHERE mainSid = #{sid}
@@ -45,6 +47,6 @@
         update scm_vehinspect_itemimg
         set imgTitle =#{imgTitle},
             imgUrl   =#{imgUrl}
-        where mainSid = #{sid}
+        where sid = #{sid}
     </update>
 </mapper>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/AppScmVehinspectItemFeign.java

@@ -50,7 +50,7 @@ import java.util.List;
  */
 @Api(tags = "验车单中的检查表项目")
 @FeignClient(
-        contextId = "anrui-scm-ScmVehinspectItem",
+        contextId = "anrui-terminal-AppScmVehinspectItem",
         name = "anrui-terminal",
         path = "/supplychain/v1/carInspected",
         fallback = AppScmVehinspectItemFeignFallback.class)

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java

@@ -5,6 +5,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ImgUrlDto implements Dto {
 
@@ -13,5 +15,5 @@ public class ImgUrlDto implements Dto {
     @ApiModelProperty("照片名称")
     private String title;
     @ApiModelProperty("照片路径")
-    private String files;
+    private List<String> files;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ImgUrlVo implements Vo {
 
@@ -12,5 +14,5 @@ public class ImgUrlVo implements Vo {
     @ApiModelProperty("照片名称")
     private String title;
     @ApiModelProperty("照片路径")
-    private String files;
+    private List<String> files;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/carInspected/AppScmVehinspectItemRest.java

@@ -35,6 +35,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -53,8 +54,8 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "验车单中的检查表项目")
-@RestController("com.yxt.anrui.scm.biz.scmvehinspectitem.ScmVehinspectItemRest")
+@Controller
-@RequestMapping("v1/scmvehinspectitem")
+@RequestMapping("/supplychain/v1/carInspected")
 public class AppScmVehinspectItemRest implements AppScmVehinspectItemFeign {
 
     @Autowired