|
|
@@ -32,6 +32,7 @@ import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper> implements PublicReleaseService {
|
|
|
@@ -1257,6 +1258,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Map<String,Object> map =new HashMap<String, Object>();
|
|
|
addParams(in, map);
|
|
|
Pagination<OutPublicDtails> page = (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
|
|
|
+ List<OutPublicDtails> list = (List<OutPublicDtails>)page.getList();
|
|
|
+ List<Integer> collect = list.stream().map(OutPublicDtails::getId).collect(Collectors.toList());
|
|
|
+ List<PublicReleaseClock> publicReleaseClocks = publicReleaseClockMapper.selectList(collect);
|
|
|
+ pushiClockInTime(list, publicReleaseClocks);
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
@@ -1784,4 +1789,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public Map checkOrderNoDuration( InputPublicRelease in){
|
|
|
return checkOrderNoDuration(in,null);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void pushOutPublicDtails(List<OutPublicDtails> list) {
|
|
|
+ List<PublicReleaseClock> publicReleaseClocks = publicReleaseClockMapper.selectList(list.stream().map(OutPublicDtails::getId).collect(Collectors.toList()));
|
|
|
+ pushiClockInTime(list, publicReleaseClocks);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
|
|
|
+ for (OutPublicDtails outPublicDtails : list) {
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ for (PublicReleaseClock e : publicReleaseClocks) {
|
|
|
+ if (outPublicDtails.getPrdId().equals(e.getPrdid())){
|
|
|
+ sb.append(DateUtils.formatDateYYYYMMddHHmm(e.getClockInTime())).append("\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ outPublicDtails.setClockInTimes(sb.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|