陕西项目外委费

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

@@ -349,8 +349,11 @@ public class PrjProjectController extends BaseController {
     public BaseResult updateSpzt(@RequestBody String strData) {
         PrjProject rws = JsonTool.parseObject(strData, PrjProject.class);
         int num = prjProjectService.updateSpzt(rws);
+        PrjProject prjProject = prjProjectService.queryById(rws.getId());
         //审批结束时 更新任务书预算
-        if (StringUtils.isNotBlank(rws.getSpzt()) && "审批结束".equals(rws.getSpzt())) {
+        if (StringUtils.isNotBlank(rws.getSpzt())
+                && "审批结束".equals(rws.getSpzt())
+                && prjProject.getXmlx().equals("s2")) {
 
             List<PrjCompletecompany> prjCompletecompanies = prjCompletecompanyDao.queryByXM(rws.getId());
             String DW = "";
@@ -368,7 +371,14 @@ public class PrjProjectController extends BaseController {
                 BigDecimal WWYJZCF = null;
                 if (StringUtils.isNotBlank(DW)) {
                     int updateNum = prjAnnualbudgetdetailDao.updateRWSYS(rws.getId(), DW);
-                    WWYJZCF = prjAnnualbudgetdetailDao.selectWWYJZCF(rws.getId(), DW);
+                    if (prjProject.getXmlx().equals("s1")) {
+                        //陕西项目
+                        WWYJZCF = prjAnnualbudgetdetailDao.selectWWYJZCF_SX(rws.getId(), DW);
+                    }
+                    if (prjProject.getXmlx().equals("s2")) {
+                        //国网项目
+                        WWYJZCF = prjAnnualbudgetdetailDao.selectWWYJZCF_GW(rws.getId());
+                    }
                 } else {
                     //没有陕西国网支出 清空年度预算
                     prjAnnualbudgetdetailDao.updateNDYS(rws.getId());

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

@@ -106,7 +106,7 @@ public interface PrjAnnualbudgetdetailDao {
 
     int updateWWYJZCF(@Param("id") Integer id, @Param("WWYJZCF") BigDecimal WWYJZCF);
 
-    BigDecimal selectWWYJZCF(@Param("id") Integer id, @Param("DW") String DW);
+    BigDecimal selectWWYJZCF_SX(@Param("id") Integer id, @Param("DW") String DW);
 
     BigDecimal selectXMZYS(Integer id);
 
@@ -115,5 +115,7 @@ public interface PrjAnnualbudgetdetailDao {
     void updateNDYS(Integer id);
 
     void updateWWYJZCFSUM(Integer id);
+
+    BigDecimal selectWWYJZCF_GW(Integer id);
 }
 

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -532,12 +532,21 @@
           and BM not in (select distinct FJ from prj_AnnualBudgetDetail where FJ != ''
           AND NYS=#{nys})
     </select>
-    <select id="selectWWYJZCF" resultType="java.math.BigDecimal">
+    <select id="selectWWYJZCF_GW" resultType="java.math.BigDecimal">
+        SELECT  SUM(SKJE)
+        from
+            (SELECT ID ,ZB from prj_feescheme  where ZB = #{id} and DWMC  LIKE  '%国网陕西省电力%' )pf
+                left join prj_UndertakeCompany pu on pu.ZB = pf.ID
+        where
+            pu.DWMC not LIKE  '%国网陕西省电力%'
+    </select>
+    <select id="selectWWYJZCF_SX" resultType="java.math.BigDecimal">
         SELECT YSJE - ${DW} + (select ${DW} from prj_Budget where XM = #{id} and mc = '1.外委研究支出费')
         from prj_Budget
         where XM = #{id}
           and MC = '总计'
     </select>
+
     <select id="selectXMZYS" resultType="java.math.BigDecimal">
 
         SELECT SUM(CZJE)

target/classes/templates/annualbudget/add_apply.html

@@ -177,7 +177,7 @@
                                 <div class="layui-btn-group" style="margin-bottom: -8px">
                                     <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subAdd3"><i class="layui-icon"></i>新建</button>
                                     <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subEdit3"><i class="layui-icon"></i>编辑</button>
-                                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subView3"><i class="layui-icon">&#xe63c;</i>查看</button>
+                                    <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subView3"><i class="layui-icon">&#xe63c;</i>查看s</button>
                                     <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm" lay-filter="subDelete3"><i class="layui-icon"></i>删除</button>
                                 </div>
                                 <table class="layui-hide" id="currentTableId3" name="currentTableId3" lay-filter="currentTableFilter3" style="padding-top: 0px;margin-top: 0px"></table>
@@ -2626,6 +2626,7 @@
                 [
                     {type: "checkbox", align: 'center'},
                     {type: 'numbers', align: 'center'},
+                    {field: 'xh',title: '序号',width: '3%'},
                     {field: 'zlmc', title: '资料名称', width: '15%'},
                     {field: 'dcys', title: '单册页数', width: '15%'},
                     {field: 'dycs', title: '打印册数', width: '20%'},
@@ -2662,6 +2663,9 @@
                 }
             });
         });
+
+
+
         // 监听编辑按钮（印刷费）
         $("button[lay-filter='subEditdyf']").click(function(){
             var oldData = table.cache["currentTableId_Dyf"];
@@ -2701,9 +2705,8 @@
                                 }
                             }
                             //刷新表格
-                            var currData = oldData;
                             table.reload('currentTableId_Dyf', {
-                                data: currData
+                                data: oldData
                             });
                         }
                     }
@@ -2744,7 +2747,7 @@
             }
         });
         // 监听删除按钮（印刷费）
-        $("button[lay-filter='subDeletedyf']").click(function(){
+/*        $("button[lay-filter='subDeletedyf']").click(function(){
             var oldData = table.cache["currentTableId_Dyf"];
             if(oldData.length == 0)
                 return;
@@ -2764,9 +2767,31 @@
             }
             //刷新表格
             var currData = oldData;
+            console.log(currData);
             table.reload('currentTableId_Dyf', {
                 data: currData
             });
+        });*/
+        $("button[lay-filter='subDeletedyf']").click(function(){
+            var oldData = table.cache["currentTableId_Dyf"];
+            if(oldData.length === 0) {
+                return;
+            }
+
+            var newData = oldData.filter(function(item){
+                return !item.LAY_CHECKED;
+            });
+
+            if (newData.length === oldData.length) {
+                Message.warning("请选择要删除的印刷费！", 1500);
+                return;
+            }
+
+            table.reload('currentTableId_Dyf', {
+                data: newData
+            });
+            console.log(newData);
+            console.log(data)
         });
 
 //双击（印刷费）
@@ -3431,9 +3456,9 @@
                                 for (const item of curData) {
                                     var expense = {
                                         "zb": fyId,
-                                        "fysq": item.fysq,
+/*                                        "fysq": item.fysq,
                                         "kyfh": item.kyfh,
-                                        "bzfy": item.bzfy,
+                                        "bzfy": item.bzfy,*/
                                         "tsmc": item.tsmc,
                                         "cbs": item.cbs,
                                         "sl": item.sl,