228

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

@@ -1975,6 +1975,7 @@
       sqk.warehouse_id,
       sqk.org_id,
       sqk.keeper,
+      sqk.accept_unite,
       sqk.number_update,
       sqk.ypsl,
       sqk.dbsl,
@@ -2013,10 +2014,13 @@
       sqk.colorsmell,
       sqk.goodpart,
       sqk.badpart,
+      sqk.mineral,
       sqk.gluten_water_count,
       sqk.eat_score,
       sqk.hot_damage,
+      sqk.check_result,
       oi.level_code,
+      oi.org_name orgName,
       bs.storeHouse_name storehouseName,
       bs.keeping_way,
       bw.warehouse_name wareHouseName,
@@ -2029,6 +2033,8 @@
       shnd.enumName harvestTime,
       sqi.qualitycheck_id,
       sqi.unit_weight,
+      sqi.colorsmellcc,
+      sqi.level_oil,
       sqi.impurity_total,
       sqi.impurity_inorganic,
       sqi.impurity_organic,
@@ -2076,17 +2082,17 @@
       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
+      storage_qualitycheck sqk
+      LEFT JOIN basic_storehouse bs ON bs.storehouse_id = sqk.house_id
+      LEFT JOIN basic_warehouse bw ON bw.warehouse_id = sqk.warehouse_id
+      LEFT JOIN storage_qualitycheck_inspection sqi ON sqi.qualitycheck_id = sqk.id
+      LEFT JOIN org_info oi ON sqk.org_id = oi.org_id
+      LEFT JOIN basic_enum pz ON pz.enumId = sqk.sub_type
+      LEFT JOIN basic_enum qr ON qr.enumId = sqk.quality
+      LEFT JOIN basic_enum cd ON cd.enumId = sqk.location
+      LEFT JOIN basic_enum fs ON fs.enumId = bs.keeping_way
+      LEFT JOIN basic_enum dj ON dj.enumId = sqk.level_update
+      LEFT JOIN basic_enum shnd ON shnd.enumId = sqk.harvest_time
       WHERE
         sqk.id =#{id};
   </select>

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

@@ -81,7 +81,7 @@ public class StorageQualitycheck {
 
     private String impurity;
 
-    private String mineral;
+    private String mineral;//矿物质
 
     private String badpart;
 

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

@@ -15,37 +15,7 @@ public class StorageQualitycheckForSPT {
 
     private String levelCode;//委托单位和检查单位编码120编码    org_info表   level_code
 
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getAcceptUnite() {
-        return acceptUnite;
-    }
-
-    public void setAcceptUnite(String acceptUnite) {
-        this.acceptUnite = acceptUnite;
-    }
-
-    public String getNumberUpdate() {
-        return numberUpdate;
-    }
-
-    public void setNumberUpdate(String numberUpdate) {
-        this.numberUpdate = numberUpdate;
-    }
-
-    public String getTypeUpdate() {
-        return typeUpdate;
-    }
-
-    public void setTypeUpdate(String typeUpdate) {
-        this.typeUpdate = typeUpdate;
-    }
+    private String checkResult;//检验结果0:合格  1：不合格
 
     private String orgName;//委托单位名称   org_info表   org_name
 
@@ -67,6 +37,8 @@ public class StorageQualitycheckForSPT {
 
     private String levelUpdate;//等级
 
+    private String levelOil ;//等级粮油
+
     private Integer harvestTime;//收获年度  --生产年限
 
     private String checker;//检验人
@@ -81,6 +53,8 @@ public class StorageQualitycheckForSPT {
 
     private String remarks;//备注
 
+    private String mineral;//矿物质
+
     private Integer id;
 
     private Integer houseId;
@@ -143,7 +117,9 @@ public class StorageQualitycheckForSPT {
 
     private String mildewCount;//生霉粒
 
-    private String colorsmell;//色泽.气味
+    private String colorsmell;//色泽.气味（质检）
+
+    private String colorsmellcc;//色泽.气味（存储）
 
     private String goodpart;//完整粒度
 
@@ -252,9 +228,71 @@ public class StorageQualitycheckForSPT {
 
     private String riceYield;//出米率%2020.12.21  新增字段
 
-
     private Integer flagType;//保存:1,提交:2
 
+    public String getMineral() {
+        return mineral;
+    }
+
+    public void setMineral(String mineral) {
+        this.mineral = mineral;
+    }
+
+    public String getColorsmellcc() {
+        return colorsmellcc;
+    }
+
+    public void setColorsmellcc(String colorsmellcc) {
+        this.colorsmellcc = colorsmellcc;
+    }
+
+    public String getLevelOil() {
+        return levelOil;
+    }
+
+    public void setLevelOil(String levelOil) {
+        this.levelOil = levelOil;
+    }
+
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public String getAcceptUnite() {
+        return acceptUnite;
+    }
+
+    public void setAcceptUnite(String acceptUnite) {
+        this.acceptUnite = acceptUnite;
+    }
+
+    public String getNumberUpdate() {
+        return numberUpdate;
+    }
+
+    public void setNumberUpdate(String numberUpdate) {
+        this.numberUpdate = numberUpdate;
+    }
+
+    public String getTypeUpdate() {
+        return typeUpdate;
+    }
+
+    public void setTypeUpdate(String typeUpdate) {
+        this.typeUpdate = typeUpdate;
+    }
 
 
     List<Integer> typeList = new ArrayList<Integer>();