up

潘钊
1 parent c49536a5
Showing 3 changed files with 13 additions and 3 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import java.util.Date;
@@ -3,6 +3,7 @@ package com.bsth.repository.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.BaseRepository;
+import java.util.Date;
 import java.util.List;
 import org.springframework.data.domain.Page;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
-	@Query(value = "select * from bsth_c_s_sp_info where DATE_FORMAT(schedule_date, '%Y-%m-%d')=?1", nativeQuery = true)
-	List<SchedulePlanInfo> findByDate(String dateformat);
+	@Query(value = "select s from SchedulePlanInfo s where scheduleDate=?1")
+	List<SchedulePlanInfo> findByDate(Date date);
 }
@@ -16,6 +16,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.util.BatchSaveUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 /**
  * 
@@ -36,6 +37,9 @@ public class GetSchedulePlanThread  extends Thread{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	ObjectMapper objectMapper;
+	
 	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 	@Override
@@ -53,7 +57,11 @@ public class GetSchedulePlanThread  extends Thread{
 				realList = scheduleRealInfoRepository.findByDate(cDate);
 			}
 			else{
-				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(dateStr);
+				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(cDate);
+				
+				for(SchedulePlanInfo sp : list){
+					sp.setSchedulePlan(null);
+				}
 				//实际排班计划
 				realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);