fix: 修复修改商品报错的问题

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductScrmController.java

@@ -8,6 +8,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.hisStore.dto.GenFormatAttrDTO;
 import com.fs.hisStore.dto.ProductArrtDTO;
 import com.fs.hisStore.param.FormatAttrParam;
 import com.fs.hisStore.vo.FsStoreProductAttrValueVO;
@@ -171,8 +172,8 @@ public class FsStoreProductScrmController extends BaseController
 
     @ApiOperation(value = "生成属性")
     @PostMapping(value = "/genFormatAttr/{productId}")
-    public ResponseEntity genFormatAttr(@PathVariable Long productId, @RequestBody List<ProductArrtDTO> productArr){
-        return new ResponseEntity<>(fsStoreProductService.getFormatAttr(productId,productArr,null), HttpStatus.OK);
+    public ResponseEntity genFormatAttr(@PathVariable Long productId,  @RequestBody GenFormatAttrDTO payload){
+        return new ResponseEntity<>(fsStoreProductService.getFormatAttr(productId,payload,null), HttpStatus.OK);
     }
 
 

fs-service/src/main/java/com/fs/hisStore/dto/GenFormatAttrDTO.java

@@ -0,0 +1,11 @@
+package com.fs.hisStore.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class GenFormatAttrDTO implements Serializable {
+    private List<ProductArrtDTO> attrs;
+}

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreProductScrmService.java

@@ -10,6 +10,7 @@ import com.fs.his.param.FsStoreProductListSParam;
 import com.fs.his.vo.FsStoreProductExcelVO;
 import com.fs.his.vo.FsStoreProductListSVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.hisStore.dto.GenFormatAttrDTO;
 import com.fs.hisStore.dto.ProductArrtDTO;
 import com.fs.hisStore.vo.*;
 import com.fs.statis.dto.ModifyMoreDTO;
@@ -77,7 +78,7 @@ public interface IFsStoreProductScrmService
 
     List<FsStoreProductListVO> selectFsStoreProductBarCodeListVO(FsStoreProductScrm fsStoreProduct);
 
-    Map<String,Object> getFormatAttr(Long productId, List<ProductArrtDTO> productArr, Long[] stores);
+    Map<String,Object> getFormatAttr(Long productId, GenFormatAttrDTO genFormatAttrDTO, Long[] stores);
 
 
     R addOrEdit(FsStoreProductAddEditParam fsStoreProduct);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -28,6 +28,7 @@ import com.fs.his.vo.FsStoreProductExcelVO;
 import com.fs.his.vo.FsStoreProductListSVO;
 import com.fs.his.vo.OptionsVO;
 import com.fs.hisStore.domain.*;
+import com.fs.hisStore.dto.GenFormatAttrDTO;
 import com.fs.hisStore.mapper.*;
 import com.fs.statis.dto.ModifyMoreDTO;
 import com.fs.hisStore.dto.ProductArrtDTO;
@@ -199,13 +200,15 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     }
 
     @Override
-    public Map<String, Object> getFormatAttr(Long productId, List<ProductArrtDTO> productArr,Long[] stores) {
+    public Map<String, Object> getFormatAttr(Long productId, GenFormatAttrDTO genFormatAttrDTO, Long[] stores) {
         Map<String, Object> resultMap = new LinkedHashMap<>(3);
-        resultMap.put("attr", new ArrayList<>());
-        resultMap.put("value", new ArrayList<>());
-        resultMap.put("header", new ArrayList<>());
-
-        List<ProductArrtDTO> fromatDetailDTOList = productArr;
+        if (genFormatAttrDTO == null) {
+            resultMap.put("attr", new ArrayList<>());
+            resultMap.put("value", new ArrayList<>());
+            resultMap.put("header", new ArrayList<>());
+            return resultMap;
+        }
+        List<ProductArrtDTO> fromatDetailDTOList = genFormatAttrDTO.getAttrs();
         DetailVO detailDto = this.attrFormat(fromatDetailDTOList);
         List<Map<String, Object>> headerMapList = null;
         List<Map<String, Object>> valueMapList = new ArrayList<>();

fs-service/src/main/resources/mapper/sop/QwSopMapper.xml

@@ -421,7 +421,7 @@
 
     <select id="selectQwSopAllList" resultType="com.fs.sop.domain.QwSop">
 
-        SELECT DISTINCT qw_sop.id,qw_sop.name
+        SELECT DISTINCT qw_sop.id,qw_sop.name,qw_sop.create_time
         FROM sop_user_logs log
         RIGHT JOIN qw_sop ON log.sop_id = qw_sop.id
         <where>

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreProductScrmController.java

@@ -14,7 +14,7 @@ import com.fs.his.vo.OptionsVO;
 import com.fs.hisStore.domain.FsStoreProductAttrScrm;
 import com.fs.hisStore.domain.FsStoreProductRuleScrm;
 import com.fs.hisStore.domain.FsStoreProductScrm;
-import com.fs.hisStore.dto.ProductArrtDTO;
+import com.fs.hisStore.dto.GenFormatAttrDTO;
 import com.fs.hisStore.param.FsStoreProductAddEditParam;
 import com.fs.hisStore.service.IFsStoreProductAttrScrmService;
 import com.fs.hisStore.service.IFsStoreProductScrmService;
@@ -148,9 +148,9 @@ public TableDataInfo list(FsStoreProductListSParam fsStoreProduct)
 
     @ApiOperation(value = "生成属性")
     @PostMapping(value = "/genFormatAttr/{productId}")
-    public ResponseEntity genFormatAttr(@PathVariable Long productId, @RequestBody List<ProductArrtDTO> productArr){
+    public ResponseEntity genFormatAttr(@PathVariable Long productId, @RequestBody GenFormatAttrDTO payload){
 
-        return new ResponseEntity<>(fsStoreProductService.getFormatAttr(productId,productArr,null), HttpStatus.OK);
+        return new ResponseEntity<>(fsStoreProductService.getFormatAttr(productId,payload,null), HttpStatus.OK);
     }
     /**
      * 获取商品详细信息