1

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/GrainAnalysisServiceImpl.java

@@ -204,11 +204,13 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 		StorageGrainAnalysis storageGrainAnalysis = storageGrainAnalysisMapper.selectByPrimaryKey(grainAnalysis.getZid());
 		//异常信息与四无检查
 		List<GrainAnalysisAbnormal> grainAnalysisAbnormalList = grainAnalysis.getGrainAnalysisAbnormalList();
-		//新版的温度数据
+		//新版的原粮温度数据
 		List<GrainAnalysisTestdata> analysisTestdataList = grainAnalysis.getAnalysisTestdata();
+		//新版的成品粮温度数据
+		List<GrainAnalysisCpltestdata> analysisCpltestdataList = grainAnalysis.getAnalysisCpltestdata();
 		//月报下挂载的周报数据/季报下挂载的月报数据
 		List<GrainAnalysisMonthdata> analysisMonthdataList = grainAnalysis.getAnalysisMonthdata();
-		if(grainAnalysis.getId()!=null){
+		if (grainAnalysis.getId() != null) {
 			grainAnalysisMapper.updateByPrimaryKey(grainAnalysis);
 			if(!CollectionUtils.isEmpty(grainAnalysisAbnormalList)){
 				for (GrainAnalysisAbnormal grainAnalysisAbnormal : grainAnalysisAbnormalList) {
@@ -237,6 +239,12 @@ public class GrainAnalysisServiceImpl implements GrainAnalysisService {
 					grainAnalysisTestdataMapper.insert(g);
 				}
 			}
+			if (!CollectionUtils.isEmpty(analysisCpltestdataList)) {
+				for (GrainAnalysisCpltestdata gac : analysisCpltestdataList) {
+					gac.setUpdatetime(new Date());
+					grainAnalysisCpltestdataMapper.updateByPrimaryKey(gac);
+				}
+			}
 			if (!CollectionUtils.isEmpty(analysisMonthdataList) && "2".equals(storageGrainAnalysis.getDataType())) {
 				//先删除
 				GrainAnalysisMonthdataExample grainAnalysisMonthdataExample = new GrainAnalysisMonthdataExample();