admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2024-12-05 17:29:26 +08:00
parent 623deaca6c
commit 7a902a21fd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java
View File

@ -209,7 +209,7 @@ public class JiuzhuDateUtil {
JSONObject detail6Obj = JSONObject.parseObject(JSON.toJSONString(o)); JSONObject detail6Obj = JSONObject.parseObject(JSON.toJSONString(o));
String jshj = detail6Obj.getString("jshj"); String jshj = detail6Obj.getString("jshj");
if (StringUtils.isNotBlank(jshj)) { if (StringUtils.isNotBlank(jshj)) {
jshjTotal.add(new BigDecimal(jshj)); jshjTotal = jshjTotal.add(new BigDecimal(jshj));
} }
} }
costContractPay.setJshj(jshjTotal.toString()); costContractPay.setJshj(jshjTotal.toString());
@ -312,7 +312,9 @@ public class JiuzhuDateUtil {
main.put("zzdw", companyStream.get(0).getCompanySn()); 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("rwid", "123");
// main.put("rwlx", ""); // main.put("rwlx", "");
// main.put("rwlb", ""); // main.put("rwlb", "");

2
src/main/resources/application-gsx-other-env-show.properties
View File

@ -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.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)
server.port=19111 server.port=19112
#server.port=30246 #server.port=30246
basePath=C:/jxj/prod/backEnd/itbgpImage/ basePath=C:/jxj/prod/backEnd/itbgpImage/
server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/ server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/