质检报告

src/main/java/com/chinaitop/depot/rp/controller/BusinessRpReportController.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.rp.controller;
 
 
 import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.rp.model.BusinessQcQualityInspection;
 import com.chinaitop.depot.rp.model.BusinessRpBiweeklyReport;
 import com.chinaitop.depot.rp.model.BusinessRpReport;
 import com.chinaitop.depot.rp.model.vo.BusinessRpOutboundVO;
@@ -160,9 +161,49 @@ public class BusinessRpReportController {
      */
     @RequestMapping(value="/getRpReportFindByById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
     @ApiOperation(value="新增时得到轮换计划详情", notes = "新增时得到轮换计划详情")
-    public BusinessRpReportVO getRpReportDetailsByAdd(Integer rpReportId) throws Exception {
+    public BusinessRpReportRecVO getRpReportDetailsByAdd(String rpReportId) throws Exception {
 
-        BusinessRpReportVO list = businessRpReportService.getRpReportFindByById(rpReportId);
+        BusinessRpReportRecVO list = businessRpReportService.getRpReportFindByById(rpReportId);
+        return list;
+    }
+
+    /**
+     * 查询质检报告
+     * @return
+     * @throws Exception
+     */
+//    @RequestMapping(value="/getQualityInspectionFindById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+//    @ApiOperation(value="新增时得到查询质检报告", notes = "新增时得到查询质检报告")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "rpReportId", value = "轮换计划上报id", paramType = "form"),
+//            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "form"),
+//            @ApiImplicitParam(name = "jylb", value = "检验类别", paramType = "form"),
+//            @ApiImplicitParam(name = "inspectionReportId", value = "质检报告id", paramType = "form")
+//
+//
+//    })
+//    public List<BusinessQcQualityInspection> getRpReportDetailsByAdd(String rpReportId, Integer warehouseId, String jylb,Integer inspectionReportId) throws Exception {
+//
+//        List<BusinessQcQualityInspection> list = businessRpReportService.getQualityInspectionFindById(rpReportId,warehouseId,jylb,inspectionReportId);
+//        return list;
+//    }
+
+    /**
+     * 根据货位查询粮情卡质检报告
+     * @return
+     * @throws
+     */
+    @RequestMapping(value="/getQualityInspectionFindByWarehouseId",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="根据货位查询粮情卡质检报告", notes = "根据货位查询粮情卡质检报告")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "jylb", value = "检验类别", paramType = "form"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "form")
+
+
+    })
+    public List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(String jylb,Integer warehouseId) throws Exception {
+
+        List<BusinessQcQualityInspection> list = businessRpReportService.getQualityInspectionFindByWarehouseId(jylb,warehouseId);
         return list;
     }
 

src/main/java/com/chinaitop/depot/rp/mapper/BusinessQcQualityInspectionMapper.java

@@ -27,4 +27,8 @@ public interface BusinessQcQualityInspectionMapper {
     int updateByPrimaryKeySelective(BusinessQcQualityInspection record);
 
     int updateByPrimaryKey(BusinessQcQualityInspection record);
+
+    List<BusinessQcQualityInspection> getQualityInspectionFindById(@Param("rpReportId")String rpReportId,@Param("warehouseId") Integer warehouseId,@Param("jylb") String jylb,@Param("inspectionReportId")Integer inspectionReportId);
+
+    List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(String jylb, Integer warehouseId);
 }

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

@@ -41,6 +41,13 @@
     <result column="sample_package_model" property="samplePackageModel" jdbcType="VARCHAR" />
     <result column="bz" property="bz" jdbcType="VARCHAR" />
   </resultMap>
+
+
+  <resultMap id="BaseResultMap1" extends="BaseResultMap" type="com.chinaitop.depot.rp.model.vo.BusinessQcQualityInspectionVO">
+    <result column="grainVarietyName" property="grainVarietyName" jdbcType="VARCHAR" />
+
+
+  </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -106,6 +113,42 @@
     zbjgpd, qysj, qydbh, qyrxm, qyqy, jdrxm, ypbh, ypsl, dbsl, ypdj, sample_status, sample_package_model, 
     bz
   </sql>
+  <select id="getQualityInspectionFindById"  resultMap="BaseResultMap1"  >
+    SELECT
+      bqqi.id,
+      bqqi.zjbgdh,-- 委托书编号
+      bqqi.warehouse_id,--  货位 id
+      bqqi.jysj,              -- 检验时间
+      bqqi.basic_storehouse_id,-- 仓房id
+      bqqi.grain_variety_id,  -- 粮食品种id
+      be1.enumName grainVarietyName,   -- 粮食品种名称
+      bqqi.check_result   -- 是否合格
+    FROM
+      business_qc_quality_inspection bqqi
+        LEFT JOIN basic_enum be1 ON bqqi.grain_variety_id = be1.enumId
+      bqqi.id=#{inspectionReportId}
+  </select>
+
+  <select id="getQualityInspectionFindByWarehouseId"  resultMap="BaseResultMap1"  >
+    SELECT
+      bqqi.id,
+      bqqi.zjbgdh,-- 委托书编号
+      bqqi.warehouse_id,--  货位 id
+      bqqi.jysj,              -- 检验时间
+      bqqi.basic_storehouse_id,-- 仓房id
+      bqqi.grain_variety_id,  -- 粮食品种id
+      be1.enumName grainVarietyName,   -- 粮食品种名称
+      bqqi.check_result   -- 是否合格
+    FROM
+      business_qc_quality_inspection bqqi
+        LEFT JOIN basic_enum be1 ON bqqi.grain_variety_id = be1.enumId
+      where bqqi.warehouse_id=#{warehouseId}
+  </select>
+
+
+
+
+
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.rp.model.BusinessQcQualityInspectionExample" >
     select
     <if test="distinct" >

