1.新增获取当天排班中变更过的排班数据接口

王通
1 parent 0136e0cd
Showing 2 changed files with 12 additions and 2 deletions
src/main/java/com/bsth/repository/ScheduleRealInfoRepository.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
+import java.util.Date;
 import java.util.List;
 @Repository
@@ -47,5 +48,5 @@ public interface ScheduleRealInfoRepository extends PagingAndSortingRepository&lt;S
 	 */
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 and s.gsBm=?2 and s.updateDate>=?3")
-	List<ScheduleRealInfo> findByDateAndCompany(String schDate, String companyCode, long timestamp);
+	List<ScheduleRealInfo> findByDateAndCompany(String schDate, String companyCode, Date timestamp);
 }
@@ -17,6 +17,10 @@ import com.bsth.util.ConfigUtil;
 import com.bsth.util.HttpClientUtils;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -208,7 +212,12 @@ public class ScheduleRealService {
     @GET
     @Path("/sch_jk4modify/{company}/{rq}")
     public List<ScheduleRealInfoDTO_JK> sch_jk4modify(@PathParam("company") String company, @PathParam("rq") String rq) {
-        List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfoRepository.findByDateAndCompany(rq, company, timestamp));
+        DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyyMMdd");
+        DateTime dateTime = fmt.parseDateTime(rq);
+        logger.error("--------------" + company);
+        logger.error("--------------" + rq);
+        logger.error("--------------" + timestamp);
+        List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company, new Date(timestamp)));
         timestamp = System.currentTimeMillis();
         return result;