生产工序业务修改

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TSampleListQuery.java

@@ -25,13 +25,6 @@ public class TSampleListQuery  {
     @ApiModelProperty("搜索字段")
     private String search;
 
-
-    /**
-     * 图片保存下载类型
-     */
-    @ApiModelProperty("图片保存下载类型 传“1”保存记录形式")
-    private Integer imageType;
-
     /**
      * 样号
      */

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/DateUtil.java

@@ -8,6 +8,8 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
 import java.time.temporal.WeekFields;
 import java.util.Date;
 
@@ -20,6 +22,8 @@ public class DateUtil {
 
     public static final String FORMAT_TO_DAY = "yyyy-MM-dd";
 
+    public static final String FORMAT_DAY_TO_SECOND = " HH:mm:ss";
+
     public static final String FORMAT_TO_SECOND = "yyyy-MM-dd HH:mm:ss";
 
     private static final int ONE = 1;
@@ -173,14 +177,23 @@ public class DateUtil {
      */
     public static LocalDateTime strToTime(String timeStr){
         if (StringUtils.isBlank(timeStr)) throw new RuntimeException("LocalDateTime strToTime: String timeStr is null");
+        DateTimeFormatter fmt = new DateTimeFormatterBuilder()
+                .appendPattern(FORMAT_TO_DAY)
+                .optionalStart()
+                .appendPattern(FORMAT_DAY_TO_SECOND)
+                .optionalEnd()
+                .parseDefaulting(ChronoField.HOUR_OF_DAY, 0)
+                .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
+                .toFormatter();
         try {
-            LocalDateTime ldt = LocalDateTime.parse(timeStr,DateTimeFormatter.ofPattern(FORMAT_TO_SECOND));
+            LocalDateTime ldt = LocalDateTime.parse(timeStr,fmt);
             return ldt;
         }catch (Exception e){
             throw new RuntimeException("transform str to time is failed");
         }
     }
 
+
     /**
      * 时间转化为字符串
      */