Przeglądaj źródła

公出详细列表附件修改

anderx 1 rok temu
rodzic
commit
358586f645

+ 13 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -1,8 +1,10 @@
 package com.goafanti.weChat.bo;
 
+import com.goafanti.common.model.PublicReleaseClock;
 import com.goafanti.common.utils.excel.Excel;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public class OutPublicDtails  {
 
@@ -69,6 +71,17 @@ public class OutPublicDtails  {
 	@Excel(name = "订单总金额" ,scale = 6)
 	private BigDecimal totalAmout;
 
+	private List<PublicReleaseClock> list;
+
+
+	public List<PublicReleaseClock> getList() {
+		return list;
+	}
+
+	public void setList(List<PublicReleaseClock> list) {
+		this.list = list;
+	}
+
 	public Integer getPrdId() {
 		return prdId;
 	}

+ 5 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1798,11 +1798,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
 		for (OutPublicDtails outPublicDtails : list) {
+			List<PublicReleaseClock> colokList =new ArrayList<>();
 			StringBuilder sb = new StringBuilder();
 			for (PublicReleaseClock e : publicReleaseClocks) {
 				if (outPublicDtails.getPrdId().equals(e.getPrdid())){
 					sb.append(DateUtils.formatDateYYYYMMddHHmm(e.getClockInTime())).append("\n");
+					colokList.add(e);
 				}
+				colokList.sort(Comparator.comparing(PublicReleaseClock::getClockInTime));
+				Collections.reverse(colokList);
+				outPublicDtails.setList(colokList);
 			}
 			outPublicDtails.setClockInTimes(sb.toString());
 		}