任务书填写项目预算关联子课题中单位分工中的各单位经费总和，两者必须保持一致

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

@@ -4,7 +4,9 @@ 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.entity.PrjCompletecompany;
 import com.liang.entity.PrjSubtopic;
+import com.liang.service.PrjCompletecompanyService;
 import com.liang.service.PrjSubtopicService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,6 +39,8 @@ public class PrjSubtopicController extends BaseController {
      */
     @Resource
     private PrjSubtopicService prjSubtopicService;
+    @Resource
+    private PrjCompletecompanyService prjCompletecompanyService;
 
     /**
      * 分页查询
@@ -86,7 +90,7 @@ public class PrjSubtopicController extends BaseController {
     @RequestMapping(value = "/list/{xm}", method = RequestMethod.POST)
     public BaseResult list(@PathVariable Integer xm) {
         List<PrjSubtopic> list = prjSubtopicService.getSubtopicList(xm);
-
+        List<PrjCompletecompany>prjCompletecompanyListFy=prjCompletecompanyService.getCompanyListFy(xm);
         PageInfo<PrjSubtopic> pageinfo = new PageInfo<>(list);
         //取出查询结果
         List<PrjSubtopic> rows = pageinfo.getList();
@@ -100,6 +104,7 @@ public class PrjSubtopicController extends BaseController {
 
         result.put(RESULT_ROWS, rows);
         result.put(RESULT_TOTAL, total);
+        result.put("prjCompletecompanyListFy",prjCompletecompanyListFy);
         result.put("sum", sum);
         System.out.println("sum:");
         System.out.println(sum);
@@ -117,7 +122,10 @@ public class PrjSubtopicController extends BaseController {
         List<Map<String, Object>> projectDate = prjSubtopicService.queryProjectDate(xm);
         SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd");
         Date rq = (Date) projectDate.get(0).get("WC");
+        Date qs = (Date) projectDate.get(0).get("QS");
         String wcrq = format.format(rq);
+        String qsrq = format.format(qs);
+        model.addAttribute("qsrq", qsrq);
         model.addAttribute("wcrq", wcrq);
         model.addAttribute("xm", xm);
         return "prjsubtopic/add";
@@ -160,6 +168,14 @@ public class PrjSubtopicController extends BaseController {
     @RequestMapping(value = "/forUpdate/{id}", method = RequestMethod.GET)
     public String forUpdate(Model model, @PathVariable Integer id) {
         PrjSubtopic subtopic = prjSubtopicService.queryById(id);
+        List<Map<String, Object>> projectDate = prjSubtopicService.queryProjectDate(subtopic.getXm());
+        SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd");
+        Date rq = (Date) projectDate.get(0).get("WC");
+        Date qs = (Date) projectDate.get(0).get("QS");
+        String wcrq = format.format(rq);
+        String qsrq = format.format(qs);
+        model.addAttribute("qsrq", qsrq);
+        model.addAttribute("wcrq", wcrq);
         model.addAttribute("subtopic", subtopic);
 
         return "prjsubtopic/update";

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

@@ -815,7 +815,7 @@ public class StaReimbursementController extends BaseController {
         paraMap.put("xmmc",formData.getXmmc());
         paraMap.put("erpbh",formData.getErpbh());
         List<StaReimbursement> reimburseList = staReimbursementService.getReimburseList(paraMap);
-        List<String> listName = Arrays.asList("名称", "审批状态", "费用申请编号","ERP编号", "报账金额(元)", "不含税金额(元)", "税费(元)", "报账人", "创建时间", "费用申请");
+        List<String> listName = Arrays.asList("名称", "审批状态", "费用申请编号","ERP编号", "报账金额(元)", "不含税金额(元)", "税费(元)", "报账人", "创建时间", "费用申请名称");
         List<Map<String, String>> list = new ArrayList<>();
         for (StaReimbursement reimbursement : reimburseList) {
             Map<String, String> map = new HashMap<>();

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

@@ -113,5 +113,7 @@ public interface PrjCompletecompanyDao {
      * @return
      */
     List<PrjCompletecompany> getCompanyList(Map map);
+
+    List<PrjCompletecompany> getCompanyListFy(Integer xm);
 }
 

src/main/java/com/liang/entity/PrjCompletecompany.java

@@ -1,5 +1,7 @@
 package com.liang.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @author makejava
  * @since 2023-03-10 11:21:40
  */
