mengy 5 年之前
父節點
當前提交
ac96eeb62d

+ 6 - 0
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
27
 
27
 
28
 import javax.annotation.Resource;
28
 import javax.annotation.Resource;
29
 import java.io.IOException;
29
 import java.io.IOException;
30
+import java.sql.Timestamp;
30
 import java.text.SimpleDateFormat;
31
 import java.text.SimpleDateFormat;
31
 import java.util.*;
32
 import java.util.*;
32
 
33
 
@@ -187,6 +188,11 @@ public class StorageQualitycheckController {
187
             //默认0:未封仓   1:已封仓
188
             //默认0:未封仓   1:已封仓
188
             qualitycheck.setSealStatus("0");
189
             qualitycheck.setSealStatus("0");
189
             qualitycheck.setHistoryStatus(0);//0:最新数据   1:历史数据
190
             qualitycheck.setHistoryStatus(0);//0:最新数据   1:历史数据
191
+            if (null!=qualitycheck.getQfrq()){
192
+
193
+            }else {
194
+                qualitycheck.setQfrq(null);
195
+            }
190
             Integer qualityCheckId = storageQualitycheckService.save(qualitycheck,storehouseId);
196
             Integer qualityCheckId = storageQualitycheckService.save(qualitycheck,storehouseId);
191
             //油罐检测信息
197
             //油罐检测信息
192
             if(StringUtils.isNoneBlank(qualitycheckInspection)){
198
             if(StringUtils.isNoneBlank(qualitycheckInspection)){

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

@@ -1650,9 +1650,9 @@
1650
       <if test="jylb != null" >
1650
       <if test="jylb != null" >
1651
         jylb = #{jylb,jdbcType=VARCHAR},
1651
         jylb = #{jylb,jdbcType=VARCHAR},
1652
       </if>
1652
       </if>
1653
-      <if test="qfrq != null" >
1653
+
1654
         qfrq = #{qfrq,jdbcType=TIMESTAMP},
1654
         qfrq = #{qfrq,jdbcType=TIMESTAMP},
1655
-      </if>
1655
+
1656
       <if test="ypsl != null" >
1656
       <if test="ypsl != null" >
1657
         ypsl = #{ypsl,jdbcType=VARCHAR},
1657
         ypsl = #{ypsl,jdbcType=VARCHAR},
1658
       </if>
1658
       </if>