src/main/java/com/liang/common/config/SFTYProperties.java

@@ -1,18 +1,51 @@
 package com.liang.common.config;
 
 
+import com.liang.common.constants.CommonConstant;
+import com.liang.common.utils.SpringUtil;
+import com.liang.dao.BaseProjectbudgetDao;
+import com.liang.vo.dto.Ndysbm;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import static com.liang.common.config.SFTYProperties.PREFIX;
 
 @Component
 @ConfigurationProperties(PREFIX)
 @Data
 @NoArgsConstructor
+@Slf4j
 public class SFTYProperties {
+    static Map<String, Map<String, String>> NDYSBM = new HashMap<>();
+
+    static {
+        BaseProjectbudgetDao baseProjectbudgetDao = SpringUtil.getBean("baseProjectbudgetDao");
+
+        List<Ndysbm> ndysbms = baseProjectbudgetDao.getNDYSBM();
+        Map<String, List<Ndysbm>> collect = ndysbms.stream().collect(Collectors.groupingBy(Ndysbm::getXmlx));
+        collect.forEach((k, v) -> {
+            Map<String, String> bm = new HashMap<>();
+            v.forEach(item -> {
+                bm.put(item.getMc(), item.getBm());
+            });
+            NDYSBM.put(k, bm);
+        });
+        log.info("============NDYSBM 初始化成功 :{}================", NDYSBM);
+    }
+
+    public static String getNDYSBM(String xmlx,String bmmc) {
+        Map<String, String> map = NDYSBM.get(xmlx);
+        return map.get(bmmc);
+    }
+
     public static final String PREFIX = "sfty";
 
     private String uploadFilePath;

src/main/java/com/liang/common/constants/CommonConstant.java

@@ -16,4 +16,17 @@ public class CommonConstant {
     public static final String WTJFH = "未提交(返回)";
     public static final String WTJ = "未提交";
     public static final String SPJS = "审批结束";
+    /**
+     * 模板项目预算
+     */
+
+    public static final String ZJ = "总计";
+    public static final String ZJF = "（一）直接费";
+    public static final String RGF = "1.人工费";
+    public static final String SBF = "1.设备费";
+    public static final String SBSYF = "2.设备使用费";
+    public static final String YWF = "3.业务费";
+    public static final String CDSYF = "4.场地使用费";
+    public static final String WWZCF = "（三）外委支出费";
+
 }

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

@@ -8,6 +8,8 @@ import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
+import com.liang.common.config.SFTYProperties;
+import com.liang.common.constants.CommonConstant;
 import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.enums.ProjectTypeEnnum;
 import com.liang.common.utils.ExcelPoiUtil;
@@ -19,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;
@@ -41,6 +44,7 @@ import java.util.stream.Collectors;
  * @since 2023-05-17 08:56:49
  */
 @Controller
+@Slf4j
 @RequestMapping("prjAnnualbudget")
 public class PrjAnnualbudgetController extends BaseController {
     /**
@@ -304,7 +308,7 @@ public class PrjAnnualbudgetController extends BaseController {
 
                 Set<String> nf = yzxqkVos.stream().map(PrjAnnualbudgetYzxqkVo::getNf).collect(Collectors.toSet());
                 //后端对已执行情况的父级求和
-                sumYzxqk(readValue, nf);
+                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();
@@ -326,29 +330,87 @@ public class PrjAnnualbudgetController extends BaseController {
 
     }
 
-    private void sumYzxqk(List<Map<String, Object>> readValue, Set<String> nf) {
+    private void sumYzxqk(List<Map<String, Object>> readValue, Set<String> nf, String xmlx) {
         for (String n : nf) {
+            String rgfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.RGF);
             //更新人工费
-            BigDecimal rgf = readValue.stream().filter(item -> "32".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 -> "32".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, rgf.setScale(2, 4)));
+            if (Tools.notEmpty(rgfbm)) {
+                List<Map<String, Object>> rgfs = readValue.stream().filter(item -> {
+                    return Tools.notEmpty(rgfbm) && rgfbm.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 -> rgfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, rgf.setScale(2, 4)));
+                }
+            }
+            //更新设备费
+            String sbfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.SBF);
+            if (Tools.notEmpty(sbfbm)) {
+                List<Map<String, Object>> sbfs = readValue.stream().filter(item -> {
+                    return Tools.notEmpty(sbfbm) && sbfbm.equals(item.get("fj")) && item.get("yzxqk" + n) != null;
+                }).collect(Collectors.toList());
+                if (Tools.notEmpty(sbfs)) {
+                    BigDecimal sbf = sbfs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    readValue.stream().filter(item -> sbfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, sbf.setScale(2, 4)));
+                }
+            }
             //更新设备使用费
-            BigDecimal sbsyf = readValue.stream().filter(item -> "36".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 -> "36".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(sbsyf)));
+            String sbsyfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.SBSYF);
+            if (Tools.notEmpty(sbsyfbm)) {
+                List<Map<String, Object>> sbsyfs = readValue.stream().filter(item -> sbsyfbm.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 -> sbsyfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(sbsyf)));
+                }
+            }
             //更新业务费
-            BigDecimal ywf = readValue.stream().filter(item -> "39".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 -> "39".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(ywf)));
+            String ywfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.YWF);
+            if (Tools.notEmpty(ywfbm)) {
+                List<Map<String, Object>> yfws = readValue.stream().filter(item -> ywfbm.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 -> ywfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(ywf)));
+                }
+            }
             //更新场地使用费
-            BigDecimal cdsyf = readValue.stream().filter(item -> "43".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 -> "43".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(cdsyf)));
+            String cdsyfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.CDSYF);
+            if (Tools.notEmpty(cdsyfbm)) {
+                List<Map<String, Object>> cdsyfs = readValue.stream().filter(item -> cdsyfbm.equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+                if (Tools.notEmpty(cdsyfs)) {
+                    BigDecimal cdsyf = cdsyfs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    readValue.stream().filter(item -> cdsyfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(cdsyf)));
+                }
+            }
+
             //更新外委支出费
-            BigDecimal wwzcf = readValue.stream().filter(item -> "48".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 -> "48".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(wwzcf)));
+            String wwzcfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.WWZCF);
+            if (Tools.notEmpty(wwzcfbm)) {
+                List<Map<String, Object>> wwzcfs = readValue.stream().filter(item -> wwzcfbm.equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+                if (Tools.notEmpty(wwzcfs)) {
+                    BigDecimal wwzcf = wwzcfs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    readValue.stream().filter(item -> wwzcfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(wwzcf)));
+                }
+            }
+
             //更新直接费
-            BigDecimal zjf = readValue.stream().filter(item -> "31".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 -> "31".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zjf)));
+            String zjfbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.ZJF);
+            if (Tools.notEmpty(zjfbm)) {
+                List<Map<String, Object>> zjfs = readValue.stream().filter(item -> zjfbm.equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+                if (Tools.notEmpty(zjfs)) {
+                    BigDecimal zjf = zjfs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    readValue.stream().filter(item -> zjfbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zjf)));
+                }
+            }
             //更新总计
-            BigDecimal zj = readValue.stream().filter(item -> "30".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 -> "30".equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zj)));
+            String zjbm = SFTYProperties.getNDYSBM(xmlx, CommonConstant.ZJ);
+            if (Tools.notEmpty(zjbm)) {
+                List<Map<String, Object>> zjs = readValue.stream().filter(item -> zjbm.equals(item.get("fj")) && item.get("yzxqk" + n) != null).collect(Collectors.toList());
+                if (Tools.notEmpty(zjs)) {
+                    BigDecimal zj = zjs.stream().map(item -> new BigDecimal(String.valueOf(item.get("yzxqk" + n)))).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    readValue.stream().filter(item -> zjbm.equals(item.get("bm"))).forEach(item -> item.put("yzxqk" + n, String.valueOf(zj)));
+                }
+            }
+
         }
     }
 

src/main/java/com/liang/dao/BaseProjectbudgetDao.java

@@ -1,6 +1,7 @@
 package com.liang.dao;
 
 import com.liang.entity.BaseProjectbudget;
+import com.liang.vo.dto.Ndysbm;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 
@@ -109,5 +110,8 @@ public interface BaseProjectbudgetDao {
      * @return
      */
     List<BaseProjectbudget> getBudgetListByXmlx(String xmlx);
+
+    List<Ndysbm> getNDYSBM();
+
 }
 

src/main/java/com/liang/dao/PrjAnnualbudgetDao.java

@@ -155,5 +155,11 @@ public interface PrjAnnualbudgetDao {
     void updateSJYZXByNysId(@Param("rwsId") Integer rwsId, @Param("nf") String nf, @Param("nysId") Integer nysId);
 
     void updateSJYZXSumByNysId(@Param("rwsId") Integer rwsId, @Param("nf") String nf, @Param("nysId") Integer nysId);
+
+    void updateZFXMFYMC(@Param("nysId") Integer nysId, @Param("rwsId") Integer rwsId);
+
+    void updateSXGSKJXMFYMC(@Param("nysId") Integer nysId, @Param("rwsId") Integer rwsId);
+
+    void updateGWGSKJXMFYMC(@Param("nysId") Integer nysId, @Param("rwsId") Integer rwsId);
 }
 

src/main/java/com/liang/service/impl/PrjAnnualbudgetServiceImpl.java

@@ -1,6 +1,8 @@
 package com.liang.service.impl;
 
 import com.liang.common.base.BaseResult;
+import com.liang.common.enums.ProjectTypeEnnum;
+import com.liang.common.exception.CustomException;
 import com.liang.dao.PrjAnnualbudgetDao;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
 import com.liang.entity.PrjAnnualbudget;
@@ -157,20 +159,27 @@ public class PrjAnnualbudgetServiceImpl implements PrjAnnualbudgetService {
             prjAnnualbudgetDao.updateSJYZXSum(rws);
         }
     }
