工序按验收时间排序

@@ -107,6 +107,7 @@ public class TblProductionPlanController extends JeecgController<TblOrderForm, I
 		 queryWrapper.apply("DATE_FORMAT(yan_time, '%Y-%m') = '" + outputDateString + "'");
 		 queryWrapper.apply("DATE_FORMAT(yan_time, '%Y-%m') = '" + outputDateString + "'");
 		 queryWrapper.eq("undertaker",undertaker);
 		 queryWrapper.eq("undertaker",undertaker);
 		 queryWrapper.eq("yan_result","合格入库");
 		 queryWrapper.eq("yan_result","合格入库");
+		 queryWrapper.orderByAsc("yan_time");
 		 List<TblProductionGongxu> list = gongxuService.list(queryWrapper);
 		 List<TblProductionGongxu> list = gongxuService.list(queryWrapper);
 		 return Result.OK(list);
 		 return Result.OK(list);
 	 }
 	 }

@@ -67,8 +67,8 @@ public class TblProductionGongxu implements Serializable {
     private java.lang.String dispatchRen;
     private java.lang.String dispatchRen;
 	/**验收时间*/
 	/**验收时间*/
 	@Excel(name = "验收时间", width = 15, format = "yyyy-MM-dd")
 	@Excel(name = "验收时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "验收时间")
     @ApiModelProperty(value = "验收时间")
     private java.util.Date yanTime;
     private java.util.Date yanTime;
 	/**验收人*/
 	/**验收人*/