检查-强检

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

@@ -1,10 +1,12 @@
 package com.chinaitop.depot.storage.controller;
 
 
-import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
 import com.alibaba.fastjson.JSONArray;
-import com.chinaitop.depot.storage.model.*;
+import com.chinaitop.depot.storage.model.StorageFoodbasicinfo;
+import com.chinaitop.depot.storage.model.StorageQualitycheck;
+import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample.Criteria;
+import com.chinaitop.depot.storage.model.StorageQualitycheckSonExample;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
 import com.chinaitop.depot.storage.utils.DataSynchronization;
@@ -26,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.lang.reflect.Parameter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -177,8 +178,7 @@ public class StorageQualitycheckController {
         ObjectMapper mapper = new ObjectMapper();
         try {
             StorageQualitycheck qualitycheck = (StorageQualitycheck)mapper.readValue(qualitycheckJson, StorageQualitycheck.class);
-            StorageQualitycheckInspection qualityInspection = (StorageQualitycheckInspection)mapper.readValue(qualitycheckInspectionJson, StorageQualitycheckInspection.class);
-            storageQualitycheckService.save(qualitycheck,qualityInspection);
+            storageQualitycheckService.save(qualitycheck,qualitycheckInspectionJson);
             modelMap.put("status", "success");
         } catch (IOException e) {
             modelMap.put("status", "error");

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

@@ -1621,20 +1621,20 @@
 
   <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.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.keeper, sqk.harvest_time,
-    sqk.goodpart, sqk.chooser, sqk.choose_time, sqk.choose_organ, 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, sqk.gluten_water_count, sqk.remarks, approver, sqk.mildew_count,
-    sqk.damage_ratio, sqk.hot_damage_ratio, sqk.husked_rice_weight, sqk.reviewer, sqk.apply_check_time, sqk.check_time_type,
-    sqk.check_result_time, sqk.store_quality, sqk.is_pest, sqk.inspection_standard_basis, sqk.quality, sqk.seal_date,
-    sqk.seal_status, sqk.auth_code, sqk.org_id, sqk.history_status, sqk.flag_type
-    <!--云南新增的字段，先注释掉方便调试-->
-    /*, sqk.intermixing_rate,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.checker, sqk.level, 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.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,
+    sqk.gluten_water_count, sqk.remarks, sqk.approver, sqk.mildew_count, sqk.damage_ratio, sqk.hot_damage_ratio,
+    sqk.husked_rice_weight, sqk.reviewer, sqk.apply_check_time, sqk.check_time_type, sqk.check_result_time,
+    sqk.store_quality, sqk.is_pest, sqk.inspection_standard_basis, sqk.quality, sqk.seal_date, sqk.seal_status,
+    sqk.auth_code, sqk.org_id, sqk.history_status, sqk.intermixing_rate, sqk.smelltaste, sqk.transparency, sqk.peroxide_value,
+    sqk.smoke_point, sqk.reeze_test, sqk.residual_solvent, sqk.lead, sqk.total_arsenic, sqk.aflatoxin, sqk.quailtycard_id,
+    sqk.butyl_phenol, sqk.flag_type
   </sql>
 
   <select id="queryPrimaryKey" resultMap="BaseResultMap">

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

@@ -3,7 +3,6 @@ package com.chinaitop.depot.storage.service;
 import com.alibaba.fastjson.JSONArray;
 import com.chinaitop.depot.storage.model.StorageQualitycheck;
 import com.chinaitop.depot.storage.model.StorageQualitycheckExample;
-import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 
 import javax.servlet.http.HttpServletRequest;
@@ -33,7 +32,7 @@ public interface StorageQualitycheckService {
 	 *
 	 * @param qualitycheck
 	 */
-	void save(StorageQualitycheck qualitycheck, StorageQualitycheckInspection qualityInspection);
+	void save(StorageQualitycheck qualitycheck, String qualityInspection);
 
 	/**
 	 * 新增qualitycheck字表信息

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

@@ -14,12 +14,14 @@ import com.chinaitop.depot.storage.model.StorageQualitycheckInspection;
 import com.chinaitop.depot.storage.model.StorageQualitycheckSon;
 import com.chinaitop.depot.storage.service.StorageQualitycheckService;
 import com.chinaitop.depot.storage.service.StorageQualitycheckSonService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.*;
 
 @Service
@@ -52,27 +54,35 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	// 保存数据
 	@Override
-	public void save(StorageQualitycheck qualitycheck, StorageQualitycheckInspection qualityInspection) {
-        qualitycheck.setSealStatus("0");    //默认0:未封仓   1:已封仓
-        qualitycheck.setHistoryStatus(0);   //0:最新数据   1:历史数据
-        Integer qualityCheckId=0;
-		if (qualitycheck.getId() == null) {
-			qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
-            if(qualityInspection != null){
-                qualityCheckId = qualitycheck.getId()+1;
-                //新增质检
-                qualityInspection.setQualitycheckId(qualityCheckId);
-                qualityInspectionMapper.insertSelective(qualityInspection);
-            }
-        } else {
-            qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据
-            //修改质检
-            if(qualityInspection != null){
-                qualityCheckId = qualitycheck.getId();
-                qualityInspection.setQualitycheckId(qualityCheckId);
-                qualityInspectionMapper.updateByPrimaryKeySelective(qualityInspection);
+	public void save(StorageQualitycheck qualitycheck, String qualitycheckInspectionJson) {
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            qualitycheck.setSealStatus("0");    //默认0:未封仓   1:已封仓
+            qualitycheck.setHistoryStatus(0);   //0:最新数据   1:历史数据
+            Integer qualityCheckId=0;
+            if (qualitycheck.getId() == null) {
+                qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
+                if(qualitycheckInspectionJson.length() >2){
+                    StorageQualitycheckInspection qualityInspection = (StorageQualitycheckInspection)mapper.readValue(qualitycheckInspectionJson, StorageQualitycheckInspection.class);
+                    qualityCheckId = qualitycheck.getId()+1;
+                    //新增质检
+                    qualityInspection.setQualitycheckId(qualityCheckId);
+                    qualityInspectionMapper.insertSelective(qualityInspection);
+                }
+            } else {
+                qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据
+                //修改质检
+                if(!qualitycheckInspectionJson.equals("null")){
+                    StorageQualitycheckInspection qualityInspection = (StorageQualitycheckInspection)mapper.readValue(qualitycheckInspectionJson, StorageQualitycheckInspection.class);
+                    qualityCheckId = qualitycheck.getId();
+                    qualityInspection.setQualitycheckId(qualityCheckId);
+                    qualityInspectionMapper.updateByPrimaryKeySelective(qualityInspection);
+                }
             }
-		}
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 	}
 
 	// 保存字表数据