+
     @GetMapping("/updateSJYZXAndXTJSYZX/{rwsId}/{nysId}")
     @Transactional(rollbackFor = Exception.class)
-    public BaseResult updateSJYZXAndXTJSYZX(@PathVariable("rwsId")Integer rwsId, @PathVariable("nysId")Integer nysId) {
-        List<PrjAnnualbudget> prjAnnualbudgets = prjAnnualbudgetDao.listByRws(rwsId);
-        //第一年的年度预算不需要更新
-        if (!Collections.isEmpty(prjAnnualbudgets) && !prjAnnualbudgets.get(0).getId().equals(nysId)) {
-            PrjAnnualbudget annualbudget = prjAnnualbudgets.stream().filter(item -> item.getId().equals(nysId)).collect(Collectors.toList()).get(0);
-            //更新 系统计算已执行
-            prjAnnualbudgetDao.updateXTJSYZXByNysId(rwsId,annualbudget.getNf(),annualbudget.getId());
-            //更新 历史年度预算的实际已执行
-            prjAnnualbudgetDao.updateSJYZXByNysId(rwsId,annualbudget.getNf(),annualbudget.getId());
-            //更新已执行总计
-//            prjAnnualbudgetDao.updateSJYZXSumByNysId(rwsId,annualbudget.getNf(),annualbudget.getId());
+    public BaseResult updateSJYZXAndXTJSYZX(@PathVariable("rwsId") Integer rwsId, @PathVariable("nysId") Integer nysId) {
+        PrjAnnualbudget prjAnnualbudget = prjAnnualbudgetDao.queryById(nysId);
+        try {
+            if (ProjectTypeEnnum.ZFLXM.getCode().equals(prjAnnualbudget.getXmlx())) {
+                //政府项目
+                //更新费用名称
+                prjAnnualbudgetDao.updateZFXMFYMC(nysId, rwsId);
+            } else if (ProjectTypeEnnum.SXGSKJXM.getCode().equals(prjAnnualbudget.getXmlx())) {
+                //陕西公司科技项目
+                prjAnnualbudgetDao.updateSXGSKJXMFYMC(nysId, rwsId);
+            } else if (ProjectTypeEnnum.GWGSKJXM.getCode().equals(prjAnnualbudget.getXmlx())) {
+                //国网公司科技项目
+                prjAnnualbudgetDao.updateGWGSKJXMFYMC(nysId, rwsId);
+            }
+        } catch (Exception e) {
+            throw new CustomException("已执行数据同步失败");
         }
+
         return BaseResult.success("已执行数据同步成功");
     }
 

src/main/java/com/liang/vo/PrjAnnualbudgetYzxqkVo.java

@@ -18,4 +18,5 @@ public class PrjAnnualbudgetYzxqkVo {
     private String bzje;
     private String fymc;
     private String nf;
+    private String xmlx;
 }

src/main/java/com/liang/vo/dto/Ndysbm.java

@@ -0,0 +1,21 @@
+package com.liang.vo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author by lgl
+ * @date 2024/5/13.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Ndysbm {
+    private String mc;
+    private String bm;
+    private String xmlx;
+
+}

src/main/resources/mapper/BaseProjectbudgetDao.xml

@@ -202,5 +202,19 @@
                  LEFT JOIN base_ProjectBudget AS b ON t.ID = b.XM
         where p.ID = #{xm}
     </select>
+    <select id="getNDYSBM" resultType="com.liang.vo.dto.Ndysbm">
+        SELECT bpb.mc,bpb.bm , bpt.XMLX
+        FROM
+            base_ProjectBudget bpb ,base_ProjectTemplate bpt
+        WHERE bpb.XM = bpt.ID
+          AND (bpb.MC = '总计'
+               OR bpb.MC = '（一）直接费'
+               OR bpb.MC = '1.人工费'
+               OR bpb.MC = '2.设备使用费'
+               OR bpb.MC = '3.业务费'
+               OR bpb.MC = '4.场地使用费'
+               OR bpb.MC = '（三）外委支出费')
+        order by xmlx
+    </select>
 </mapper>
 

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -529,6 +529,97 @@
         where
             NYS = #{nysId}
     </update>
+    <update id="updateZFXMFYMC">
+        update prj_AnnualBudgetDetail  set FYMC  = '（一）直接费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a15524497';
+        update prj_AnnualBudgetDetail  set FYMC  = '1、设备费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a155612437';
+        update prj_AnnualBudgetDetail  set FYMC  = '（1）购置设备费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a155639759';
+        update prj_AnnualBudgetDetail  set FYMC  = '（2）试制设备费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a155757605';
+        update prj_AnnualBudgetDetail  set FYMC  = '（3）设备改造与租赁费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a155830224';
+        update prj_AnnualBudgetDetail  set FYMC  = '2、材料费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a155903296';
+        update prj_AnnualBudgetDetail  set FYMC  = '3、测试实验加工费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160001888';
+        update prj_AnnualBudgetDetail  set FYMC  = '4、燃料动力费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160026901';
+        update prj_AnnualBudgetDetail  set FYMC  = '5、差旅费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160047208';
+        update prj_AnnualBudgetDetail  set FYMC  = '6、会议费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160100215';
+        update prj_AnnualBudgetDetail  set FYMC  = '7、国际合作与交流费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160112278';
+        update prj_AnnualBudgetDetail  set FYMC  = '8、出版/文献/信息传播/知识产权事务费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160131916';
+        update prj_AnnualBudgetDetail  set FYMC  = '9、劳务费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160425416';
+        update prj_AnnualBudgetDetail  set FYMC  = '10、专家咨询费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160458412';
+        update prj_AnnualBudgetDetail  set FYMC  = '11、其他支出' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160517974';
+        update prj_AnnualBudgetDetail  set FYMC  = '（二）间接费用' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160623545';
+        update prj_AnnualBudgetDetail  set FYMC  = '其中：绩效来源' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a160654304';
+        update prj_AnnualBudgetDetail  set FYMC  = '（三）外委支出费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100055750';
+        update prj_AnnualBudgetDetail  set FYMC  = '（1）外委支出费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a142751829';
+        update A
+        set  A.bm = B.bm, A.fj = B.fj
+            from prj_AnnualBudgetDetail A
+        inner join (
+         select bp.* from base_ProjectBudget bp ,prj_Project pp,base_ProjectTemplate bpt
+         where pp.xmlx = bpt.xmlx and bpt.id = bp.xm  and pp.id = #{rwsId}
+            ) B on A.FYMC = B.mc
+        where
+            NYS in ( SELECT id from prj_AnnualBudget where rws =  #{rwsId} );
+    </update>
+    <update id="updateSXGSKJXMFYMC">
+        UPDATE prj_AnnualBudgetDetail set bm = '7' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '6' and FYMC = '2.设备使用费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '8' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '7' and FYMC = '(1)仪器设备使用费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '9' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '8' and FYMC = '(2)软件使用费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '10' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '9' and FYMC = '3.业务费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '11' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '10' and FYMC = '(1)材料费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '12' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '11' and FYMC = '(2)资料、印刷及知识产权费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '13' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '12' and FYMC = '(3)会议、差旅及国际合作交流费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '14' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '17' and FYMC = '4.场地使用费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '15' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '18' and FYMC = '(1)场地物业费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '16' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '19' and FYMC = '(2)场地使用租金' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '17' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '20' and FYMC = '5.专家咨询费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '18' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '21' and FYMC = '（二）间接费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '19' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '22' and FYMC = '（三）外委支出费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '20' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '23' and FYMC = '1.外委研究支出费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '21' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '24' and FYMC = '2.仪器设备租赁费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '22' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '25' and FYMC = '3.外协测试试验与加工费' ;
+        UPDATE prj_AnnualBudgetDetail set bm = '23' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = '26' and FYMC = '（四）税金' ;
+        update A
+        set  A.fymc = B.mc, A.fj = B.fj
+            from prj_AnnualBudgetDetail A
+        inner join (
+         select bp.* from base_ProjectBudget bp ,prj_Project pp,base_ProjectTemplate bpt
+         where pp.xmlx = bpt.xmlx and bpt.id = bp.xm  and pp.id = #{rwsId}
+            ) B on A.bm = B.bm
+        where
+            NYS in ( SELECT id from prj_AnnualBudget where rws =  #{rwsId} );
+    </update>
+    <update id="updateGWGSKJXMFYMC">
+        update prj_AnnualBudgetDetail  set FYMC  = '（一）直接费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100002972';
+        update prj_AnnualBudgetDetail  set FYMC  = '1.人工费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100100606';
+        update prj_AnnualBudgetDetail  set FYMC  = '（1）专职研究人员人工费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100252246';
+        update prj_AnnualBudgetDetail  set FYMC  = '（2）劳务外包人员人工费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a10025555';
+        update prj_AnnualBudgetDetail  set FYMC  = '（3）临时性研究人员人工费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a094823724';
+        update prj_AnnualBudgetDetail  set FYMC  = '2.设备使用费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100124784';
+        update prj_AnnualBudgetDetail  set FYMC  = '（1）仪器设备使用费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a10033260';
+        update prj_AnnualBudgetDetail  set FYMC  = '（2）软件使用费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100335414';
+        update prj_AnnualBudgetDetail  set FYMC  = '3.业务费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100142605';
+        update prj_AnnualBudgetDetail  set FYMC  = '（1）材料费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100402638';
+        update prj_AnnualBudgetDetail  set FYMC  = '（2）资料，印刷及知识产权费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100404901';
+        update prj_AnnualBudgetDetail  set FYMC  = '（3）会议，差旅及国际合作交流费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100406974';
+        update prj_AnnualBudgetDetail  set FYMC  = '4.场地使用费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100145230';
+        update prj_AnnualBudgetDetail  set FYMC  = '（1）场地物业费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100529887';
+        update prj_AnnualBudgetDetail  set FYMC  = '（2）场地使用租金' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a10053223';
+        update prj_AnnualBudgetDetail  set FYMC  = '5.专家咨询费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100237514';
+        update prj_AnnualBudgetDetail  set FYMC  = '（二）间接费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a10055632';
+        update prj_AnnualBudgetDetail  set FYMC  = '（三）外委支出费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100604109';
+        update prj_AnnualBudgetDetail  set FYMC  = '1.外委研究支出费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a10063271';
+        update prj_AnnualBudgetDetail  set FYMC  = '2.仪器设备租赁费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a1006345';
+        update prj_AnnualBudgetDetail  set FYMC  = '3.外协测试试验与加工费' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100635599';
+        update prj_AnnualBudgetDetail  set FYMC  = '（四）税金' where nys in (SELECT id from prj_AnnualBudget where rws = #{rwsId} ) and bm = 'a100606333';
+        update A
+        set  A.bm = B.bm, A.fj = B.fj
+            from prj_AnnualBudgetDetail A
+        inner join (
+         select bp.* from base_ProjectBudget bp ,prj_Project pp,base_ProjectTemplate bpt
+         where pp.xmlx = bpt.xmlx and bpt.id = bp.xm  and pp.id = #{rwsId}
+            ) B on A.FYMC = B.mc
+        where
+            NYS in ( SELECT id from prj_AnnualBudget where rws =  #{rwsId} );
+    </update>
 
     <!--已申请费用的预算-->
     <select id="getFysqBudgetList">
@@ -575,5 +666,12 @@
         where RWS = #{rws}
           AND a.NF = #{nf}
     </select>
+
+
+
+
+
+
+
 </mapper>
 

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -14,8 +14,8 @@
         <result property="px" column="PX" jdbcType="VARCHAR"/>
         <result property="hjbm" column="HJBM" jdbcType="VARCHAR"/>
         <result property="bz" column="BZ" jdbcType="VARCHAR"/>
-        <result property="bndsqje" column="bndbzje" jdbcType="NUMERIC"/>
-        <result property="bndsqje" column="bndbzje" jdbcType="NUMERIC"/>
+        <result property="bndsqje" column="bndsqje" jdbcType="NUMERIC"/>
+        <result property="bndbzje" column="bndbzje" jdbcType="NUMERIC"/>
         <result property="dw1" column="DW1" jdbcType="NUMERIC"/>
         <result property="dw2" column="DW2" jdbcType="NUMERIC"/>
         <result property="dw3" column="DW3" jdbcType="NUMERIC"/>
@@ -625,11 +625,11 @@
         AND NYS=#{nys})
     </select>
     <select id="getYzxqk" resultType="com.liang.vo.PrjAnnualbudgetYzxqkVo">
-        SELECT convert(decimal(18,2),(sum(BZJE)/10000)) BZJE ,pa.fymc,sb.nf
-        from(SELECT	sb.id ,sb.fylb,pa.nf
-             from sta_BudgetApproval sb
-                 left join prj_AnnualBudget pa on pa.id = sb.nys
-             where	nys in (
+        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  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})
@@ -637,7 +637,7 @@
                  )) sb
                 left join sta_Reimbursement sa on sa.fysq = sb.id
                 LEFT join prj_AnnualBudgetDetail pa on pa.id = sb.fylb
-        group by pa.fymc,sb.nf
+        group by pa.fymc,sb.nf,sb.xmlx
         order by sb.nf asc
     </select>
     <select id="getNf" resultType="com.liang.vo.PrjAnnualbudgetYzxqkVo">

src/main/resources/templates/annualbudget/view_annualbudget.html

@@ -315,7 +315,7 @@
         //父级预算
         function setFjBudget(fj) {
             if (fj != null && fj != '') {
-                var xmzys = 0, xmz = 0, byj = 0, xtjsyzx = 0, sjyzx = 0;
+                var xmzys = 0, xmz = 0, byj = 0, xtjsyzx = 0, sjyzx = 0, bndsqje = 0, bndbzje = 0;
                 //子节点的值相加
                 for (var j = 0; j < dataBudget1.length; j++) {
                     if (fj == dataBudget1[j].fj) {
@@ -331,6 +331,12 @@
                         var t4 = parseFloat(dataBudget1[j].sjyzx);
                         if (!isNaN(t4))
                             sjyzx += t4;
+                        var t5 = parseFloat(dataBudget1[j].bndsqje);
+                        if (!isNaN(t5))
+                            bndsqje += t5;
+                        var t6 = parseFloat(dataBudget1[j].bndbzje);
+                        if (!isNaN(t6))
+                            bndbzje += t6;
                     }
                 }
                 //更新父节点的值
@@ -355,6 +361,15 @@
                         else
                             dataBudget1[j].ysje = ysje.toFixed(2);
 
+                        if (bndsqje == 0)
+                            dataBudget1[j].bndsqje = "";
+                        else
+                            dataBudget1[j].bndsqje = bndsqje.toFixed(2);
+
+                        if (bndbzje == 0)
+                            dataBudget1[j].bndbzje = "";
+                        else
+                            dataBudget1[j].bndbzje = bndbzje.toFixed(2);
                         setFjBudget(dataBudget1[j].fj);
                         break;
                     }