diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 3bb29fc..765e792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -255,6 +255,7 @@ @RequestMapping(value = "/updateContract") @ResponseBody public Object updateContract() { +// contractService.updateContractStatus(id); EntityWrapper entityWrapper = new EntityWrapper<>(); List contractList = contractService.selectList(entityWrapper); for (Contract contract : contractList) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 3bb29fc..765e792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -255,6 +255,7 @@ @RequestMapping(value = "/updateContract") @ResponseBody public Object updateContract() { +// contractService.updateContractStatus(id); EntityWrapper entityWrapper = new EntityWrapper<>(); List contractList = contractService.selectList(entityWrapper); for (Contract contract : contractList) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java index 77517e3..d300e20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java @@ -170,7 +170,7 @@ b1 = b1.add(new BigDecimal(reimburse.getMoney())); } } - return b1.toString(); + return b1.stripTrailingZeros().toString(); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java index 3bb29fc..765e792 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/ContractController.java @@ -255,6 +255,7 @@ @RequestMapping(value = "/updateContract") @ResponseBody public Object updateContract() { +// contractService.updateContractStatus(id); EntityWrapper entityWrapper = new EntityWrapper<>(); List contractList = contractService.selectList(entityWrapper); for (Contract contract : contractList) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java index 77517e3..d300e20 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/ContractServiceImpl.java @@ -170,7 +170,7 @@ b1 = b1.add(new BigDecimal(reimburse.getMoney())); } } - return b1.toString(); + return b1.stripTrailingZeros().toString(); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 9011c88..5557bf6 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://192.168.0.212:3306/product_device?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull - username: root - password: + url: jdbc:mysql://139.198.18.188:3306/product_device?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + username: pcroot + password: pcroot#203 initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置