Merge remote-tracking branch 'origin/master'

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

@@ -78,6 +78,7 @@ public class SettementUtil {
      */
     public static final String RESON_FBRF="《工程项目竣工结算汇总表》中“发包人采购材料费”为<span style='font-weight: bold;'>xxx</span>元,";
     public static final String RESON_FBRF1="《分布分项工程量清单计价表》中“发包人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
+    public static final String RESON_FBRF2="《分布分项工程量清单计价表》中“招标人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
     //电缆
     public static final String RESON_DLFBRF1="《建筑分布分项工程量清单计价表》中“发包人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
     public static final String RESON_DLFBRF2="《安装分布分项工程量清单计价表》中“发包人采购汇总金额”为<span style='font-weight: bold;'>xxx</span>元,";
@@ -119,10 +120,6 @@ public class SettementUtil {
     public static final  String[] TOP2 = {BDZ_TBBJ,RESON_JGJS1,BDZ_TBBJ1,RESON_JGJS3, RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,BDZ_TBBJ2,RESON_JGJS8};
     //工程竣工 拼接数组
     public static final String[] TOP1 = {RESON_JGJS,RESON_JGJS1,RESON_JGJS2,RESON_JGJS3,RESON_JGJS4,RESON_JGJS5,RESON_JGJS6,RESON_JGJS7,RESON_JGJS8};
-//    //分部分项 架空 电缆
-//    String[] FBFXTOP1={RESON_FBFX1,RESON_JZFBFX,RESON_AZFBFX,RESON_GCJS4,RESON_FBFX1,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
-//    //分部分项 变电站
-//    String[] FBFXTOPS2= {BDZ_FXFX,BDZ_FBFX1,BDZ_FBFX2,RESON_GCJS4,BDZ_FXFX,RESON_JZFBFX3,RESON_AZFBFX3,RESON_GCJS4};
     /*
         设置转换参数
      */
@@ -242,6 +239,16 @@ public class SettementUtil {
         for (int i = 0; i < settlements.size(); i++) {
             settlement=settlements.get(i);
             name=settlement.getEntryName();
+            //读取字段区分
+            if(name.equals(BDZ_TBRNAME)){
+                name=BashInfo.JS_CBRF;
+            }
+            if (name.equals(BDZ_ZBRNAME)){
+                name=BashInfo.JS_FBRF;
+            }
+            if (name.equals(BDZ_TBNAME)){
+                name=BashInfo.JS_JGJS;
+            }
             money=settlement.getMoney();
             settlement.setStatus("1");
             switch (name){
@@ -513,18 +520,37 @@ public class SettementUtil {
      * @return 数据库匹配后返回  集合
      */
     public static List<Settlement> getSelectSettlement(List<Settlement> settlementList){
+        boolean flag = false;//定义开关
         boolean[] booleans =getJgforJoint(settlementList);
         String key="";
         String reason="";
         for(Settlement settlement:settlementList){
             key = settlement.getEntryName();
+            if (key.equals(BDZ_TBRNAME)){
+                flag=true;
+                key = BashInfo.JS_CBRF;
+            }
+            if (key.equals(BDZ_ZBRNAME)){
+                flag=true;
+                key=BashInfo.JS_FBRF;
+            }
+            if (key.equals(BDZ_TBNAME)){
+                flag=true;
+                key = BashInfo.JS_JGJS;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getFbfxJoint(settlement);
                     settlement.setReason(reason);
                     break;
                 case  BashInfo.JS_CBRF:
-                    reason = getJoint(RESON_CBRF,RESON_CBRF1,settlement);
+                    if(flag){
+                        settlement.setEntryName(BDZ_TBRNAME);
+                        reason = getJoint(BDZ_TBRCG,BDZ_TBRCG1,settlement);
+                        flag= false; //默认关闭
+                    }else {
+                        reason = getJoint(RESON_CBRF,RESON_CBRF1,settlement);
+                    }
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_CSXM:
@@ -544,11 +570,23 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_FBRF:
-                    reason=getJoint(RESON_FBRF,RESON_FBRF1,settlement);
+                    if(flag){
+                        settlement.setEntryName(BashInfo.JS_FBRF);
+                        reason=getJoint(BDZ_FBRF,RESON_FBRF2,settlement);
+                        flag= false; //默认关闭
+                    }else {
+                        reason=getJoint(RESON_FBRF,RESON_FBRF1,settlement);
+                    }
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_JGJS:
-                    reason = getJgJoint(TOP1,settlement,booleans);
+                    if(flag){
+                        settlement.setEntryName(BDZ_TBNAME);
+                        reason = getJgJoint(TOP2,settlement,booleans);
+                        flag = false;
+                    }else {
+                        reason = getJgJoint(TOP1,settlement,booleans);
+                    }
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_BZZS:
@@ -573,18 +611,37 @@ public class SettementUtil {
      * @return 数据库匹配后返回  集合
      */
     public static List<Settlement> getSelectDlSettlement(List<Settlement> settlementList){
+        boolean flag = false;//定义开关
         boolean[] booleans =getJgforJoint(settlementList);
         String key="";
         String reason="";
         for(Settlement settlement:settlementList){
             key = settlement.getEntryName();
+            if (key.equals(BDZ_TBRNAME)){
+                flag=true;
+                key = BashInfo.JS_CBRF;
+            }
+            if (key.equals(BDZ_ZBRNAME)){
+                flag=true;
+                key=BashInfo.JS_FBRF;
+            }
+            if (key.equals(BDZ_TBNAME)){
+                flag=true;
+                key = BashInfo.JS_JGJS;
+            }
             switch (key){
                 case BashInfo.JS_FBFX:
                     reason = getDJoint(settlement);
                     settlement.setReason(reason);
                     break;
                 case  BashInfo.JS_CBRF:
-                    reason = getJoint(RESON_CBRF,RESON_CBRF1,settlement);
+                    if(flag){
+                        settlement.setEntryName(BDZ_TBRNAME);
+                        reason = getJoint(BDZ_TBRCG,BDZ_TBRCG1,settlement);
+                        flag= false; //默认关闭
+                    }else {
+                        reason = getJoint(RESON_CBRF,RESON_CBRF1,settlement);
+                    }
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_CSXM:
@@ -604,11 +661,23 @@ public class SettementUtil {
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_FBRF:
-                    reason=getDlJoint(RESON_FBRF,RESON_DLFBRF1,RESON_DLFBRF2,settlement);
+                    if(flag){
+                        settlement.setEntryName(BDZ_ZBRNAME);
+                        reason=getDlJoint(BDZ_FBRF,BDZ_FBRF1,BDZ_FBRF2,settlement);
+                        flag = false;
+                    }else {
+                        reason=getDlJoint(RESON_FBRF,RESON_DLFBRF1,RESON_DLFBRF2,settlement);
+                    }
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_JGJS:
-                    reason = getJgJoint(TOP1,settlement,booleans);
+                    if(flag){
+                        settlement.setEntryName(BDZ_TBNAME);
+                        reason = getJgJoint(TOP2,settlement,booleans);
+                        flag =false;
+                    }else {
+                        reason = getJgJoint(TOP1,settlement,booleans);
+                    }
                     settlement.setReason(reason);
                     break;
                 case BashInfo.JS_BZZS:
@@ -634,12 +703,11 @@ public class SettementUtil {
      * @return 数据库匹配后返回  集合
      */
     public static List<Settlement> getSelectBdzSettlement(List<Settlement> settlementList){
-        boolean flag;//定义开关
+        boolean flag = false;//定义开关
         boolean[] booleans =getJgforJoint(settlementList);//判断读取存在字段
         String key=""; //匹配字段
         String reason=""; //提示 字段
         for(Settlement settlement:settlementList){
-            flag= false; //默认关闭
             key = settlement.getEntryName();
             //字段 匹配
             if (key.equals(BashInfo.JS_CBRF)){
@@ -663,6 +731,7 @@ public class SettementUtil {
                     if(flag){ //如果为true 变电站字段为工程竣工
                         settlement.setEntryName(BashInfo.JS_CBRF);
                         reason = getJoint(RESON_CBRF,RESON_CBRF1,settlement);
+                        flag= false; //默认关闭
                     }else {
                         reason = getJoint(BDZ_TBRCG,BDZ_TBRCG1,settlement);
                     }
@@ -688,6 +757,7 @@ public class SettementUtil {
                     if(flag){
                         settlement.setEntryName(BashInfo.JS_FBRF);
                         reason=getDlJoint(RESON_FBRF,RESON_DLFBRF1,RESON_DLFBRF2,settlement);
+                        flag= false; //默认关闭
                     }else {
                         reason=getDlJoint(BDZ_FBRF,BDZ_FBRF1,BDZ_FBRF2,settlement);
                     }
@@ -697,6 +767,7 @@ public class SettementUtil {
                     if(flag){
                         settlement.setEntryName(BashInfo.JS_JGJS);
                         reason = getJgJoint(TOP1,settlement,booleans);
+                        flag= false; //默认关闭
                     }else {
                         reason = getJgJoint(TOP2,settlement,booleans);
                     }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -145,7 +145,7 @@
 		parent_node AS parentNode,
 		create_date AS createDate
 		FROM sg_wbs_item
-		WHERE item_name = #{itemName} and project_id =#{projectId}
+		WHERE item_name = #{itemName} and project_id =#{projectId} and del_flag = 0
 	</select>
 
 	<!--<delete id="deleteItem" parameterType="String">-->

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

@@ -26,6 +26,7 @@
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01
+        ,time:false
         ,offset:['35%','36%']
     });
     $.ajax({

src/main/webapp/webpage/modules/sg/projecttem/addItem.js

@@ -22,6 +22,7 @@ function doSubmit(obj){ // 添加项目提交方法
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01
+        ,time:false
         ,offset:['37%','36%']
     });
    $.ajax({

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.js

@@ -159,6 +159,7 @@ function okSubmit() {
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01
+        ,time:false
         ,offset:['40%','40%']
     });
     //提交表单内容到后台
@@ -177,7 +178,7 @@ function okSubmit() {
                     window.location.href="${ctx}/project/tem/list?projectId="+data.id;
                 });
             }else {
-                layer.alert(data.msg, {icon: 6})
+                layer.alert(data.msg, {icon: 6,offset:['40%','40%']})
             }
         }
     });