11

src/main/java/com/chinaitop/depot/qualityControl/model/BusinessQcQualityInspectionItem.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.qualityControl.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -14,11 +15,12 @@ public class BusinessQcQualityInspectionItem {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date updatedate;
-
+    @ApiModelProperty(value = "检验项目；basic_enum的id")
     private Integer qcQualityInspectionId;
 
     private Integer inspectionItemId;
 
+    @ApiModelProperty(value = "检验值")
     private String inspectionValue;
 
     private String singleConclusion;

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -42,6 +42,8 @@
     <result column="packaged_count" property="packagedCount" jdbcType="INTEGER" />
     <result column="average_weight" property="averageWeight" jdbcType="DECIMAL" />
     <result column="check_record_ids" property="checkRecordIds" jdbcType="VARCHAR" />
+    <result column="out_quantity" property="outQuantity" jdbcType="DECIMAL" />
+
   </resultMap>
 
   <resultMap id="BaseResultMap1" extends="BaseResultMap" type="com.chinaitop.depot.storage.model.vo.GrainSituationCardVO">

src/main/java/com/chinaitop/depot/storage/service/impl/GrainSituationCardServiceImpl.java

@@ -71,7 +71,9 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         GrainSituationCardVO grainSituationCardVO =grainSituationCardMapper.selectByGrainsituationId(grainSituationCardIdParam);
         List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
                 grainSituationCardWarehouseRecordMapper.findByCardId(grainSituationCardIdParam);
-        grainSituationCardVO.setGrainSituationCardWarehouseRecordList(grainSituationCardWarehouseRecordList);
+        if(grainSituationCardWarehouseRecordList!=null){
+            grainSituationCardVO.setGrainSituationCardWarehouseRecordList(grainSituationCardWarehouseRecordList);
+        }
         if(grainSituationCardVO.getCheckRecordIds()!=null){
             String[] ids=grainSituationCardVO.getCheckRecordIds().split(",");
             List<BusinessQcQualityInspection> businessQcQualityInspectionList =new ArrayList<>();
@@ -86,7 +88,10 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
                 businessQcQualityInspection.setMaps(transformedData);
                 businessQcQualityInspectionList.add(businessQcQualityInspection);
             }
-            grainSituationCardVO.setBusinessQcQualityInspectionList(businessQcQualityInspectionList);
+            if(businessQcQualityInspectionList!=null){
+                grainSituationCardVO.setBusinessQcQualityInspectionList(businessQcQualityInspectionList);
+            }
+
         }
 
 
@@ -118,7 +123,19 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
     public List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(Integer warehouseId) {
         Map<String,Object> map = new HashMap<String,Object>();
         map.put("warehouseId", warehouseId);
+        BusinessQcQualityInspection businessQcQualityInspection=new BusinessQcQualityInspection();
         List<BusinessQcQualityInspection> list =businessQcQualityInspectionMapper.getQualityInspectionFindByWarehouseId(map);
+        for (BusinessQcQualityInspection b:list) {
+            //查询质检明细
+            List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(businessQcQualityInspection.getId()+"");
+            Map<Integer, List<String>> transformedData =    cat(itm);
+
+
+            businessQcQualityInspection.setMaps(transformedData);
+
+        }
+        list.add(businessQcQualityInspection);
+
         return list;
     }
 
@@ -142,11 +159,20 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
                 grainSituationCardWarehouseRecordMapper.findByCardId(grainSituationCardIdParam);
         List<BusinessQcQualityInspection> businessQcQualityInspectionList = new ArrayList<>();
+        List<BusinessQcQualityInspection> bqqs =new ArrayList<>();
+        BusinessQcQualityInspection businessQcQualityInspection=new BusinessQcQualityInspection();
         if(grainSituationCardVO.getCheckRecordIds()!=null) {
             String[] ids = grainSituationCardVO.getCheckRecordIds().split(",");
             for (int i = 0; i < ids.length; i++) {
-                List<BusinessQcQualityInspection> bqqs = businessQcQualityInspectionMapper.findByqualityId1(ids[i]);
-                businessQcQualityInspectionList.addAll(bqqs);
+                //查询导检验类型，建议时间。。
+                businessQcQualityInspection=  businessQcQualityInspectionMapper.findByqualityId(ids[i]);
+                //查询质检明细
+                List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(ids[i]);
+                Map<Integer, List<String>> transformedData =    cat(itm);
+
+
+                businessQcQualityInspection.setMaps(transformedData);
+                businessQcQualityInspectionList.add(businessQcQualityInspection);
             }
         }
         String fileName = "D:\\Temp\\aaa.xlsx";

src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ server:
     uri-encoding: utf-8
 spring:
   application:
-    name: depot-qualitycheck
+    name: depot-qualitycheck  -li
   profiles:
     active: dev
 mybatis: