diff --git a/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java b/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java index e8a321624..b3848f1c6 100644 --- a/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java @@ -209,7 +209,7 @@ public class JiuzhuDateUtil { JSONObject detail6Obj = JSONObject.parseObject(JSON.toJSONString(o)); String jshj = detail6Obj.getString("jshj"); if (StringUtils.isNotBlank(jshj)) { - jshjTotal.add(new BigDecimal(jshj)); + jshjTotal = jshjTotal.add(new BigDecimal(jshj)); } } costContractPay.setJshj(jshjTotal.toString()); @@ -312,7 +312,9 @@ public class JiuzhuDateUtil { main.put("zzdw", companyStream.get(0).getCompanySn()); } - main.put("nd", DateUtil.year(DateUtil.parseDate(progressPanoramaNodePlan.getPlanStartDate()))); + if (StringUtils.isNotBlank(progressPanoramaNodePlan.getPlanStartDate())) { + main.put("nd", DateUtil.year(DateUtil.parseDate(progressPanoramaNodePlan.getPlanStartDate()))); + } // main.put("rwid", "123"); // main.put("rwlx", ""); // main.put("rwlb", ""); diff --git a/src/main/resources/application-gsx-other-env-show.properties b/src/main/resources/application-gsx-other-env-show.properties index c591a67f1..f0a98f22f 100644 --- a/src/main/resources/application-gsx-other-env-show.properties +++ b/src/main/resources/application-gsx-other-env-show.properties @@ -4,7 +4,7 @@ spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.155:3306/wisdomsite_jiuzh spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) -server.port=19111 +server.port=19112 #server.port=30246 basePath=C:/jxj/prod/backEnd/itbgpImage/ server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/