src/main/java/com/chinaitop/depot/rp/model/vo/BusinessQcQualityInspectionVO.java

@@ -0,0 +1,15 @@
+package com.chinaitop.depot.rp.model.vo;
+
+import com.chinaitop.depot.rp.model.BusinessQcQualityInspection;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BusinessQcQualityInspectionVO extends BusinessQcQualityInspection {
+
+
+    private String grainVarietyName;
+
+
+}

src/main/java/com/chinaitop/depot/rp/service/BusinessRpReportService.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.rp.service;
 
 import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.rp.model.BusinessQcQualityInspection;
 import com.chinaitop.depot.rp.model.BusinessRpReport;
 import com.chinaitop.depot.rp.model.vo.BusinessRpOutboundVO;
 import com.chinaitop.depot.rp.model.vo.BusinessRpReportRecVO;
@@ -31,7 +32,7 @@ public interface BusinessRpReportService  {
 
    List<BusinessRpOutboundVO> findByWareHouseInfo(Integer basicStorehouseId);
 
-    BusinessRpReportVO getRpReportFindByById(Integer rpReportId);
+    BusinessRpReportRecVO getRpReportFindByById(String rpReportId);
 
     Map<String, Object> add(BusinessRpReport businessRpReport);
 
@@ -58,4 +59,9 @@ public interface BusinessRpReportService  {
      * @return
      */
     BusinessRpReportRecVO getRpReportRecDetail(String rpReportId, String orgId);
+
+
+    List<BusinessQcQualityInspection> getQualityInspectionFindById(String rpReportId, Integer warehouseId, String jylb,Integer inspectionReportId);
+
+    List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(String jylb,Integer warehouseId);
 }

src/main/java/com/chinaitop/depot/rp/service/impl/BusinessRpReportServiceImpl.java

@@ -62,13 +62,8 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
 
 
         return businessRpOutboundService.getOutband(warehouseId);
-    }  //查询库区数据
-//    @Override
-//    public BusinessRpOutboundVO findByfindByQualityCheckInfo(Integer warehouseId) {
-//
-//
-//        return businessRpOutboundService.findByfindByQualityCheckInfo(warehouseId);
-//    }
+    }
+
 
     @Override
     public List<OrgInfo> findByOrgInfo(Integer orgId, String unitInfoId) {
@@ -92,22 +87,19 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
     }
 
     @Override
-    public BusinessRpReportVO getRpReportFindByById(Integer rpReportId) {
-        BusinessRpReportVO businessRpReportVO =businessRpReportMapper.getRpReportFindByById(rpReportId);
-        if(businessRpReportVO.getRegularInspectionReportIds()!=null){
-            if(businessRpReportVO.getRegularInspectionReportIds().contains(",")){
-                String[] s = businessRpReportVO.getRegularInspectionReportIds().split(",");
-                for (String id: s) {
-                    //查询定检报告check_record_ids
-                    //businessRpReportVO.setBusinessRpInboundList("质检对象");
-                }
-            }
-            //查询出库质检报告
+    public BusinessRpReportRecVO getRpReportFindByById(String rpReportId) {
+       // BusinessRpReportVO businessRpReportVO =businessRpReportMapper.getRpReportFindByById(rpReportId);
 
-        }
+        BusinessRpReportRecVO businessRpReportRecVO =businessRpReportMapper.getRpReportByById(rpReportId,null);
 
+        List<BusinessRpOutbound> outboundList = businessRpOutboundMapper.findByRpReportId(rpReportId,null);
+        businessRpReportRecVO.setBusinessRpOutboundList(outboundList);
 
-        return businessRpReportVO;
+        List<BusinessRpInbound> inboundList = businessRpInboundMapper.findByRpReportId(rpReportId,null);
+        businessRpReportRecVO.setBusinessRpInboundList(inboundList);
+
+
+        return businessRpReportRecVO;
     }
 
     @Override
@@ -233,4 +225,22 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
 
         return businessRpReportRecVO;
     }
+    //获取出库质检报告
+    @Override
+    public List<BusinessQcQualityInspection> getQualityInspectionFindById(String rpReportId, Integer warehouseId, String jylb,Integer inspectionReportId) {
+        List<BusinessQcQualityInspection> bQQList =new ArrayList<>();
+            bQQList=  businessQcQualityInspectionMapper.getQualityInspectionFindById(rpReportId,warehouseId,jylb,inspectionReportId);
+
+        return null;
+    }
+
+    @Override
+    public List<BusinessQcQualityInspection> getQualityInspectionFindByWarehouseId(String jylb,Integer warehouseId) {
+
+
+        List<BusinessQcQualityInspection> list =businessQcQualityInspectionMapper.getQualityInspectionFindByWarehouseId(jylb,warehouseId);
+        return list;
+    }
+
+
 }