Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java

@@ -1,5 +1,7 @@
 package com.jeeplus.modules.sg.overheadline.entity;
 
+import java.text.NumberFormat;
+
 public class Settlement {
     private String id;//ID
     private String entryName;//项目或费用名称
@@ -26,12 +28,11 @@ public class Settlement {
     }
 
     public Double getMoney() {
+
         return money;
     }
 
-    public void setMoney(Double money) {
-        this.money = money;
-    }
+    public void setMoney(Double money) {this.money=money;}
 
     public String getRemarks() {
         return remarks;

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

@@ -6,10 +6,15 @@ import com.jeeplus.common.utils.sg.ExcelUtil;
 import com.jeeplus.modules.sg.overheadline.entity.Settlement;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
+import java.text.FieldPosition;
+import java.text.NumberFormat;
+import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.List;
 
 public class SettementUtil {
+    private static final NumberFormat nf= NumberFormat.getInstance();
     public static final String RESON_TRUE="&nbsp;金额<span style='color:#0000FF'>&nbsp;一致。</span>";
     public static final String RESON_FLASE="&nbsp;金额<span style='color:#FF0000'>&nbsp;不一致。</span>";
     public static final String BDZ_TBRNAME="投标人采购设备费";
@@ -295,6 +300,7 @@ public class SettementUtil {
      * @return  电缆/变电站 项目 导入后 校验规则  list集合
      */
     public static List<Settlement> getDLComparison(List<Settlement> settlements, double builtTotal[], double[] divisiontotal, double wordtotal1,double wordtotal2, double otherTotal, double feescount,double cbperson){
+        nf.setGroupingUsed(false);
         double wordtotal=wordtotal1+wordtotal2;//措施费相加
         String name;//获取当前汇总表名称
         double money;//获取当前汇总表金额
@@ -320,7 +326,7 @@ public class SettementUtil {
                     if (money==built&&money==division){
                         settlement.setStatus("0");
                     }
-                    settlement.setTheAmount(String.valueOf(built+","+division+","+builtTotal[0]+","+builtTotal[1]+","+divisiontotal[0]+","+divisiontotal[2]));
+                    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){
@@ -355,7 +361,7 @@ public class SettementUtil {
                     if(money==divisionFbr){
                         settlement.setStatus("0");
                     }
-                    settlement.setTheAmount(String.valueOf(divisionFbr+","+divisiontotal[1]+","+divisiontotal[3]));
+                    settlement.setTheAmount(String.valueOf(nf.format(divisionFbr)+","+nf.format(divisiontotal[1])+","+nf.format(divisiontotal[3])));
                     break;
                 case BashInfo.JS_JGJS:
                     double[] jgComparison = getJgjsComparison(settlements);
@@ -676,11 +682,11 @@ public class SettementUtil {
     public static String getDJoint(Settlement settlement){
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
-        String reason1=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(settlement.getMoney()))
+        String reason1=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +"<br>"+SettementUtil.RESON_JZFBFX.replace("xxx",amout[2])
                 +"<br>"+SettementUtil.RESON_AZFBFX.replace("xxx",amout[3])
                 +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
-        String reason2=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(settlement.getMoney()))
+        String reason2=SettementUtil.RESON_FBFX1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +"<br>"+SettementUtil.RESON_JZFBFX3.replace("xxx",amout[4])
                 +"<br>"+SettementUtil.RESON_AZFBFX3.replace("xxx",amout[5])
                 +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[1]);
@@ -710,9 +716,10 @@ public class SettementUtil {
      * @return reason
      */
     public static String getBdzJoint(Settlement settlement){
+        nf.setGroupingUsed(false);
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
-        String reason1=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(settlement.getMoney()))
+        String reason1=SettementUtil.BDZ_FXFX.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +"<br>"+SettementUtil.BDZ_FBFX1.replace("xxx",amout[2])
                 +"<br>"+SettementUtil.BDZ_FBFX2.replace("xxx",amout[3])
                 +"<br>"+SettementUtil.RESON_GCJS4.replace("xxx",amout[0]);
@@ -748,9 +755,10 @@ public class SettementUtil {
      * @return Settlement reason 属性 赋值
      */
     public static String getJoint(String constant1,String constant2,Settlement settlement){
+        nf.setGroupingUsed(false);
         String reason="";
         String status=settlement.getStatus();
-        reason=constant1.replace("xxx",String.valueOf(settlement.getMoney()))
+        reason=constant1.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +"<br>"+constant2.replace("xxx",settlement.getTheAmount());
         if (status.equals("0")){
             reason+="<br>"+SettementUtil.RESON_TRUE;
@@ -767,9 +775,10 @@ public class SettementUtil {
      * @return reason
      */
     public static String getCsfJoint(String csxm,Settlement settlement){
+        nf.setGroupingUsed(false);
         String status =settlement.getStatus();
         String[] amout=settlement.getTheAmount().split(",");
-        String reason=csxm.replace("xxx",String.valueOf(settlement.getMoney()))
+        String reason=csxm.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +"<br>"+RESON_CSXM1.replace("xxx",amout[0])+
                 "<br>"+RESON_CSXM2.replace("xxx",amout[1])+
                 "<br>"+RESON_CSXM3.replace("xxx",amout[2]);
@@ -787,10 +796,12 @@ public class SettementUtil {
      * @return reason
      */
     public static String getDlJoint(String fbrf,Settlement settlement){
+        NumberFormat nf= NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         String reason="";
         String[] amout = settlement.getTheAmount().split(",");
         String status=settlement.getStatus();
-        reason=fbrf.replace("xxx",String.valueOf(settlement.getMoney()))
+        reason=fbrf.replace("xxx",String.valueOf(nf.format(settlement.getMoney())))
                 +"<br>"+RESON_DLFBRF1.replace("xxx",amout[1])
                 +"<br>"+RESON_DLFBRF2.replace("xxx",amout[2])
                 +"<br>"+RESON_GCJS4.replace("xxx",amout[0]);
@@ -808,9 +819,11 @@ public class SettementUtil {
      * @return
      */
     public static String getJgJoint(Settlement settlement,boolean[] booleans){
+        NumberFormat nf= NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
-        reason+=RESON_JGJS.replace("xxx",String.valueOf(settlement.getMoney()));
+        reason+=RESON_JGJS.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         if (booleans[1]){
             reason+="<br>"+RESON_JGJS1.replace("xxx",amout[1]);
         }
@@ -848,9 +861,11 @@ public class SettementUtil {
      * @return reason
      */
     public static String getBDZJoint(Settlement settlement,boolean[] booleans){
+        NumberFormat nf= NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
-        reason+=BDZ_TBBJ.replace("xxx",String.valueOf(settlement.getMoney()));
+        reason+=BDZ_TBBJ.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         if (booleans[1]){
             reason+="<br>"+RESON_JGJS1.replace("xxx",amout[1]);
         }
@@ -888,6 +903,8 @@ public class SettementUtil {
      * @return bean rason
      */
     public static String getJshzJoint(Settlement settlement,boolean[] booleans){
+        NumberFormat nf= NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         String reason="";
         String[] amout=settlement.getTheAmount().split(",");
         reason+=RESON_GCJS.replace("xxx",String.valueOf(settlement.getMoney()));

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -65,30 +65,30 @@
         "wbsys":"${data.describe}",
         "wbssbm": "${data.wbsCode}",
 
-        "hjje": "${data.originalTotalCost}",
-        "zjgcf":"${data.zjgcFee}",
-        "rgf1": "${data.originalRgCost}",
-        "cbrcg1": "${data.originalCbrCost}",
-        "fbrcg1": "${data.originalFbrCost}",
-        "jxf1": "${data.originalJxCost}",
+        "hjje": doIt(${data.originalTotalCost}),
+        "zjgcf":doIt(${data.zjgcFee}),
+        "rgf1":doIt(${data.originalRgCost}),
+        "cbrcg1":doIt(${data.originalCbrCost}),
+        "fbrcg1":doIt(${data.originalFbrCost}),
+        "jxf1":doIt(${data.originalJxCost}),
 
-        "rgf2": "${data.rgCost}",
-        "cbrcg2": "${data.cbrCost}",
-        "fbrcg2":"${data.fbrCost}",
-        "jxf2": "${data.jxCost}",
+        "rgf2":doIt(${data.rgCost}),
+        "cbrcg2":doIt(${data.cbrCost}),
+        "fbrcg2":doIt(${data.fbrCost}),
+        "jxf2": doIt(${data.jxCost}),
         "cbrcg3": "<c:if test="${ empty data.cbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.cbrFtFee}">${data.cbrFtFee}</c:if>",
         "fbrcg3": "<c:if test="${ empty data.fbrFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.fbrFtFee}">${data.fbrFtFee}</c:if>",
         "jxf3": "<c:if test="${ empty data.jxFtFee and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.jxFtFee}">${data.jxFtFee}</c:if>",
 
-        "csf_1": "${data.measuresFee1}",
-        "csf_2": "${data.measuresFee2}",
+        "csf_1":doIt(${data.measuresFee1}),
+        "csf_2":doIt(${data.measuresFee2}),
         "csf2": "<c:if test="${ empty data.measuresFee3 and not empty data.originalTotalCost}">0.0</c:if><c:if test="${ not empty data.measuresFee3}">${data.measuresFee3}</c:if>",
-        "qtf":"${data.otherCost}",
-        "gf":"${data.fees}",
-        "sf":"${data.tex}",
-        "hj": "${data.totalFee}",
-        "gxfy": "${data.gxFee}",
-        "pid": "${data.parentNode}"
+        "qtf":doIt(${data.otherCost}),
+        "gf":doIt(${data.fees}),
+        "sf":doIt(${data.tex}),
+        "hj": doIt(${data.totalFee}),
+        "gxfy":doIt(${data.gxFee}),
+        "pid":"${data.parentNode}"
     },
     </c:if>
     </c:forEach>
@@ -133,7 +133,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
                                 "d_id": "${data.wbsCode}",
                                 "wbsys": "${data.describe}",
                                 "wbssbm": "${data.wbsCode}",
-                                "money": "${data.totalFee}",
+                                "money":doIt(${data.totalFee}),
                                 "d_pid": "${data.parentNode}"
 
                             },
@@ -169,7 +169,7 @@ layui.use(['table', 'form', 'element', 'treetable'], function () {
                             {
                                 "id":"${data.id}",
                                 "xmmc": "${data.type}",
-                                "fyje": "${data.fee}"
+                                "fyje": doIt(${data.fee})
                             },
                         </c:forEach>
                     </c:if>
@@ -269,18 +269,18 @@ function sureradio2(data,url){
                         var xml = "";
                         if(d.status=="1")
                             xml += "<a style='margin-top: 3px;' class='layui-btn layui-btn-danger layui-btn-xs' lay-event='byz'>不一致</a>";
-        if(d.status == "0")
-            xml+="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs' lay-event='byz'>一致</a>";
-        return xml;
-    }}
-]]
-,data:[
+                        if(d.status == "0")
+                            xml+="<a style='margin-top: 3px;' class='layui-btn layui-btn-xs' lay-event='byz'>一致</a>";
+                        return xml;
+            }}
+        ]]
+        ,data:[
         <c:if test="${not empty map.list3}">
             <c:forEach items="${map.list3}" var="data">
                 {
                     "id":"${data.id}",
                     "setname": "${data.entryName}",
-                    "setmoney":"${data.money}",
+                    "setmoney":doIt(${data.money}),
                     "settext":"${data.remarks}",
                     "status":"${data.status}",
                     "reason":"${data.reason}"
@@ -304,4 +304,11 @@ table.on('tool(settle)', function(obj){
     }
 });
 });
+function doIt(val){
+    if(val == null){
+        return val;
+    }
+    var num = new Number(val);
+    return num;
+}
 </script>

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

@@ -94,7 +94,7 @@ layui.config({
                 "type":"${items.type}",
                 "gcmc":"${items.itemName}",
                 "xmsl": "某施工单位一",
-                "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if>",
+                "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站线路</c:if>",
                 "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
                 "status":"3",
                 "pid": "${items.projectId}"

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

@@ -73,7 +73,7 @@
     "type":"${items.type}",
     "gcmc":"${items.itemName}",
     "xmsl": "某施工单位一",
-    "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if>",
+    "cjsq":"<c:if test="${items.type eq '1'}">架空线路</c:if><c:if test="${items.type eq '2'}">电缆线路</c:if><c:if test="${items.type eq '3'}">变电站线路</c:if>",
     "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
     "status":"3",
     "pid": "${items.projectId}"