diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java index a42bd3f..711c01d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java @@ -28,10 +28,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * @author c liu @@ -437,8 +435,12 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { List monthCosts = calMonthlyMapper.getMonthCosts(agreementInfo); int num = 0; for (SltAgreementInfo monthCost : monthCosts) { + List monthDetails = new ArrayList<>(); monthCost.setCodeNum(num++); - List monthDetails = calMonthlyMapper.getMonthDetails(monthCost); + for (String id : monthCost.getIds().split(",")) { + monthCost.setId(Long.parseLong(id)); + monthDetails.addAll(calMonthlyMapper.getMonthDetails(monthCost)); + } monthCost.setNode(monthDetails); } return monthCosts; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml index 2446feb..e02f52f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/CalMonthlyMapper.xml @@ -28,13 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"