供应商商品维修2

src/main/java/com/caimei365/commodity/controller/ProductPageApi.java

@@ -2,7 +2,7 @@ package com.caimei365.commodity.controller;
 
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.ProductParameterPo;
-import com.caimei365.commodity.model.po.ProductRepairPo;
+import com.caimei365.commodity.model.vo.ProductRepairVo;
 import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.PageService;
@@ -245,7 +245,7 @@ public class ProductPageApi {
     @ApiOperation("商品维修（链接分享）")
     @ApiImplicitParam(required = true, name = "code", value = "维修code")
     @GetMapping("/product/repair")
-    public ResponseJson<ProductRepairPo> getProductRepair(String code) {
+    public ResponseJson<ProductRepairVo> getProductRepair(String code) {
         return pageService.getProductRepair(code);
     }
 

src/main/java/com/caimei365/commodity/mapper/PageMapper.java

@@ -1,6 +1,6 @@
 package com.caimei365.commodity.mapper;
 
-import com.caimei365.commodity.model.po.ProductRepairPo;
+import com.caimei365.commodity.model.vo.ProductRepairVo;
 import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -133,5 +133,5 @@ public interface PageMapper {
     /**
      * 维修详情
      */
-    ProductRepairPo getMaintenanceById(Integer id);
+    ProductRepairVo getMaintenanceById(Integer id);
 }

src/main/java/com/caimei365/commodity/model/po/ProductRepairPo.java → src/main/java/com/caimei365/commodity/model/vo/ProductRepairVo.java

@@ -1,4 +1,4 @@
-package com.caimei365.commodity.model.po;
+package com.caimei365.commodity.model.vo;
 
 import lombok.Data;
 
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date : 2021/6/18
  */
 @Data
-public class ProductRepairPo implements Serializable {
+public class ProductRepairVo implements Serializable {
     /**  */
     private static final long serialVersionUID = 1L;
     /**  */
@@ -93,5 +93,6 @@ public class ProductRepairPo implements Serializable {
     private boolean onlyBaseInfo;
     /** 信息查看者类型 1=用户查看可以评价; (供应商只能查看不能操作)2=没有对接供应商查看基本信息; 3已对接供应查看完整信息 */
     private String viewerType;
-
+    /** 仪器图数组 */
+    private String[] instrumentArr;
 }

src/main/java/com/caimei365/commodity/service/PageService.java

@@ -2,7 +2,7 @@ package com.caimei365.commodity.service;
 
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.ProductParameterPo;
-import com.caimei365.commodity.model.po.ProductRepairPo;
+import com.caimei365.commodity.model.vo.ProductRepairVo;
 import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.*;
 
@@ -122,5 +122,5 @@ public interface PageService {
      * 商品维修（链接分享数据）
      * @param code 维修code
      */
-    ResponseJson<ProductRepairPo> getProductRepair(String code);
+    ResponseJson<ProductRepairVo> getProductRepair(String code);
 }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -8,7 +8,7 @@ import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.ProductDetailInfoPo;
 import com.caimei365.commodity.model.po.ProductImagePo;
 import com.caimei365.commodity.model.po.ProductParameterPo;
-import com.caimei365.commodity.model.po.ProductRepairPo;
+import com.caimei365.commodity.model.vo.ProductRepairVo;
 import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.*;
 import com.caimei365.commodity.service.PageService;
@@ -576,11 +576,11 @@ public class PageServiceImpl implements PageService {
      * @param code 维修code
      */
     @Override
-    public ResponseJson<ProductRepairPo> getProductRepair(String code) {
+    public ResponseJson<ProductRepairVo> getProductRepair(String code) {
         if (StringUtils.isEmpty(code)) {
             return ResponseJson.error("维修code不能为空！", null);
         }
-        ProductRepairPo repair = null;
+        ProductRepairVo repair = null;
         // 仪器维修表ID
         Integer maintenanceId = pageMapper.getMaintenanceIdByCode(code);
         if (null != maintenanceId) {
@@ -590,6 +590,25 @@ public class PageServiceImpl implements PageService {
         if (null == repair){
             return ResponseJson.error("无效的链接！", null);
         }
+        List<String> imageList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(repair.getInstrumentImage1())) {
+            imageList.add(repair.getInstrumentImage1());
+        }
+        if (StringUtils.isNotEmpty(repair.getInstrumentImage2())) {
+            imageList.add(repair.getInstrumentImage2());
+        }
+        if (StringUtils.isNotEmpty(repair.getInstrumentImage3())) {
+            imageList.add(repair.getInstrumentImage3());
+        }
+        if (StringUtils.isNotEmpty(repair.getInstrumentImage4())) {
+            imageList.add(repair.getInstrumentImage4());
+        }
+        if (StringUtils.isNotEmpty(repair.getInstrumentImage5())) {
+            imageList.add(repair.getInstrumentImage5());
+        }
+        String[] images = imageList.toArray(new String[imageList.size()]);
+        repair.setInstrumentArr(images);
+
         String viewerType = repair.getViewerType();
         if ("1".equals(viewerType)) {
             // 用户可评价展示详细信息
@@ -601,7 +620,7 @@ public class PageServiceImpl implements PageService {
             repair.setOnlyBaseInfo(false);
         } else {
             // 供应商不可评价展示基础信息
-            ProductRepairPo repairTemp = new ProductRepairPo();
+            ProductRepairVo repairTemp = new ProductRepairVo();
             repairTemp.setCanEvaluation(false);
             repairTemp.setOnlyBaseInfo(true);
             repairTemp.setViewerType("2");

src/main/resources/mapper/PageMapper.xml

@@ -296,7 +296,7 @@
     <select id="getMaintenanceIdByCode" resultType="java.lang.Integer">
         select cmInstrumentMaintenanceId from cm_instrument_maintenance_links where linkCode = #{code}
     </select>
-    <select id="getMaintenanceById" resultType="com.caimei365.commodity.model.po.ProductRepairPo">
+    <select id="getMaintenanceById" resultType="com.caimei365.commodity.model.vo.ProductRepairVo">
         SELECT
             a.id AS "id",
             a.orderNo AS "orderNo",