Przeglądaj źródła

公出详情与公出首页新增公出协单意见数量

anderx 1 rok temu
rodzic
commit
a13230fb9d

+ 10 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

@@ -46,6 +46,16 @@ public class OutPublicRelease extends PublicRelease {
 	private List<OutPublicReleaseDetails> prdList;
 	private List<PublicExamine> peList;
 
+	private Integer publicAssistAdvice;
+
+	public Integer getPublicAssistAdvice() {
+		return publicAssistAdvice;
+	}
+
+	public void setPublicAssistAdvice(Integer publicAssistAdvice) {
+		this.publicAssistAdvice = publicAssistAdvice;
+	}
+
 	@Override
 	public String getAddressName() {
 		return addressName;

+ 12 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -36,8 +36,20 @@ public class OutPublicReleaseList {
 	private Integer techStartProcess;
 	private BigDecimal expenseAmount;
 
+
+	private Integer publicAssistAdvice;
+
+
 	private List<OutPublicReleaseDetails> prdList;
 
+	public Integer getPublicAssistAdvice() {
+		return publicAssistAdvice;
+	}
+
+	public void setPublicAssistAdvice(Integer publicAssistAdvice) {
+		this.publicAssistAdvice = publicAssistAdvice;
+	}
+
 	public String getUserAdminName() {
 		return userAdminName;
 	}

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

@@ -1472,6 +1472,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
 		pushDateClockDetailsToday(prdList,prdcList);
 		out.setPrdList(prdList);
+		List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(out.getId(), 0);
+		if (publicAssistAdvices.isEmpty()){
+			out.setPublicAssistAdvice(0);
+		}else {
+			out.setPublicAssistAdvice(publicAssistAdvices.size());
+
+		}
 		return out;
 	}
 
@@ -1673,6 +1680,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		pushDateClockDetails(prdList,prdcList);
 		pushDateClockDetailsToday(prdList,prdcList);
 		out.setPrdList(prdList);
+		List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(out.getId(), 0);
+		if (publicAssistAdvices.isEmpty()){
+			out.setPublicAssistAdvice(0);
+		}else {
+			out.setPublicAssistAdvice(publicAssistAdvices.size());
+
+		}
+
 		return out;
 //		List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
 //		if (myPublic.isEmpty()){