年度预算-已执行情况bug

src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -21,6 +21,7 @@ import com.liang.service.*;
 import com.liang.vo.PrjAnnualbudgetNfVo;
 import com.liang.vo.PrjAnnualbudgetYzxqkVo;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
@@ -43,6 +44,7 @@ import java.util.stream.Collectors;
  * @since 2023-05-17 08:56:49
  */
 @Controller
+@Slf4j
 @RequestMapping("prjAnnualbudget")
 public class PrjAnnualbudgetController extends BaseController {
     /**
@@ -306,7 +308,7 @@ public class PrjAnnualbudgetController extends BaseController {
 
                 Set<String> nf = yzxqkVos.stream().map(PrjAnnualbudgetYzxqkVo::getNf).collect(Collectors.toSet());
                 //后端对已执行情况的父级求和
-                sumYzxqk(readValue, nf,yzxqkVos.get(0).getXmlx());
+                sumYzxqk(readValue, nf, yzxqkVos.get(0).getXmlx());
                 nf.forEach(nfItem -> {
                     readValue.stream().forEach(item -> {
                         Double ysje = allBudgetDetails.stream().filter(allBudgetDetailItem -> allBudgetDetailItem.getFymc().equals(item.get("fymc")) && nfItem.equals(String.valueOf(allBudgetDetailItem.getNf()))).collect(Collectors.toList()).get(0).getYsje();
@@ -331,26 +333,51 @@ public class PrjAnnualbudgetController extends BaseController {
     private void sumYzxqk(List<Map<String, Object>> readValue, Set<String> nf, String xmlx) {
         for (String n : nf) {
             //更新人工费
-            BigDecimal rgf = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.RGF).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.RGF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, rgf.setScale(2, 4)));
+            List<Map<String, Object>> rgfs = readValue.stream().filter(item -> {
+                String ndysbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.RGF);
+                log.info("ndysbm"+ndysbm);
+                return ndysbm.equals(item.get("fj")) && item.get("yzxqk" + n) != null;
+            }).collect(Collectors.toList());
+            if (Tools.notEmpty(rgfs)) {
+                BigDecimal rgf = rgfs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.RGF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, rgf.setScale(2, 4)));
+            }
             //更新设备使用费
-            BigDecimal sbsyf = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.SBSYF).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.SBSYF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(sbsyf)));
+            List<Map<String, Object>> sbsyfs = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.SBSYF).equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+            if (Tools.notEmpty(sbsyfs)) {
+                BigDecimal sbsyf = sbsyfs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.SBSYF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(sbsyf)));
+            }
             //更新业务费
-            BigDecimal ywf = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.YWF).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.YWF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(ywf)));
+            List<Map<String, Object>> yfws = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.YWF).equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+            if (Tools.notEmpty(yfws)) {
+                BigDecimal ywf = yfws.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.YWF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(ywf)));
+            }
             //更新场地使用费
-            BigDecimal cdsyf = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.CDSYF).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.CDSYF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(cdsyf)));
+            List<Map<String, Object>> cdsyfs = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.CDSYF).equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+            if (Tools.notEmpty(cdsyfs)) {
+                BigDecimal cdsyf = yfws.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.CDSYF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(cdsyf)));
+            }
             //更新外委支出费
-            BigDecimal wwzcf = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.WWZCF).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.WWZCF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(wwzcf)));
+            List<Map<String, Object>> wwzcfs = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.WWZCF).equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+            if (Tools.notEmpty(wwzcfs)) {
+                BigDecimal wwzcf = yfws.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.WWZCF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(wwzcf)));
+            }
             //更新直接费
-            BigDecimal zjf = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.ZJF).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.ZJF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zjf)));
+            List<Map<String, Object>> zjfs = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.ZJF).equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+            if (Tools.notEmpty(zjfs)) {
+                BigDecimal zjf = yfws.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.ZJF).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zjf)));
+            }
             //更新总计
-            BigDecimal zj = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.ZJ).equals(item.get("fj")) && Tools.notEmpty(item.get("yzxqk" + n))).map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
-            readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx,CommonConstant.ZJ).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zj)));
+            List<Map<String, Object>> zjs = readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.ZJ).equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+            if (Tools.notEmpty(zjs)) {
+                BigDecimal zj = yfws.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                readValue.stream().filter(item -> SFTYProperties.getNDYSBM(xmlx, CommonConstant.ZJ).equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zj)));
+            }
         }
     }
 

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -627,9 +627,9 @@
     <select id="getYzxqk" resultType="com.liang.vo.PrjAnnualbudgetYzxqkVo">
         SELECT convert(decimal(18,2),(sum(BZJE)/10000)) BZJE ,pa.fymc,sb.nf,sb.xmlx
         from(SELECT	sb.id ,sb.fylb,pa.nf,pa.xmlx
-             from sta_BudgetApproval sb
-                 left join prj_AnnualBudget pa on pa.id = sb.nys
-             where	nys in (
+             from  prj_AnnualBudget pa
+                 left join sta_BudgetApproval sb on pa.id = sb.nys
+             where	pa.id in (
                  select	id
                  from prj_AnnualBudget
                  where rws = (select rws from prj_AnnualBudget where ID = #{nys})