质检给市平台推送数据的接口，并且把该表的关键字字段改为非关键字

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
@@ -11,6 +12,7 @@ import com.chinaitop.depot.storage.service.StorageQualitycheckService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
 import com.chinaitop.depot.storage.utils.DataSynchronization;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
+import com.chinaitop.depot.utils.HttpUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -20,6 +22,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -46,7 +49,9 @@ public class StorageQualitycheckController {
 
     @Resource
     private StorageQualitycheckSonService qualitycheckSonService;
-
+    // 获取ip地址
+    @Value("${reportForSPT-Url}")
+    private String reportPath;
     /**
      * 封仓管理中查询出未封 仓的质量管理信息，已经封仓的不要展示
      * 分页获取
@@ -179,6 +184,20 @@ public class StorageQualitycheckController {
         try {
             StorageQualitycheck qualitycheck = (StorageQualitycheck)mapper.readValue(qualitycheckJson, StorageQualitycheck.class);
             storageQualitycheckService.save(qualitycheck,qualitycheckInspectionJson);
+
+
+            try {
+                //自检或出库 保存或修改数据 把数据推给市平台
+                Map<String, Object> dataMap = storageQualitycheckService.getcheckByIds(qualitycheck.getId());
+                String url = reportPath+"/api/kjjg/zjbg/receiveData";//市级接口
+                String strResult = HttpUtil.doPost(url, JSON.toJSONString(dataMap));
+            }catch (IOException e) {
+                e.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                modelMap.put("status", "success");
+            }
             modelMap.put("status", "success");
         } catch (IOException e) {
             modelMap.put("status", "error");

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

@@ -70,6 +70,8 @@
     <result column="input_two" property="inputTwo" jdbcType="VARCHAR" />
     <result column="input_three" property="inputThree" jdbcType="VARCHAR" />
     <result column="input_four" property="inputFour" jdbcType="VARCHAR" />
+    <result column="sieve_residue" property="sieveResidue" jdbcType="VARCHAR" />
+    <result column="rice_yield" property="riceYield" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -143,7 +145,7 @@
     avg_length, rice_grains, brokenRice_total, brokenRice_big, brokenRice_small, machiningAccuracy, 
     chalkiness, machiningAccuracy_essence, machiningAccuracy_suitable, amylose, ash_content, 
     coarseness, gluten, silt_content, magnetic_metal, input_one, input_two, input_three, 
-    input_four
+    input_four,sieve_residue,rice_yield
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" >
     select
@@ -200,7 +202,8 @@
       machiningAccuracy_suitable, amylose, ash_content, 
       coarseness, gluten, silt_content, 
       magnetic_metal, input_one, input_two, 
-      input_three, input_four)
+      input_three, input_four,
+      sieve_residue,rice_yield)
     values (#{id,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{unitWeight,jdbcType=VARCHAR}, 
       #{impurityTotal,jdbcType=VARCHAR}, #{impurityInorganic,jdbcType=VARCHAR}, #{impurityOrganic,jdbcType=VARCHAR}, 
       #{impurityBranPowder,jdbcType=VARCHAR}, #{imperfectgrainsTotal,jdbcType=VARCHAR}, 
@@ -225,7 +228,8 @@
       #{machiningaccuracySuitable,jdbcType=VARCHAR}, #{amylose,jdbcType=VARCHAR}, #{ashContent,jdbcType=VARCHAR}, 
       #{coarseness,jdbcType=VARCHAR}, #{gluten,jdbcType=VARCHAR}, #{siltContent,jdbcType=VARCHAR}, 
       #{magneticMetal,jdbcType=VARCHAR}, #{inputOne,jdbcType=VARCHAR}, #{inputTwo,jdbcType=VARCHAR}, 
-      #{inputThree,jdbcType=VARCHAR}, #{inputFour,jdbcType=VARCHAR})
+      #{inputThree,jdbcType=VARCHAR}, #{inputFour,jdbcType=VARCHAR},
+      #{sieveResidue,jdbcType=VARCHAR}, #{riceYield,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspection" >
     insert into storage_qualitycheck_inspection
@@ -432,6 +436,12 @@
       <if test="inputFour != null" >
         input_four,
       </if>
+      <if test="sieveResidue != null" >
+        sieve_residue,
+      </if>
+      <if test="riceYield != null" >
+        rice_yield,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_QUALITYCHECK_INSPECTION.nextVal,
@@ -636,6 +646,12 @@
       <if test="inputFour != null" >
         #{inputFour,jdbcType=VARCHAR},
       </if>
+      <if test="sieveResidue != null" >
+        #{sieveResidue,jdbcType=VARCHAR},
+      </if>
+      <if test="riceYield != null" >
+        #{riceYield,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" resultType="java.lang.Integer" >
@@ -851,6 +867,12 @@
       <if test="record.inputFour != null" >
         input_four = #{record.inputFour,jdbcType=VARCHAR},
       </if>
+      <if test="record.sieveResidue != null" >
+        sieve_residue = #{record.sieveResidue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.riceYield != null" >
+        rice_yield = #{record.riceYield,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -925,7 +947,9 @@
       input_one = #{record.inputOne,jdbcType=VARCHAR},
       input_two = #{record.inputTwo,jdbcType=VARCHAR},
       input_three = #{record.inputThree,jdbcType=VARCHAR},
-      input_four = #{record.inputFour,jdbcType=VARCHAR}
+      input_four = #{record.inputFour,jdbcType=VARCHAR},
+      sieve_residue = #{record.sieveResidue,jdbcType=VARCHAR},
+      rice_yield = #{record.riceYield,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1132,6 +1156,12 @@
       <if test="inputFour != null" >
         input_four = #{inputFour,jdbcType=VARCHAR},
       </if>
+      <if test="sieveResidue != null" >
+        sieve_residue = #{sieveResidue,jdbcType=VARCHAR},
+      </if>
+      <if test="riceYield != null" >
+        rice_yield = #{riceYield,jdbcType=VARCHAR},
+      </if>
     </set>
     where qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER}
   </update>
@@ -1203,7 +1233,9 @@
       input_one = #{inputOne,jdbcType=VARCHAR},
       input_two = #{inputTwo,jdbcType=VARCHAR},
       input_three = #{inputThree,jdbcType=VARCHAR},
-      input_four = #{inputFour,jdbcType=VARCHAR}
+      input_four = #{inputFour,jdbcType=VARCHAR},
+      sieve_residue = #{sieveResidue,jdbcType=VARCHAR},
+      rice_yield = #{riceYield,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.java

@@ -59,4 +59,6 @@ public interface StorageQualitycheckMapper {
     List<Map<String, Object>> getAllQualityInfo(Map<String, Object> paramMap);
 
     List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap);
+
+    Map<String, Object> getcheckById(Integer id);
 }

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

@@ -6,13 +6,13 @@
     <result column="depot_id" property="depotId" jdbcType="INTEGER" />
     <result column="house_id" property="houseId" jdbcType="INTEGER" />
     <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
-    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="type_update" property="typeUpdate" jdbcType="VARCHAR" />
     <result column="sub_type" property="subType" jdbcType="INTEGER" />
     <result column="sub_type_detailed" property="subTypeDetailed" jdbcType="INTEGER" />
     <result column="check_time" property="checkTime" jdbcType="TIMESTAMP" />
     <result column="check_result" property="checkResult" jdbcType="VARCHAR" />
     <result column="checker" property="checker" jdbcType="VARCHAR" />
-    <result column="level" property="level" jdbcType="INTEGER" />
+    <result column="level_update" property="levelUpdate" jdbcType="INTEGER" />
     <result column="capacity" property="capacity" jdbcType="VARCHAR" />
     <result column="water" property="water" jdbcType="VARCHAR" />
     <result column="impurity" property="impurity" jdbcType="VARCHAR" />
@@ -37,7 +37,7 @@
     <result column="is_firstchecklevel_right" property="isFirstchecklevelRight" jdbcType="VARCHAR" />
     <result column="accept_unite" property="acceptUnite" jdbcType="VARCHAR" />
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
-    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="number_update" property="numberUpdate" jdbcType="VARCHAR" />
     <result column="location" property="location" jdbcType="INTEGER" />
     <result column="keeper" property="keeper" jdbcType="VARCHAR" />
     <result column="harvest_time" property="harvestTime" jdbcType="INTEGER" />
@@ -165,12 +165,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, depot_id, house_id, warehouse_id, type, sub_type, sub_type_detailed, check_time, 
-    check_result, checker, level, capacity, water, impurity, mineral, badpart, colorsmell, 
+    id, depot_id, house_id, warehouse_id, type_update, sub_type, sub_type_detailed, check_time,
+    check_result, checker, level_update, capacity, water, impurity, mineral, badpart, colorsmell,
     keeper_advices, keeper_advices_time, keeper_advices_paint, chief_advices, chief_advices_time, 
     chiet_advices_paint, vice_manager_advices, vice_manager_advices_time, vice_manager_advices_paint, 
     manager_advices, manager_advices_time, manager_advices_paint, improve_result, improve_time, 
-    improve_paint, is_firstchecklevel_right, accept_unite, input_time, number, location, 
+    improve_paint, is_firstchecklevel_right, accept_unite, input_time, number_update, location,
     keeper, harvest_time, goodpart, chooser, choose_organ, choose_time, boldfat_index, 
     check_type, hot_damage, protein_solution_ratio, eat_score, fat_index, husked_ration, 
     full_good_ration, yellow_part, out_husked_ration, pests, color_ratio, hard_index, 
@@ -215,9 +215,9 @@
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
     insert into storage_qualitycheck (id, depot_id, house_id, 
-      warehouse_id, type, sub_type, 
+      warehouse_id, type_update, sub_type,
       sub_type_detailed, check_time, check_result, 
-      checker, level, capacity, 
+      checker, level_update, capacity,
       water, impurity, mineral, 
       badpart, colorsmell, keeper_advices, 
       keeper_advices_time, keeper_advices_paint, 
@@ -227,7 +227,7 @@
       manager_advices_time, manager_advices_paint, 
       improve_result, improve_time, improve_paint, 
       is_firstchecklevel_right, accept_unite, input_time, 
-      number, location, keeper, 
+      number_update, location, keeper,
       harvest_time, goodpart, chooser, 
       choose_organ, choose_time, boldfat_index, 
       check_type, hot_damage, protein_solution_ratio, 
@@ -248,9 +248,9 @@
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
       quailtycard_id, butyl_phenol, flag_type)
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
-      #{warehouseId,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, 
+      #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
-      #{checker,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER}, #{capacity,jdbcType=VARCHAR}, 
+      #{checker,jdbcType=VARCHAR}, #{levelUpdate,jdbcType=INTEGER}, #{capacity,jdbcType=VARCHAR},
       #{water,jdbcType=VARCHAR}, #{impurity,jdbcType=VARCHAR}, #{mineral,jdbcType=VARCHAR}, 
       #{badpart,jdbcType=VARCHAR}, #{colorsmell,jdbcType=VARCHAR}, #{keeperAdvices,jdbcType=VARCHAR}, 
       #{keeperAdvicesTime,jdbcType=VARCHAR}, #{keeperAdvicesPaint,jdbcType=VARCHAR}, 
@@ -260,7 +260,7 @@
       #{managerAdvicesTime,jdbcType=TIMESTAMP}, #{managerAdvicesPaint,jdbcType=VARCHAR}, 
       #{improveResult,jdbcType=VARCHAR}, #{improveTime,jdbcType=TIMESTAMP}, #{improvePaint,jdbcType=VARCHAR}, 
       #{isFirstchecklevelRight,jdbcType=VARCHAR}, #{acceptUnite,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=VARCHAR}, #{location,jdbcType=INTEGER}, #{keeper,jdbcType=VARCHAR}, 
+      #{numberUpdate,jdbcType=VARCHAR}, #{location,jdbcType=INTEGER}, #{keeper,jdbcType=VARCHAR},
       #{harvestTime,jdbcType=INTEGER}, #{goodpart,jdbcType=VARCHAR}, #{chooser,jdbcType=VARCHAR}, 
       #{chooseOrgan,jdbcType=VARCHAR}, #{chooseTime,jdbcType=TIMESTAMP}, #{boldfatIndex,jdbcType=VARCHAR}, 
       #{checkType,jdbcType=VARCHAR}, #{hotDamage,jdbcType=VARCHAR}, #{proteinSolutionRatio,jdbcType=VARCHAR}, 
@@ -297,8 +297,8 @@
       <if test="warehouseId != null" >
         warehouse_id,
       </if>
-      <if test="type != null" >
-        type,
+      <if test="typeUpdate != null" >
+        type_update,
       </if>
       <if test="subType != null" >
         sub_type,
@@ -315,8 +315,8 @@
       <if test="checker != null" >
         checker,
       </if>
-      <if test="level != null" >
-        level,
+      <if test="levelUpdate != null" >
+        level_update,
       </if>
       <if test="capacity != null" >
         capacity,
@@ -390,8 +390,8 @@
       <if test="inputTime != null" >
         input_time,
       </if>
-      <if test="number != null" >
-        number,
+      <if test="numberUpdate != null" >
+        number_update,
       </if>
       <if test="location != null" >
         location,
@@ -599,8 +599,8 @@
       <if test="warehouseId != null" >
         #{warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="type != null" >
-        #{type,jdbcType=VARCHAR},
+      <if test="typeUpdate != null" >
+        #{typeUpdate,jdbcType=VARCHAR},
       </if>
       <if test="subType != null" >
         #{subType,jdbcType=INTEGER},
@@ -617,8 +617,8 @@
       <if test="checker != null" >
         #{checker,jdbcType=VARCHAR},
       </if>
-      <if test="level != null" >
-        #{level,jdbcType=INTEGER},
+      <if test="levelUpdate != null" >
+        #{levelUpdate,jdbcType=INTEGER},
       </if>
       <if test="capacity != null" >
         #{capacity,jdbcType=VARCHAR},
@@ -692,8 +692,8 @@
       <if test="inputTime != null" >
         #{inputTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="number != null" >
-        #{number,jdbcType=VARCHAR},
+      <if test="numberUpdate != null" >
+        #{numberUpdate,jdbcType=VARCHAR},
       </if>
       <if test="location != null" >
         #{location,jdbcType=INTEGER},
@@ -910,8 +910,8 @@
       <if test="record.warehouseId != null" >
         warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="record.type != null" >
-        type = #{record.type,jdbcType=VARCHAR},
+      <if test="record.typeUpdate != null" >
+        type_update = #{record.typeUpdate,jdbcType=VARCHAR},
       </if>
       <if test="record.subType != null" >
         sub_type = #{record.subType,jdbcType=INTEGER},
@@ -928,8 +928,8 @@
       <if test="record.checker != null" >
         checker = #{record.checker,jdbcType=VARCHAR},
       </if>
-      <if test="record.level != null" >
-        level = #{record.level,jdbcType=INTEGER},
+      <if test="record.levelUpdate != null" >
+        level_update = #{record.levelUpdate,jdbcType=INTEGER},
       </if>
       <if test="record.capacity != null" >
         capacity = #{record.capacity,jdbcType=VARCHAR},
@@ -1003,8 +1003,8 @@
       <if test="record.inputTime != null" >
         input_time = #{record.inputTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.number != null" >
-        number = #{record.number,jdbcType=VARCHAR},
+      <if test="record.numberUpdate != null" >
+        number_update = #{record.numberUpdate,jdbcType=VARCHAR},
       </if>
       <if test="record.location != null" >
         location = #{record.location,jdbcType=INTEGER},
@@ -1210,13 +1210,13 @@
       depot_id = #{record.depotId,jdbcType=INTEGER},
       house_id = #{record.houseId,jdbcType=INTEGER},
       warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
-      type = #{record.type,jdbcType=VARCHAR},
+      type_update = #{record.typeUpdate,jdbcType=VARCHAR},
       sub_type = #{record.subType,jdbcType=INTEGER},
       sub_type_detailed = #{record.subTypeDetailed,jdbcType=INTEGER},
       check_time = #{record.checkTime,jdbcType=TIMESTAMP},
       check_result = #{record.checkResult,jdbcType=VARCHAR},
       checker = #{record.checker,jdbcType=VARCHAR},
-      level = #{record.level,jdbcType=INTEGER},
+      level_update = #{record.levelUpdate,jdbcType=INTEGER},
       capacity = #{record.capacity,jdbcType=VARCHAR},
       water = #{record.water,jdbcType=VARCHAR},
       impurity = #{record.impurity,jdbcType=VARCHAR},
@@ -1241,7 +1241,7 @@
       is_firstchecklevel_right = #{record.isFirstchecklevelRight,jdbcType=VARCHAR},
       accept_unite = #{record.acceptUnite,jdbcType=VARCHAR},
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
-      number = #{record.number,jdbcType=VARCHAR},
+      number_update = #{record.numberUpdate,jdbcType=VARCHAR},
       location = #{record.location,jdbcType=INTEGER},
       keeper = #{record.keeper,jdbcType=VARCHAR},
       harvest_time = #{record.harvestTime,jdbcType=INTEGER},
@@ -1322,8 +1322,8 @@
       <if test="warehouseId != null" >
         warehouse_id = #{warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="type != null" >
-        type = #{type,jdbcType=VARCHAR},
+      <if test="typeUpdate != null" >
+        type_update = #{typeUpdate,jdbcType=VARCHAR},
       </if>
       <if test="subType != null" >
         sub_type = #{subType,jdbcType=INTEGER},
@@ -1340,8 +1340,8 @@
       <if test="checker != null" >
         checker = #{checker,jdbcType=VARCHAR},
       </if>
-      <if test="level != null" >
-        level = #{level,jdbcType=INTEGER},
+      <if test="levelUpdate != null" >
+        level_update = #{level,jdbcType=INTEGER},
       </if>
       <if test="capacity != null" >
         capacity = #{capacity,jdbcType=VARCHAR},
@@ -1415,8 +1415,8 @@
       <if test="inputTime != null" >
         input_time = #{inputTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="number != null" >
-        number = #{number,jdbcType=VARCHAR},
+      <if test="numberUpdate != null" >
+        number_update = #{numberUpdate,jdbcType=VARCHAR},
       </if>
       <if test="location != null" >
         location = #{location,jdbcType=INTEGER},
@@ -1619,13 +1619,13 @@
     set depot_id = #{depotId,jdbcType=INTEGER},
       house_id = #{houseId,jdbcType=INTEGER},
       warehouse_id = #{warehouseId,jdbcType=INTEGER},
-      type = #{type,jdbcType=VARCHAR},
+      type_update = #{typeUpdate,jdbcType=VARCHAR},
       sub_type = #{subType,jdbcType=INTEGER},
       sub_type_detailed = #{subTypeDetailed,jdbcType=INTEGER},
       check_time = #{checkTime,jdbcType=TIMESTAMP},
       check_result = #{checkResult,jdbcType=VARCHAR},
       checker = #{checker,jdbcType=VARCHAR},
-      level = #{level,jdbcType=INTEGER},
+      level_update = #{levelUpdate,jdbcType=INTEGER},
       capacity = #{capacity,jdbcType=VARCHAR},
       water = #{water,jdbcType=VARCHAR},
       impurity = #{impurity,jdbcType=VARCHAR},
@@ -1650,7 +1650,7 @@
       is_firstchecklevel_right = #{isFirstchecklevelRight,jdbcType=VARCHAR},
       accept_unite = #{acceptUnite,jdbcType=VARCHAR},
       input_time = #{inputTime,jdbcType=TIMESTAMP},
-      number = #{number,jdbcType=VARCHAR},
+      number_update = #{numberUpdate,jdbcType=VARCHAR},
       location = #{location,jdbcType=INTEGER},
       keeper = #{keeper,jdbcType=VARCHAR},
       harvest_time = #{harvestTime,jdbcType=INTEGER},
@@ -1724,15 +1724,15 @@
     row_number() over(partition by house_id order by id desc) rn,
     id,
     house_id,
-    LEVEL level,
+    level_update levelUpdate,
     sub_type_detailed
     FROM
     storage_qualitycheck
     WHERE
-    type = 5
+    type_update = 5
     )a where rn = 1
-    <if test="level != null">
-      AND level = #{level}
+    <if test="levelUpdate != null">
+      AND level_update = #{levelUpdate}
     </if>
     <if test="subTypeDetailed != null">
       AND sub_type_detailed = #{subTypeDetailed}
@@ -1745,18 +1745,18 @@
     row_number() over(partition by house_id order by id desc) rn,
     id,
     warehouse_id,
-    LEVEL,
+    levelUpdate,
     sub_type_detailed
     FROM
     storage_qualitycheck
     WHERE
-    type = 5
+    type_update = 5
     <if test="houseId != null">
       AND house_id = #{houseId, jdbcType=VARCHAR}
     </if>
     )a where rn = 1
-    <if test="level != null">
-      AND a.level = #{level}
+    <if test="levelUpdate != null">
+      AND a.level_update = #{levelUpdate}
     </if>
     <if test="subTypeDetailed != null">
       AND a.sub_type_detailed = #{subTypeDetailed}
@@ -1777,7 +1777,7 @@
     WHERE
     sfs.foodbasicinfo_id =#{id}
     )
-    and sqk.type = '5'
+    and sqk.type_update = '5'
     and sqk.house_id =#{houseId}
     and sqk.warehouse_id = #{warehouseId}
 
@@ -1798,12 +1798,12 @@
 
 
   <sql id="ExtBase_Column_List">
-    sqk.id, sqk.depot_id, sqk.house_id, sqk.warehouse_id, sqk.type, sqk.sub_type, sqk.sub_type_detailed, sqk.check_time, sqk.check_result,
-    sqk.checker, sqk.level, sqk.capacity, sqk.water, sqk.impurity, sqk.mineral, sqk.badpart, sqk.colorsmell,
+    sqk.id, sqk.depot_id, sqk.house_id, sqk.warehouse_id, sqk.type_update, sqk.sub_type, sqk.sub_type_detailed, sqk.check_time, sqk.check_result,
+    sqk.checker, sqk.level_update, sqk.capacity, sqk.water, sqk.impurity, sqk.mineral, sqk.badpart, sqk.colorsmell,
     sqk.keeper_advices, sqk.keeper_advices_time, sqk.keeper_advices_paint, sqk.chief_advices, sqk.chief_advices_time,
     sqk.chiet_advices_paint, sqk.vice_manager_advices, sqk.vice_manager_advices_time, sqk.vice_manager_advices_paint,
     sqk.manager_advices, sqk.manager_advices_time, sqk.manager_advices_paint, sqk.improve_result, sqk.improve_time,
-    sqk.improve_paint, sqk.is_firstchecklevel_right, sqk.accept_unite, sqk.input_time, sqk.number, sqk.location,
+    sqk.improve_paint, sqk.is_firstchecklevel_right, sqk.accept_unite, sqk.input_time, sqk.number_update, sqk.location,
     sqk.keeper, sqk.harvest_time, sqk.goodpart, sqk.chooser, sqk.choose_organ, sqk.choose_time, sqk.boldfat_index,
     sqk.check_type, sqk.hot_damage, sqk.protein_solution_ratio, sqk.eat_score, sqk.fat_index, sqk.husked_ration,
     sqk.full_good_ration, sqk.yellow_part, sqk.out_husked_ration, sqk.pests, sqk.color_ratio, sqk.hard_index,
@@ -1847,7 +1847,7 @@
         and sq.warehouse_id = #{warehouseId}
       </if>
       <if test="typeList != null and typeList.size() > 0">
-        and sq.type in
+        and sq.type_update in
         <foreach close=")" collection="typeList" item="typeList" open="(" separator=",">
           #{typeList}
         </foreach>
@@ -1855,8 +1855,8 @@
       <if test="subTypeDetailed !=null">
         and sq.sub_type_detailed = #{subTypeDetailed}
       </if>
-      <if test="level !=null">
-        and sq.level = #{level}
+      <if test="levelUpdate !=null">
+        and sq.level_update = #{levelUpdate}
       </if>
       <if test="historyStatus !=null">
         and sq.history_status = #{historyStatus}
@@ -1884,16 +1884,16 @@
     <include refid="Base_Column_List" />
     from storage_qualitycheck
     where
-    type=5 and history_status=0 and store_quality=1 and org_id =#{orgId} ;
+    type_update=5 and history_status=0 and store_quality=1 and org_id =#{orgId} ;
   </select>
 
 
   <select id="getTrdStoreQualityList" resultType="java.util.Map">
     select
-      house_id,warehouse_id,quality,sub_type_detailed,level,number
+      house_id,warehouse_id,quality,sub_type_detailed,level_update,number_update
     from storage_qualitycheck
     where
-    type=5 and history_status=0 and store_quality=1;
+    type_update=5 and history_status=0 and store_quality=1;
   </select>
 
 
@@ -1947,14 +1947,14 @@
       <if test="id != null">
         and sqk.id = #{id}
       </if>
-      <if test="type !=null">
-        and sqk.type = #{type}
+      <if test="typeUpdate !=null">
+        and sqk.type_update = #{typeUpdate}
       </if>
       <if test="subTypeDetailed !=null">
         and sqk.sub_type_detailed = #{subTypeDetailed}
       </if>
-      <if test="level !=null">
-        and sqk.level = #{level}
+      <if test="levelUpdate !=null">
+        and sqk.level_update = #{levelUpdate}
       </if>
       <if test="historyStatus !=null">
         and sqk.history_status = #{historyStatus}
@@ -1968,7 +1968,128 @@
     </where>
     order by sqk.id desc
   </select>
-
+  <select id="getcheckById" resultType="java.util.Map" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckForSPT" >
+    SELECT
+      sqk.id,
+      sqk.house_id,
+      sqk.warehouse_id,
+      sqk.org_id,
+      sqk.keeper,
+      sqk.number_update,
+      sqk.ypsl,
+      sqk.dbsl,
+      sqk.type_update,
+      sqk.checker,
+      sqk.chooser,
+      sqk.choose_time,
+      sqk.check_time,
+      sqk.check_result_time,
+      sqk.remarks,
+      sqk.fat_index,
+      sqk.husked_ration,
+      sqk.full_good_ration,
+      sqk.yellow_part,
+      sqk.out_husked_ration,
+      sqk.smelltaste,
+      sqk.transparency,
+      sqk.peroxide_value,
+      sqk.smoke_point,
+      sqk.reeze_test,
+      sqk.residual_solvent,
+      sqk.lead,
+      sqk.total_arsenic,
+      sqk.aflatoxin,
+      sqk.butyl_phenol,
+      sqk.intermixing_rate,
+      sqk.pests,
+      sqk.color_ratio,
+      sqk.damage_ratio,
+      sqk.hot_damage_ratio,
+      sqk.husked_rice_weight,
+      sqk.check_time_type,
+      sqk.water,
+      sqk.hard_index,
+      sqk.mildew_count,
+      sqk.colorsmell,
+      sqk.goodpart,
+      sqk.badpart,
+      sqk.gluten_water_count,
+      sqk.eat_score,
+      sqk.hot_damage,
+      oi.level_code,
+      bs.storeHouse_name storehouseName,
+      bs.keeping_way,
+      bw.warehouse_name wareHouseName,
+      bw.hwbm,
+      pz.enumName subType,
+      fs.enumName keepingWay,
+      qr.enumName quality,
+      cd.enumName location,
+      dj.enumName levelUpdate,
+      shnd.enumName harvestTime,
+      sqi.qualitycheck_id,
+      sqi.unit_weight,
+      sqi.impurity_total,
+      sqi.impurity_inorganic,
+      sqi.impurity_organic,
+      sqi.impurity_bran_powder,
+      sqi.imperfectGrains_total,
+      sqi.imperfectGrains_injuredKernel,
+      sqi.imperfectGrains_scab,
+      sqi.imperfectGrains_scab_total,
+      sqi.imperfectGrains_scab_blackEmbryo,
+      sqi.imperfectGrains_scab_gibberella,
+      sqi.imperfectGrains_damage,
+      sqi.imperfectGrains_sproutedKernel,
+      sqi.imperfectGrains_frostbite,
+      sqi.imperfectGrains_immatureGrain,
+      sqi.imperfectGrains_content,
+      sqi.imperfectGrains_brownRice,
+      sqi.naturally,
+      sqi.stoving,
+      sqi.crude_fat_content,
+      sqi.proteolysis,
+      sqi.mildew,
+      sqi.immature_grain_rate,
+      sqi.crushing_rate,
+      sqi.yellow_rice,
+      sqi.relative_density,
+      sqi.water_volatiles,
+      sqi.insoluble_impurity,
+      sqi.acid_value,
+      sqi.soap_content,
+      sqi.heat,
+      sqi.wood_tar,
+      sqi.avg_length,
+      sqi.rice_grains,
+      sqi.brokenRice_total,
+      sqi.brokenRice_big,
+      sqi.brokenRice_small,
+      sqi.machiningAccuracy,
+      sqi.chalkiness,
+      sqi.machiningAccuracy_essence,
+      sqi.machiningAccuracy_suitable,
+      sqi.amylose,
+      sqi.ash_content,
+      sqi.coarseness,
+      sqi.gluten,
+      sqi.silt_content,
+      sqi.magnetic_metal
+  FROM
+      depot:storage_qualitycheck sqk
+      LEFT JOIN depot:basic_storehouse bs ON bs.storehouse_id = sqk.house_id
+      LEFT JOIN depot:basic_warehouse bw ON bw.warehouse_id = sqk.warehouse_id
+      LEFT JOIN depot:storage_qualitycheck_inspection sqi ON sqi.qualitycheck_id = sqk.id
+      LEFT JOIN depot:org_info oi ON sqk.org_id = oi.org_id
+      LEFT JOIN depot:basic_enum pz ON pz.enumId = sqk.sub_type
+      LEFT JOIN depot:basic_enum qr ON qr.enumId = sqk.quality
+      LEFT JOIN depot:basic_enum cd ON cd.enumId = sqk.location
+      LEFT JOIN depot:basic_enum fs ON fs.enumId = bs.keeping_way
+      LEFT JOIN depot:basic_enum dj ON dj.enumId = sqk.level_update
+      LEFT JOIN depot:basic_enum shnd ON shnd.enumId = sqk.harvest_time
+      WHERE
+        sqk.id =#{id};
+  </select>
   <select id="queryByQualitycheckusiness" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" resultMap="BaseResultMap">
     SELECT DISTINCT
     sqk.id,
@@ -1986,8 +2107,8 @@
       <if test="id != null">
         and sqk.id = #{id}
       </if>
-      <if test="type !=null">
-        and sqk.type = #{type}
+      <if test="typeUpdate !=null">
+        and sqk.type_update = #{typeUpdate}
       </if>
       <if test="historyStatus !=null">
         and sqk.history_status = #{historyStatus}

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheckInspection.java

@@ -137,6 +137,25 @@ public class StorageQualitycheckInspection {
 
     private String inputFour;
 
+    private String sieveResidue;//筛下物%2020.12.21  新增字段
+
+    private String riceYield;//出米率%2020.12.21  新增字段
+
+
+    public String getSieveResidue() {
+        return sieveResidue;
+    }
+
+    public void setSieveResidue(String sieveResidue) {
+        this.sieveResidue = sieveResidue;
+    }
+    public String getRiceYield() {
+        return riceYield;
+    }
+
+    public void setRiceYield(String riceYield) {
+        this.riceYield = riceYield;
+    }
     /**
      * id
      * @return id id

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -124,4 +124,6 @@ public interface StorageQualitycheckService {
 
     //获取仓房
     JSONArray getHouseIdAll(Integer orgId, HttpServletRequest request);
+
+	Map<String, Object> getcheckByIds(Integer id);
 }

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

@@ -86,6 +86,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
                     }
 
                 }
+
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -314,6 +315,12 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
     }
 
     @Override
+    public Map<String, Object> getcheckByIds(Integer Id) {
+        Map<String, Object> checkMap = qualitycheckMapper.getcheckById(Id);
+        return checkMap;
+    }
+
+    @Override
     public List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap) {
         return qualitycheckMapper.getAllFoodStocks(paramMap);
     }