试验容器相关bug

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialContainerClassificationServiceImpl.java

@@ -232,22 +232,22 @@ public class TrialContainerClassificationServiceImpl
             StringBuilder value = new StringBuilder();
             for (TrialContainerDataBean bean : obj.getBeanList()) {
                 key.append(bean.getFieldKey()).append(",");
-                value.append("'").append(ObjectUtil.isNotEmpty(bean) ? bean.getFieldValue() : null).append("',");
+                value.append("'").append(ObjectUtil.isNotEmpty(bean.getFieldValue()) ? bean.getFieldValue() : null).append("',");
             }
             String fieldKeys = key.substring(0, key.length() - 1);
             String fieldValues = value.substring(0, value.length() - 1).replace("'null'", "null");
 
-            return baseMapper.insertData(obj.getContainerInitTabName(), SnowFlakeUtil.getId(), DateUtil.format(obj.getFieldCalibrationTime(), "yyyy-MM-dd"), fieldKeys, fieldValues) > 0;
+            return baseMapper.insertData(obj.getContainerInitTabName(), SnowFlakeUtil.getId(), DateUtil.format(ObjectUtil.isNotEmpty(obj.getFieldCalibrationTime()) ? obj.getFieldCalibrationTime() : new Date(), "yyyy-MM-dd"), fieldKeys, fieldValues) > 0;
 
         } else {
             //修改
             StringBuilder keys = new StringBuilder();
             for (TrialContainerDataBean bean : obj.getBeanList()) {
-                keys.append(bean.getFieldKey()).append("='").append(ObjectUtil.isNotEmpty(bean) ? bean.getFieldValue() : null).append("',");
+                keys.append(bean.getFieldKey()).append("='").append(ObjectUtil.isNotEmpty(bean.getFieldValue()) ? bean.getFieldValue() : null).append("',");
             }
-            String values = "," + keys.substring(0, keys.length() - 1);
+            String values = "," + keys.substring(0, keys.length() - 1).replace("'null'", "null");
 
-            return baseMapper.updateData(obj.getContainerInitTabName(), obj.getId(), DateUtil.format(obj.getFieldCalibrationTime(), "yyyy-MM-dd"), values) > 0;
+            return baseMapper.updateData(obj.getContainerInitTabName(), obj.getId(), DateUtil.format(ObjectUtil.isNotEmpty(obj.getFieldCalibrationTime()) ? obj.getFieldCalibrationTime() : new Date(), "yyyy-MM-dd"), values) > 0;
         }
     }