专卡

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionItemMapper.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.qualityControl.mapper;
 import com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionItem;
 import com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionItemExample;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface BusinessQcQualityInspectionItemMapper {
@@ -27,4 +29,6 @@ public interface BusinessQcQualityInspectionItemMapper {
     int updateByPrimaryKeySelective(BusinessQcQualityInspectionItem record);
 
     int updateByPrimaryKey(BusinessQcQualityInspectionItem record);
+
+    List<Map<String,Object>> findByqualityId(String id);
 }

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionItemMapper.xml

@@ -182,7 +182,26 @@
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+    <select id="findByqualityId" parameterType="map" resultType="java.util.Map">
+      SELECT
+        itm.id,
+        itm.qc_quality_inspection_id qcQualityInspectionId,
+        itm.inspection_item_id inspectionItemId,
+        ee.enumname AS inspectionItemName,
+        itm.inspection_value inspectionValue
+
+      FROM
+        business_qc_quality_inspection_item itm
+          LEFT JOIN depot_qh.basic_enum ee ON ee.enumId = itm.inspection_item_id
+      where itm.qc_quality_inspection_id =14
+
+
+
+
+
+
+    </select>
+    <update id="updateByExampleSelective" parameterType="map" >
     update business_qc_quality_inspection_item
     <set >
       <if test="record.id != null" >

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -887,6 +887,7 @@
     select
       bqq.id,
       bqq.jylb,
+      bqq.zjbgdh,
       bqq.jysj,
       bqq.basic_storehouse_id,
       Bs.storehouse_name ,

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public class BusinessQcQualityInspection {
     private Integer id;
@@ -94,6 +95,15 @@ public class BusinessQcQualityInspection {
 
     // 子表数组
     private List<BusinessQcQualityInspectionItem> item;
+    private   Map<Integer, List<String>> maps;
+
+    public Map<Integer, List<String>> getMaps() {
+        return maps;
+    }
+
+    public void setMaps(Map<Integer, List<String>> maps) {
+        this.maps = maps;
+    }
 
     // 业务字段
     @ApiModelProperty(value = "库区名称")

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

@@ -467,6 +467,7 @@
   </select>
   <select id="selectByGrainsituationId"  resultMap="BaseResultMap1">
     SELECT
+      cc.out_quantity,cc.design_capacity,
       Bs.storehouse_name ,cc.basic_storehouse_id,bua.ajmc,cc.basic_unit_aisle_id,bw.warehouse_name,cc.warehouse_id,
       cc.storehouse_type,cflx.enumname as "storehouseTypeName",
       xz.enumname as "grainNatureName",cc.grain_nature_id,pz.enumname as "grainVarietyName",cc.grain_variety_id,
@@ -475,7 +476,7 @@
       cc.temperature_measure_type,
       tffs.enumname drafttypeName,
       cc.glfs,
-      ccfs.enumname keepingWayName,
+      cc. keeping_way,
       cc.in_financial_verification,
       cc.out_financial_verification,
       cc.excess_loss_quantity,
@@ -492,7 +493,7 @@
               LEFT JOIN depot_qh.basic_enum cd on cd.enumId = cc.grain_area_id
               LEFT JOIN depot_qh.basic_enum shnd on shnd.enumId = cc.shnd
               LEFT JOIN depot_qh.basic_enum tffs on xz.enumId = Bs.draftType
-              LEFT JOIN depot_qh.basic_enum ccfs on xz.enumId = Bs.keeping_way
+              LEFT JOIN depot_qh.basic_enum ccfs on xz.enumId = cc.keeping_way
               LEFT JOIN depot_qh.basic_enum cflx on xz.enumId = cc.storehouse_type
     where  cc.id=#{id}
   </select>

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

@@ -13,8 +13,10 @@
 package com.chinaitop.depot.storage.service.impl;
 
 
+import com.chinaitop.depot.qualityControl.mapper.BusinessQcQualityInspectionItemMapper;
 import com.chinaitop.depot.qualityControl.mapper.BusinessQcQualityInspectionMapper;
 import com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspection;
+import com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionItem;
 import com.chinaitop.depot.storage.mapper.GrainSituationCardMapper;
 import com.chinaitop.depot.storage.mapper.GrainSituationCardWarehouseRecordMapper;
 import com.chinaitop.depot.storage.model.GrainSituationCard;
@@ -31,10 +33,8 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 原粮转卡（粮情卡）Service接口实现类
@@ -46,6 +46,9 @@ import java.util.Map;
 public class GrainSituationCardServiceImpl implements GrainSituationCardService {
 
     @Resource
+    private BusinessQcQualityInspectionItemMapper businessQcQualityInspectionItemMapper;
+
+    @Resource
     private BusinessQcQualityInspectionMapper businessQcQualityInspectionMapper;
 
     @Resource
@@ -69,17 +72,48 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
                 grainSituationCardWarehouseRecordMapper.findByCardId(grainSituationCardIdParam);
         grainSituationCardVO.setGrainSituationCardWarehouseRecordList(grainSituationCardWarehouseRecordList);
-        String[] ids=grainSituationCardVO.getCheckRecordIds().split(",");
-        List<BusinessQcQualityInspection> businessQcQualityInspectionList =new ArrayList<>();
-        for (int i = 0; i < ids.length; i++) {
-            BusinessQcQualityInspection businessQcQualityInspection=  businessQcQualityInspectionMapper.findByqualityId(ids[i]);
-            businessQcQualityInspectionList.add(businessQcQualityInspection);
+        if(grainSituationCardVO.getCheckRecordIds()!=null){
+            String[] ids=grainSituationCardVO.getCheckRecordIds().split(",");
+            List<BusinessQcQualityInspection> businessQcQualityInspectionList =new ArrayList<>();
+            for (int i = 0; i < ids.length; i++) {
+                //查询导检验类型，建议时间。。
+                BusinessQcQualityInspection 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);
+            }
+            grainSituationCardVO.setBusinessQcQualityInspectionList(businessQcQualityInspectionList);
         }
-        grainSituationCardVO.setBusinessQcQualityInspectionList(businessQcQualityInspectionList);
 
-        return grainSituationCardMapper.selectByGrainsituationId(grainSituationCardIdParam);
+
+
+        return grainSituationCardVO;
     }
 
+    private Map<Integer, List<String>> cat(List<Map<String, Object>> itm) {
+        // 使用Stream API进行转换
+        // 使用Stream API进行转换
+        Map<Integer, List<String>> transformedData = itm.stream()
+                .collect(Collectors.groupingBy(
+                        item -> (Integer) item.get("qcQualityInspectionId"),
+                        Collectors.mapping(
+                                item -> (String) item.get("inspectionItemName") + ": " + (String) item.get("inspectionValue"),
+                                Collectors.toList()
+                        )
+                ));
+
+        // 打印转换后的数据结构，这里为了简化展示，只打印keySet
+        transformedData.forEach((id, inspections) ->
+                System.out.println("qcQualityInspectionId: " + id + ", Inspections: " + inspections)
+        );
+        return transformedData;
+    }
+
+
     @Override
     public List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(Integer warehouseId) {
         Map<String,Object> map = new HashMap<String,Object>();
@@ -107,13 +141,14 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         GrainSituationCardVO grainSituationCardVO =grainSituationCardMapper.selectByGrainsituationId(grainSituationCardIdParam);
         List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
                 grainSituationCardWarehouseRecordMapper.findByCardId(grainSituationCardIdParam);
-        String[] ids=grainSituationCardVO.getCheckRecordIds().split(",");
-        List<BusinessQcQualityInspection> businessQcQualityInspectionList =new ArrayList<>();
-        for (int i = 0; i < ids.length; i++) {
-            List<BusinessQcQualityInspection> bqqs=  businessQcQualityInspectionMapper.findByqualityId1(ids[i]);
-            businessQcQualityInspectionList.addAll(bqqs);
+        List<BusinessQcQualityInspection> businessQcQualityInspectionList = new ArrayList<>();
+        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);
+            }
         }
-
         String fileName = "D:\\Temp\\aaa.xlsx";
         List<GrainSituationCardVO> data=new ArrayList<>();
         data.add(grainSituationCardVO);