+@Data
 public class PrjCompletecompany implements Serializable {
     private static final long serialVersionUID = 925508725096854520L;
 
@@ -51,6 +54,10 @@ public class PrjCompletecompany implements Serializable {
     private Boolean sfzyzf;
     private String sfzyzfmc;
 
+    /**
+     * 子课题经费合计
+     */
+    private Double sumjf;
 
     public Integer getId() {
         return id;

src/main/java/com/liang/service/PrjCompletecompanyService.java

@@ -98,4 +98,6 @@ public interface PrjCompletecompanyService {
      * @return
      */
     int batchDeleteByXm(List<Integer> xmList);
+
+    List<PrjCompletecompany> getCompanyListFy(Integer xm);
 }

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

@@ -105,4 +105,9 @@ public class PrjCompletecompanyServiceImpl implements PrjCompletecompanyService
     public int batchDeleteByXm(List<Integer> xmList) {
         return this.prjCompletecompanyDao.batchDeleteByXm(xmList);
     }
+
+    @Override
+    public List<PrjCompletecompany> getCompanyListFy(Integer xm) {
+        return this.prjCompletecompanyDao.getCompanyListFy(xm);
+    }
 }

src/main/resources/mapper/PrjCompletecompanyDao.xml

@@ -257,4 +257,11 @@
             and DWMC like '%'+#{dwmc}+'%'
         </if>
     </select>
+    <select id="getCompanyListFy" resultType="com.liang.entity.PrjCompletecompany">
+        SELECT a.DWMC,b.SUMJF
+        FROM prj_CompleteCompany a
+        left JOIN (SELECT SUM(JF)AS SUMJF,DWMC FROM prj_DivisionCompany WHERE ZKT IN (SELECT ID FROM prj_SubTopic WHERE XM = #{xm}) GROUP  BY DWMC
+        ) b ON a.DWMC = b.DWMC
+        WHERE a.XM = #{xm}
+    </select>
 </mapper>

src/main/resources/templates/prjproject/add.html

@@ -1391,6 +1391,8 @@
 
         //子课题
         var dataSubtopic = new Array();
+        //子课题单位分工费用统计
+        var prjCompletecompanyListFy = new Array();
 
         function freshSubtopic() {
             $.ajax({
@@ -1400,6 +1402,7 @@
                 dataType: "json",
                 success: function (result) {
                     dataSubtopic = result.data.rows;
+                    prjCompletecompanyListFy =  result.data.prjCompletecompanyListFy;
 //年度预算总和
 
                     document.getElementById('rwsys').value = result.data.sum;
@@ -1658,8 +1661,6 @@
             budgetCols = [];
             budgetCols.push({type: 'numbers', width: '3%'});
             budgetCols.push({field: 'mc', width: '22%', title: '名称'});
-            // budgetCols.push({field: 'px', width: '8%', title: '排序'});
-            //budgetCols.push({field: 'nf', width: '8%', title: '年份'});
             budgetCols.push({field: 'ysje', width: '10%', title: '预算金额(万元)'});
             for (var i = 0; i < dataCompany.length; i++) {
                 budgetCols.push({
@@ -1672,9 +1673,6 @@
                     break;
             }
             ;
-            //budgetCols.push({field: 'hjbm', width: '10%', title: '合计编码'});
-            //budgetCols.push({field: 'bz', width: '10%', title: '备注'});
-
         }
 
         //项目预算
@@ -1975,6 +1973,19 @@
                 for (var i = 0; i < data.length; i++) {
                     getBudget(budgets, data[i]);
                 }
+                for (let i = 0; i < prjCompletecompanyListFy.length; i++) {
+                    if (prjCompletecompanyListFy[i].sumjf == null){
+                        prjCompletecompanyListFy[i].sumjf =0;
+                    }
+                    if ( budgets[0]['dw' + (i + 1)] == null ||  budgets[0]['dw' + (i + 1)] ==''){
+                        budgets[0]['dw' + (i + 1)] ==0;
+                    }
+                    if (budgets[0]['dw' + (i + 1)] != prjCompletecompanyListFy[i].sumjf ){
+                        alert("保存失败,"+prjCompletecompanyListFy[i].dwmc+'在子课题单位分工中所有经费总和为:'
+                            +prjCompletecompanyListFy[i].sumjf+'万元,请确保所填数据一致!!!')
+                        return false
+                    }
+                }
 
                 var index = layer.load(0, {shade: 0.1});
                 AjaxUtil.post({

src/main/resources/templates/prjproject/update.html

@@ -567,7 +567,7 @@
         var util = layui.util;
         var xmId = $("#id").val();
         var initFlag = 0;
-
+        var prjCompletecompanyListFy =new Array();
         //日期
         laydate.render({
             elem: '#qs',
@@ -1464,6 +1464,8 @@
             page: true,
             skin: 'grid',
             parseData: function (res) { //res 即为原始返回的数据
+                prjCompletecompanyListFy =  res.data.prjCompletecompanyListFy;
+                console.log(prjCompletecompanyListFy)
 //年度预算总和
                 document.getElementById('rwsys').value = res.data.sum;
                 document.getElementById('rwsys2').value = res.data.sum;
@@ -2002,6 +2004,20 @@
             for (var i = 0; i < data.length; i++) {
                 getBudget(budgets, data[i]);
             }
+            for (let i = 0; i < prjCompletecompanyListFy.length; i++) {
+                if (prjCompletecompanyListFy[i].sumjf == null){
+                    prjCompletecompanyListFy[i].sumjf =0;
+                }
+                if ( budgets[0]['dw' + (i + 1)] == null ||  budgets[0]['dw' + (i + 1)] ==''){
+                    budgets[0]['dw' + (i + 1)] ==0;
+                }
+                if (budgets[0]['dw' + (i + 1)] != prjCompletecompanyListFy[i].sumjf ){
+                    alert("保存失败,"+prjCompletecompanyListFy[i].dwmc+'在子课题单位分工中所有经费总和为:'
+                        +prjCompletecompanyListFy[i].sumjf+'万元,请确保所填数据一致!!!')
+                    return false
+                }
+            }
+            console.log(budgets)
             var index = layer.load(0, {shade: 0.1});
             // 添加修改记录请求
             AjaxUtil.post({