Browse Source

返回时区异常修改,技术助手修改BUG修复

anderx 1 year ago
parent
commit
52afff981b

+ 14 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1245,7 +1245,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
 		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
-		pushDateClockDetails(prdList,prdcList);
+		pushDateClockDetailsToday(prdList,prdcList);
 		out.setPrdList(prdList);
 		return out;
 	}
@@ -1443,6 +1443,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
 		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
 		pushDateClockDetails(prdList,prdcList);
+		pushDateClockDetailsToday(prdList,prdcList);
 		out.setPrdList(prdList);
 		return out;
 //		List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
@@ -1456,6 +1457,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 //		}
 	}
 
+	private void pushDateClockDetailsToday(List<OutPublicReleaseDetails> prdList, List<PublicReleaseDateClock> prdcList) {
+		for (OutPublicReleaseDetails out : prdList) {
+			List<PublicReleaseDateClock> elist=new ArrayList<>();;
+			for (PublicReleaseDateClock prdc : prdcList) {
+				if (prdc.getPrdid().equals(out.getId())&&DateUtils.isSameDay(new Date(), prdc.getClockInTime())){
+					elist.add(prdc);
+				}
+			}
+			out.setPrdcList(elist);
+		}
+	}
+
 	private void pushDateClockDetails(List<OutPublicReleaseDetails> prdList, List<PublicReleaseDateClock> prdcList) {
 		for (OutPublicReleaseDetails out : prdList) {
 			List<PublicReleaseDateClock> elist=new ArrayList<>();;