2019-09-17 13:45

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -398,8 +398,7 @@ public List<JkxlDetailFee> findList(String id,String type){
        double feescount =  ExcelUtil.getDouble(gf,BashInfo.QT_HJ,0,4);//获取规费合计
        //数据核验并保存数据库
         double wordtotal2 =  0.0;
-        List<Settlement> settlements=SettementUtil.getComparison(settlementList,builtTotal,divisiontotal,wordtotal1,wordtotal2,otherTotal,feescount,cbperson);
-        settlementService.save(settlements,id);
+        //-------------------------
       //获取未识别费用
         List<JkxlAdjustFee> wsbFees = BashInfo.getWsbFee(total);
         double wsbfee = 0.00;
@@ -421,6 +420,9 @@ public List<JkxlDetailFee> findList(String id,String type){
        double zg = zjgcTotal-(aqwmFees[1]/(aqwmFees[0]/100));
        double jxsl = zg/(fbrFee-zg); //进项税率
        boolean flag = BashInfo.getFlag(originalTotalFees,zjgcFees);
+       //结算汇总
+        List<Settlement> settlements=SettementUtil.getComparison(settlementList,builtTotal,divisiontotal,wordtotal1,wordtotal2,otherTotal,feescount,cbperson,flag);
+        settlementService.save(settlements,id);
        //将本体工程费用明细存入集合
        List<JkxlDetailFee> list = new ArrayList<>();
        for(int i=0;i<originalTotalFees.length;i++){
@@ -577,9 +579,7 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[] builtTotal={built1Total,0.00};
             double[] division1total=ExcelUtil.getDoubleArray(jzqd,BashInfo.DLJZ,2,comlumn2);//建筑分部分项比对数据清单合计
             double[] division = {division1total[0],division1total[1],0.00,0.00};
-            List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson);
-            //数据核验并保存数据库
-            settlementService.save(dlSettlements,id);
+            //---结算取值汇总结束
             double[] originalTotalJzFees = ExcelUtil.getDoubleArray(jzhz,BashInfo.HZ_JZ,1,2); //获取建筑合计费
             double[] zjgcJzFees = ExcelUtil.getDoubleArray(jzhz,BashInfo.HZ_JZ,1,3);  //获取建筑直接工程费
             double[][] originalJzFees = ExcelUtil.getDoubleArrays(jzqd,BashInfo.MX_JZ,2, new int[]{13, 14, 15, 17}); //获取建筑原始费用
@@ -592,6 +592,10 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jxslJz = zgJz/(fbrJzFee-zgJz); //建筑进项税率
             }
             boolean flag = BashInfo.getFlag(originalTotalJzFees,zjgcJzFees);
+            //电缆结算汇总
+            List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson,flag);
+            //数据核验并保存数据库
+            settlementService.save(dlSettlements,id);
             for(int i=0;i<originalTotalJzFees.length;i++){
                 JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
                 double originalTotalCost = originalTotalJzFees[i]; //原合计
@@ -650,9 +654,7 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[] builtTotal={0.00,built2Total};
             double[] division2total=ExcelUtil.getDoubleArray(azqd,BashInfo.DLAZ,2,comlumn2);//安装分部分项比对数据清单合计
             double[] division = {0.00,0.00,division2total[0],division2total[1]};
-            List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson);
-            //数据核验并保存数据库
-            settlementService.save(dlSettlements,id);
+           //结算汇总取值结束
             double[] originalTotalAzFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,2); //获取安装合计费
             double[] zjgcAzFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,3);  //获取安装直接工程费
             double[] rgFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,4);  //人工费
@@ -666,6 +668,10 @@ public List<JkxlDetailFee> findList(String id,String type){
                 jxslAz = zgAz/(fbrAzFee-zgAz); //安装进项税率
             }
             boolean flag = BashInfo.getFlag(originalTotalAzFees,zjgcAzFees);
