Explorar o código

计划单统计表调整

huxy hai 1 semana
pai
achega
509c51ccf0

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/syPlanStatistics/controller/SyPlanStatisticsController.java

@@ -91,6 +91,13 @@ public class SyPlanStatisticsController extends JeecgController<SyPlanStatistics
 //		Page<SyPlanStatistics> page = new Page<SyPlanStatistics>(0, 10);
 //		queryWrapper.eq("del_flag",0);
 //		IPage<SyPlanStatistics> pageList = syPlanStatisticsService.page(page, queryWrapper);
+//		System.out.println("syPlanStatistics   "+syPlanStatistics);
+		if(oConvertUtils.isEmpty(syPlanStatistics.getReadyEndDate())){
+			syPlanStatistics.setReadyEndDate(null);
+		}
+		if(oConvertUtils.isEmpty(syPlanStatistics.getReadyNoticeDate())){
+			syPlanStatistics.setReadyNoticeDate(null);
+		}
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("plan_num",syPlanStatistics.getPlanNum());
 		SyPlanStatistics statistics=syPlanStatisticsService.getOne(queryWrapper);

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/syPlanStatistics/entity/SyPlanStatistics.java

@@ -72,8 +72,8 @@ public class SyPlanStatistics implements Serializable {
 	private String readyEndDate;
 
     /**成衣通知时间*/
-    @Excel(name = "刷成衣结束日期", width = 15)
-    @ApiModelProperty(value = "刷成衣结束日期")
+    @Excel(name = "成衣通知时间", width = 15)
+    @ApiModelProperty(value = "成衣通知时间")
     private String readyNoticeDate;
 
     /**计划单类型*/