Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -30,6 +30,9 @@ public class SettementUtil {
     public static final String RESON_ZZJS="最终结算价";
     public static final String RESON_ZZFC="最终工程造价";
     public static final String RESON_ZGTB="最高投标限价";
+    public static final String RESON_FBFXGCF1="建筑工程费";
+    public static final String RESON_FBFXGCF2="安装工程费";
+
     /*
         分布分项比对
      */
@@ -124,6 +127,8 @@ public class SettementUtil {
     public static List<Settlement> getComparison(ImportExcel importExcel){
         List<JkxlAdjustFee> jkxlAdjustFees = BashInfo.getWsbFee(importExcel);
         boolean flag = false;//判断 是否是变电站
+        boolean flagTotal= true;//判断是否有分部分项
+        double countTotal=0.0;//安装/建筑合计金额
         Settlement settlement;
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();
@@ -160,7 +165,14 @@ public class SettementUtil {
                 key=BashInfo.JS_JGJS;
             }
             switch (key){
+                case RESON_FBFXGCF1:
+                    countTotal+=importExcel.getDouble(i+1,2);
+                    break;
+                case RESON_FBFXGCF2:
+                    countTotal+=importExcel.getDouble(i+1,2);
+                    break;
                 case BashInfo.JS_FBFX:
+                    flagTotal=false;
                     settlementList.add(getSettlement(settlement,key,importExcel,i));
                     break;
                 case BashInfo.JS_CBRF:
@@ -235,6 +247,12 @@ public class SettementUtil {
                     break;
             }
         }
+        if (flagTotal){
+            settlement=new Settlement();
+            settlement.setEntryName(BashInfo.JS_FBFX);
+            settlement.setMoney(countTotal);
+            settlementList.add(0,settlement);
+        }
         return settlementList;
     }
 
@@ -252,8 +270,8 @@ public class SettementUtil {
      */
     public static List<Settlement> getComparison(List<Settlement> settlements, double builtTotal, double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson){
         double wordtotal=wordtotal1+wordtotal2;//措施费相加
-        String name;//获取当前汇总表名称
-        double money;//获取当前汇总表金额
+        String name="";//获取当前汇总表名称
+        double money=0.0;//获取当前汇总表金额
         Settlement settlement;//对象
         double moneyComparison1;//范围金额+5.0元
         double moneyComparison2;//范围金额-5.0元

src/main/java/com/jeeplus/modules/sg/project/service/ItemService.java

@@ -73,10 +73,10 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
             itemMapper.updateItem(wbsItem);
             projectService.updateProjectNumber(wbsProject);
             j.setSuccess(true);
-            j.setMsg("删除项目成功!");
+            j.setMsg("删除结算书成功!");
         }catch (Exception e){
             j.setSuccess(false);
-            j.setMsg("删除项目失败!");
+            j.setMsg("删除结算书失败!");
         }
         return j;
     }

src/main/webapp/webpage/modules/sg/project/management.js

@@ -52,7 +52,7 @@ layui.config({
                             xml +="<div><a style='margin-top: 3px;' class='layui-btn layui-btn-primary layui-btn-xs' onclick=\"look( '${ctx}/project/form?id=" + d.id + "&tabId=1')\">查看</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加结算书</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteProject('"+d.id+"')\">删除</a>"
+                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger'  onclick=\"deleteProject('"+d.id+"')\">删除</a>"
                                 // +"<br>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/exportone?id=" + d.id+"\">单体工程导出</a>"
                                 +"<a style='margin-top: 3px;' class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a><div>";
@@ -63,7 +63,7 @@ layui.config({
                         }
                         if(d.status==3){ //项目类型
                             xml +="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>"
-                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteItem('" + d.id + "')\">删除</a>";
+                                +"<a style='margin-top: 3px;' class='layui-btn layui-btn-xs layui-btn-danger' id=del"+d.id+" onclick=\"deleteItem('" + d.id + "')\">删除</a>";
                         }
 
                         return xml;
@@ -230,7 +230,7 @@ function deleteItem(id) { //逻辑删除项目
                 success: function (data) {
                     if (data.success) {
                         layer.msg(data.msg, {icon: 6,offset:['40%','40%']},function () {
-                            window.location.reload();
+                            $("#del"+id).closest('tr').remove();
                         });
                     } else {
                         layer.msg(data.msg, {icon: 5,offset:['40%','40%']});