Browse Source

公出详情新增打卡数据

anderx 1 year ago
parent
commit
ac1f496aa4

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

@@ -1211,7 +1211,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 				}
 			}
-		out.setPrdList(publicReleaseDetailsMapper.selectByPrid(out.getId()));
+		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
+		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
+		pushDateClockDetails(prdList,prdcList);
+		out.setPrdList(prdList);
 		return out;
 	}
 
@@ -1220,6 +1223,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public OutPublicReleaseAndDetails followDtails(String id) {
 		OutPublicReleaseAndDetails out = publicReleaseMapper.selectDtailsByFid( id);
+		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(out.getId());
+		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(out.getId());
+		pushDateClockDetails(prdList,prdcList);
+		out.setPrdList(prdList);
 		return out;
 	}