+            //结算汇总
+            List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson,flag);
+            //数据核验并保存数据库
+            settlementService.save(dlSettlements,id);
             for(int i=0;i<originalTotalAzFees.length;i++){
                 JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();
                 double originalTotalCost = originalTotalAzFees[i]; //原合计
@@ -726,9 +732,7 @@ public List<JkxlDetailFee> findList(String id,String type){
             double[] division1total=ExcelUtil.getDoubleArray(jzqd,BashInfo.DLJZ,2,comlumn2);//建筑分部分项比对数据清单合计
             double[] division2total=ExcelUtil.getDoubleArray(azqd,BashInfo.DLAZ,2,comlumn2);//安装分部分项比对数据清单合计
             double[] division = {division1total[0],division1total[1],division2total[0],division2total[1]};
-            List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson);
-            //数据核验并保存数据库
-            settlementService.save(dlSettlements,id);
+            //结算汇总结束
             double[] originalTotalJzFees = ExcelUtil.getDoubleArray(jzhz,BashInfo.HZ_JZ,1,2); //获取建筑合计费
             double[] originalTotalAzFees = ExcelUtil.getDoubleArray(azhz,BashInfo.HZ_AZ,1,2); //获取安装合计费
             double[] zjgcJzFees = ExcelUtil.getDoubleArray(jzhz,BashInfo.HZ_JZ,1,3);  //获取建筑直接工程费
@@ -754,6 +758,13 @@ public List<JkxlDetailFee> findList(String id,String type){
             }
             boolean flagJz = BashInfo.getFlag(originalTotalJzFees,zjgcJzFees);
             boolean flagAz = BashInfo.getFlag(originalTotalAzFees,zjgcAzFees);
+            boolean flag = false;
+            if(flagJz && flagAz){
+                flag = true;
+            }
+            List<Settlement> dlSettlements = SettementUtil.getDLComparison(settlementList,builtTotal,division,word1total,word2total,otherDlTotal,feesDlCount,cbperson,flag);
+            //数据核验并保存数据库
+            settlementService.save(dlSettlements,id);
             //将本体工程费用明细存入集合
             for(int i=0;i<originalTotalJzFees.length;i++){
                 JkxlDetailFee jkxlDetailFee = new JkxlDetailFee();

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

@@ -229,13 +229,16 @@ public class SettementUtil {
      * @param otherTotal 获取其他项目费合计
      * @param feescount 获取规费合计
      * @param cbperson 获取承包人采购合计
+     * @param opinion 判断是否减去发包人
      * @return 导入架空项目校验后的集合。
      */
-    public static List<Settlement> getComparison(List<Settlement> settlements, double builtTotal, double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson){
+    public static List<Settlement> getComparison(List<Settlement> settlements, double builtTotal, double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson,boolean opinion){
         double wordtotal=wordtotal1+wordtotal2;//措施费相加
         String name;//获取当前汇总表名称
         double money;//获取当前汇总表金额
         Settlement settlement;//对象
+        double moneyComparison1;//范围金额+5.0元
+        double moneyComparison2;//范围金额-5.0元
         for (int i = 0; i < settlements.size(); i++) {
             settlement=settlements.get(i);
             name=settlement.getEntryName();
@@ -250,34 +253,51 @@ public class SettementUtil {
                 name=BashInfo.JS_JGJS;
             }
             money=settlement.getMoney();
+            moneyComparison1 = money+5.0;
+            moneyComparison2 = money-5.0;
             settlement.setStatus("1");
             switch (name){
                 case BashInfo.JS_FBFX:
-                    if (money==builtTotal&&money==divisiontotal[0]){
+//                    if (money==builtTotal&&money==divisiontotal[0]){
+//                        settlement.setStatus("0");
+//                    }
+                    if(builtTotal<=moneyComparison1&&builtTotal>=moneyComparison2&&divisiontotal[0]<=moneyComparison1&&divisiontotal[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(builtTotal)+","+nf.format(divisiontotal[0])));
                     break;
                 case  BashInfo.JS_CBRF:
-                    if(money==cbperson){
+//                    if(money==cbperson){
+//                        settlement.setStatus("0");
+//                    }
+                    if(cbperson<=moneyComparison1&&cbperson>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
                     break;
                 case BashInfo.JS_CSXM:
-                    if (money==wordtotal){
+//                    if (money==wordtotal){
+//                        settlement.setStatus("0");
+//                    }
+                    if(wordtotal<=moneyComparison1&&wordtotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(wordtotal1)+","+nf.format(wordtotal2)+","+nf.format(wordtotal)));
                     break;
                 case BashInfo.JS_QTXM:
-                    if(money==otherTotal){
+//                    if(money==otherTotal){
+//                        settlement.setStatus("0");
+//                    }
+                    if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(otherTotal)));
                     break;
                 case BashInfo.JS_GF:
-                    if (money==feescount){
+//                    if (money==feescount){
+//                        settlement.setStatus("0");
+//                    }
+                    if (feescount<=moneyComparison1&&feescount>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(feescount)));
@@ -287,14 +307,20 @@ public class SettementUtil {
                     settlement.setTheAmount(String.valueOf(nf.format(money)));
                     break;
                 case BashInfo.JS_FBRF:
-                    if(money==divisiontotal[1]){
+//                    if(money==divisiontotal[1]){
+//                        settlement.setStatus("0");
+//                    }
+                    if(divisiontotal[1]<=moneyComparison1&&divisiontotal[1]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisiontotal[1])));
                     break;
                 case BashInfo.JS_JGJS:
-                    double[] doubles = getJgjsComparison(settlements);
-                    if (money==doubles[0]){
+                    double[] doubles = getJgjsComparison(settlements,opinion);
+//                    if (money==doubles[0]){
+//                        settlement.setStatus("0");
+//                    }
+                    if (doubles[0]<=moneyComparison1&&doubles[1]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles[0])+','+nf.format(doubles[1])+','+nf.format(doubles[2])+','+nf.format(doubles[3])
@@ -312,7 +338,10 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_GCJS:
                     double[] gcComparison =getGcComparison(settlements);
-                    if (money==gcComparison[0]){
+//                    if (money==gcComparison[0]){
+//                        settlement.setStatus("0");
+//                    }
+                    if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String gc = String.valueOf(nf.format(gcComparison[0])+','+
@@ -337,13 +366,16 @@ public class SettementUtil {
      * @param otherTotal  其他项目费
      * @param feescount   规费
      * @param cbperson    发包人 /  招标人 费用
+     * @param opinion  //判断是否减去发包人
      * @return  电缆/变电站 项目 导入后 校验规则  list集合
      */
-    public static List<Settlement> getDLComparison(List<Settlement> settlements, double builtTotal[], double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson){
+    public static List<Settlement> getDLComparison(List<Settlement> settlements, double builtTotal[], double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson,boolean opinion){
         double wordtotal=wordtotal1+wordtotal2;//措施费相加
         String name;//获取当前汇总表名称
         double money;//获取当前汇总表金额
         Settlement settlement;//对象
+        double moneyComparison1;//范围金额+5.0元
+        double moneyComparison2;//范围金额-5.0元
         for (int i = 0; i < settlements.size(); i++) {
             settlement=settlements.get(i);
             name=settlement.getEntryName();
@@ -359,19 +391,27 @@ public class SettementUtil {
             }
             //获取金额
             money=settlement.getMoney();
+            moneyComparison1 = money+5.0;
+            moneyComparison2 = money-5.0;
             //默认初始状态为 1-不一致
             settlement.setStatus("1");
             switch (name){
                 case BashInfo.JS_FBFX:
                     double division=divisiontotal[0]+divisiontotal[2];//分工清单分部分项
                     double built = builtTotal[0]+builtTotal[1];//安装合计总金额
-                    if (money==built&&money==division){
+//                    if (money==built&&money==division){
+//                        settlement.setStatus("0");
+//                    }
+                    if(built<=moneyComparison1&&built>=moneyComparison2&&division<=moneyComparison1&&division>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(built)+","+nf.format(division)+","+nf.format(builtTotal[0])+","+nf.format(builtTotal[1])+","+nf.format(divisiontotal[0])+","+nf.format(divisiontotal[2])));
                     break;
                 case  BashInfo.JS_CBRF:
-                    if(money==cbperson){
+//                    if(money==cbperson){
+//                        settlement.setStatus("0");
+//                    }
+                    if(cbperson<=moneyComparison1&&cbperson>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(cbperson)));
@@ -386,10 +426,16 @@ public class SettementUtil {
                     if(money==otherTotal){
                         settlement.setStatus("0");
                     }
+                    if(otherTotal<=moneyComparison1&&otherTotal>=moneyComparison2){
+                        settlement.setStatus("0");
+                    }
                     settlement.setTheAmount(String.valueOf(nf.format(otherTotal)));
                     break;
                 case BashInfo.JS_GF:
-                    if (money==feescount){
+//                    if (money==feescount){
+//                        settlement.setStatus("0");
+//                    }
+                    if (feescount<=moneyComparison1&&feescount>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(feescount)));
@@ -400,14 +446,20 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_FBRF:
                     double divisionFbr =divisiontotal[1]+divisiontotal[3];
-                    if(money==divisionFbr){
+//                    if(money==divisionFbr){
+//                        settlement.setStatus("0");
+//                    }
+                    if(divisionFbr<=moneyComparison1&&divisionFbr>=money){
                         settlement.setStatus("0");
                     }
                     settlement.setTheAmount(String.valueOf(nf.format(divisionFbr)+","+nf.format(divisiontotal[1])+","+nf.format(divisiontotal[3])));
                     break;
                 case BashInfo.JS_JGJS:
-                    double[] doubles = getJgjsComparison(settlements);
-                    if (money==doubles[0]){
+                    double[] doubles = getJgjsComparison(settlements,opinion);
+//                    if (money==doubles[0]){
+//                        settlement.setStatus("0");
+//                    }
+                    if (doubles[0]<=moneyComparison1&&doubles[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String str = String.valueOf(nf.format(doubles[0])+','+nf.format(doubles[1])+','+nf.format(doubles[2])+','+nf.format(doubles[3])
@@ -425,7 +477,10 @@ public class SettementUtil {
                     break;
                 case BashInfo.JS_GCJS:
                     double[] gcComparison =getGcComparison(settlements);
-                    if (money==gcComparison[0]){
+//                    if (money==gcComparison[0]){
+//                        settlement.setStatus("0");
+//                    }
+                    if (gcComparison[0]<=moneyComparison1&&gcComparison[0]>=moneyComparison2){
                         settlement.setStatus("0");
                     }
                     String gc = String.valueOf(nf.format(gcComparison[0])+','+
@@ -442,9 +497,10 @@ public class SettementUtil {
     /**
      * 架空、电缆、变电站 竣工结算/工程投标 合计计算
      * @param settlements 《工程项目投标报价汇总表》/《工程项目结算汇总表》 集合
+     * @param opinion //判断是否减去发包人
      * @return double[] 计算匹配数据集合
      */
-    public static double[] getJgjsComparison(List<Settlement> settlements){
+    public static double[] getJgjsComparison(List<Settlement> settlements,boolean opinion){
         double[] doubles = new double[8];
         String name;
         double money=0;
@@ -484,7 +540,11 @@ public class SettementUtil {
                     doubles[7]=money;
             }
         }
-        doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7];
+        if (opinion){
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6]-doubles[7];
+        }else {
+            doubles[0]=doubles[1]+doubles[2]+doubles[3]+doubles[4]+doubles[5]+doubles[6];
+        }
         return doubles;
     }
     /**

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -132,8 +132,7 @@ public class SubstationService {
             double[] division1total=ExcelUtil.getDoubleArray(jzqd,SubstationInfo.JZMX_BJZ,2,comlumn2);//建筑分部分项比对数据清单合计
             double[] division2total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,2,comlumn2);//安装分部分项比对数据清单合计
             double[] division = {division1total[0],division1total[1],division2total[0],division2total[1]};
-            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson);
-            settlementService.save(settlementBdzs,id);
+            //结算取值汇总结束
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,3);//安装直接工程费合计
 //            double csJzFee = SubstationInfo.getCsJzFee(csqd2);//建筑措施分摊费
@@ -217,6 +216,13 @@ public class SubstationService {
             azTotal.addAll(zwtx);
             boolean flagJz = SubstationInfo.getFlag(jzTotal);
             boolean flagAz = SubstationInfo.getFlag(azTotal);
+            boolean flag = false;
+            if(flagJz && flagAz){
+                flag = true;
+            }
+            //结算汇总
+            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson,flag);
+            settlementService.save(settlementBdzs,id);
             for(JkxlDetailFee jkxlDetailFee:jzTotal){
                  double originalTotalCost = jkxlDetailFee.getOriginalTotalCost();
                  double originalFbrCost = jkxlDetailFee.getOriginalFbrCost();
@@ -335,8 +341,7 @@ public class SubstationService {
             double[] builtTotal={built1Total,0.00};
             double[] division1total=ExcelUtil.getDoubleArray(jzqd,SubstationInfo.JZMX_BJZ,2,comlumn2);//建筑分部分项比对数据清单合计
             double[] division = {division1total[0],division1total[1],0.00,0.00};
-            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson);
-            settlementService.save(settlementBdzs,id);
+            //结算汇总取值结束
             double zjgcJzTotal = ExcelUtil.getDouble(jzhz,SubstationInfo.QT_HJ,0,3);//建筑直接工程费合计
 //            double csJzFee = SubstationInfo.getCsJzFee(csqd2);//建筑措施分摊费
 //            double tbrJzFee = BashInfo.getFbrJzFee(tbrsb); //投标人建筑费
@@ -374,6 +379,9 @@ public class SubstationService {
             jzTotal.add(zqlh);
             jzTotal.addAll(dxgc);
             boolean flagJz = SubstationInfo.getFlag(jzTotal);
+            //结算汇总保存
+            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson,flagJz);
+            settlementService.save(settlementBdzs,id);
             for(JkxlDetailFee jkxlDetailFee:jzTotal){
                 double originalTotalCost = jkxlDetailFee.getOriginalTotalCost();
                 double originalFbrCost = jkxlDetailFee.getOriginalFbrCost();
@@ -452,8 +460,7 @@ public class SubstationService {
             double[] builtTotal={0.00,built2Total};
             double[] division2total=ExcelUtil.getDoubleArray(azqd,SubstationInfo.AZMX_BDZAZ,2,comlumn2);//安装分部分项比对数据清单合计
             double[] division = {0.00,0.00,division2total[0],division2total[1]};
-            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson);
-            settlementService.save(settlementBdzs,id);
+            //结算汇总取值结束
             double zjgcAzTotal = ExcelUtil.getDouble(azhz,SubstationInfo.QT_HJ,0,3);//安装直接工程费合计
 //            double csAzFee = SubstationInfo.getCsAzFee(csqd2);//安装措施分摊费
 //            double tbrAzFee = BashInfo.getFbrAzFee(tbrsb); //投标人安装费
@@ -496,6 +503,8 @@ public class SubstationService {
             azTotal.addAll(zwdy);
             azTotal.addAll(zwtx);
             boolean flagAz = SubstationInfo.getFlag(azTotal);
+            List<Settlement> settlementBdzs = SettementUtil.getDLComparison(settlementsBdz,builtTotal,division,word1total,word2total,otherBdzTotal,feesBdzCount,cbperson,flagAz);
+            settlementService.save(settlementBdzs,id);
             for(JkxlDetailFee jkxlDetailFee:azTotal){
                 double originalTotalCost = jkxlDetailFee.getOriginalTotalCost();
                 double originalFbrCost = jkxlDetailFee.getOriginalFbrCost();

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

@@ -23,6 +23,14 @@
             layer.msg("请输入项目名称",{icon:3});
             throw SyntaxError;
         }
+        if($("#inputNumber").val()==null||$("#inputNumber").val()==""){
+            layer.msg("请输入项目编号",{icon:3});
+            throw SyntaxError;
+        }
+        if($("#inputUnit").val()==null||$("#inputUnit").val()==""){
+            layer.msg("请输入施工单位",{icon:3});
+            throw SyntaxError;
+        }
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01

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

@@ -44,15 +44,15 @@
                 </td>
             </tr>
             <tr>
-                <td>项目编号</td>
+                <td>*项目编号</td>
                 <td>
-                    <input type="text" name="itemNo" autocomplete="off" class="layui-input">
+                    <input type="text" name="itemNo" autocomplete="off" class="layui-input" id="inputNumber">
                 </td>
             </tr>
             <tr>
-                <td>施工单位</td>
+                <td>*施工单位</td>
                 <td>
-                    <input type="text" name="unit" autocomplete="off" class="layui-input">
+                    <input type="text" name="unit" autocomplete="off" class="layui-input" id="inputUnit">
                 </td>
             </tr>
             </tbody>

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

@@ -19,6 +19,14 @@ function doSubmit(obj){ // 添加项目提交方法
        layer.msg("请输入项目名称",{icon:3});
        throw SyntaxError;
    }
+    if($("#inputNumber").val()==null||$("#inputNumber").val()==""){
+        layer.msg("请输入项目编号",{icon:3});
+        throw SyntaxError;
+    }
+    if($("#inputUnit").val()==null||$("#inputUnit").val()==""){
+        layer.msg("请输入施工单位",{icon:3});
+        throw SyntaxError;
+    }
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01

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

@@ -36,10 +36,10 @@
                 <td>*项目名称</td><td><input type="text" name="itemName" autocomplete="off" class="layui-input" id="inputwrite"></td>
             </tr>
             <tr>
-                <td>项目编号</td><td><input type="text" name="itemNo" autocomplete="off" class="layui-input"></td>
+                <td>*项目编号</td><td><input type="text" name="itemNo" autocomplete="off" class="layui-input" id="inputNumber"></td>
             </tr>
             <tr>
-                <td>施工单位</td><td><input type="text" name="unit" autocomplete="off" class="layui-input"></td>
+                <td>*施工单位</td><td><input type="text" name="unit" autocomplete="off" class="layui-input" id="inputUnit"></td>
             </tr>
             </tbody>
         </table>

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

@@ -66,6 +66,11 @@ function okSubmit() {
     var div1 =  document.getElementsByClassName("mydiv1");
     //获取项目类型
     var select1=document.getElementsByClassName("myselect");
+    // 获取项目编号
+    var div2 =  document.getElementsByClassName("mydiv2");
+    // 获取施工单位
+    var div3 =  document.getElementsByClassName("mydiv3");
+
     //判断列表中项目名称是否为空
     if (div1.length<=0){
         layer.msg("请输入项目名称",{icon: 3,offset:['40%','40%']});
@@ -88,7 +93,7 @@ function okSubmit() {
     }
     //判断项目名称是否重复
     for (var i = 0; i < divvalue.length; i++) {
-        if (divvalue[i]=="请输入项目名称"){
+        if (divvalue[i]==""||divvalue[i]==null){
             layer.msg("请输入项目名称",{icon: 3,offset:['40%','40%']});
             throw SyntaxError;
         }
@@ -115,9 +120,39 @@ function okSubmit() {
     }
     //添加项目类型到表单中
     formdata.set("itemTypes",selectval);
-        //判断formdata中是否存在数据
+
+    //存放项目编号数组
+    var div2value=[]; //定义存储项目标号类型
+    for (var i = 0; i < div2.length; i++) {
+        div2value[i]=div2[i].innerHTML;
+    }
+    //判断项目编号
+    for(var j = 0 ; j < div2value.length ; j++){
+        if (div2value[j]==null||div2value[j]==""){
+            layer.msg("请输入项目编号",{icon: 3,offset:['40%','40%']});
+            throw SyntaxError;
+        }
+    }
+    //添加到表单当中
+    formdata.set("itemNo",div2value);
+
+    var div3value=[];
+    for (var i = 0; i < div3.length; i++) {
+        div3value[i]=div3[i].innerHTML;
+    }
+    //判断施工单位是否输入
+    for(var k = 0;k < div3value.length;k++){
+        if(div3value[k]==null||div3value[k]==""){
+            layer.msg("请输入施工单位",{icon: 3,offset:['40%','40%']});
+            throw SyntaxError;
+        }
+    }
+    //添加到表单当中
+    formdata.set("units",div3value);
+
+     //判断formdata中是否存在数据
     if(formdata.has("file")){
-        //如果存在清空数据
+     //如果存在清空数据
         formdata.delete("file");
     }
     // 获取表格id的值
@@ -137,24 +172,7 @@ function okSubmit() {
             }
         }
     }
-    // 获取项目编号
-    var div2 =  document.getElementsByClassName("mydiv2");
-    //存放项目编号数组
-    var div2value=[]; //定义存储项目标号类型
-    for (var i = 0; i < div2.length; i++) {
-        div2value[i]=div2[i].innerHTML;
-    }
-    //添加到表单当中
-    formdata.set("itemNo",div2value);
 
-        // 获取施工单位
-    var div3 =  document.getElementsByClassName("mydiv3");
-    var div3value=[];
-    for (var i = 0; i < div3.length; i++) {
-        div3value[i]=div3[i].innerHTML;
-    }
-    //添加到表单当中
-    formdata.set("units",div3value);
     //加载提示
     layer.msg('加载中', {
         icon: 16
@@ -162,6 +180,7 @@ function okSubmit() {
         ,time:false
         ,offset:['40%','40%']
     });
+
     //提交表单内容到后台
     $.ajax({
         url: "${ctx}/project/tem/import",

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

@@ -50,10 +50,10 @@
                                         <table class="layui-table" id="mytable">
                                         <thead>
                                         <tr>
-                                            <th width="36%">项目名称</th>
-                                            <th width="17%">项目类型</th>
-                                            <th width="17%">项目编号</th>
-                                            <th width="20%">施工单位</th>
+                                            <th width="36%">*项目名称</th>
+                                            <th width="17%">*项目类型</th>
+                                            <th width="17%">*项目编号</th>
+                                            <th width="20%">*施工单位</th>
                                             <th width="10%" style="text-align: center">操作</th>
                                         </tr></thead>
                                         <tbody id="tbody_List">