diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java index 224198c..fd7fa31 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java @@ -218,6 +218,7 @@ public class WelfareProject extends ViBaseModel implements Serializable, SysHome @Column @Comment("是否禁用") + @Default("0") @ColDefine(type = ColType.BOOLEAN) private Boolean isDisabled; diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/zczjlbController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/zczjlbController.java index 437baaf..96ecd8f 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/controller/zczjlbController.java +++ b/src/main/java/io/v/nutz/zhgh/zc/controller/zczjlbController.java @@ -91,7 +91,7 @@ public class zczjlbController { Double surplusMoney = zcxxes.stream().filter(z -> !List.of("报废", "丢失").contains(z.getZczt())).mapToDouble(Zgfw_Zcxx::getSurplusMoney).sum(); //累计折旧 Double depreciationMoney = allMoney - surplusMoney; - return Map.of("allMoney", allMoney, "surplusMoney", surplusMoney, "depreciationMoney", String.format("%.2f", depreciationMoney)); + return Map.of("allMoney", String.format("%.2f", allMoney), "surplusMoney", String.format("%.2f", surplusMoney), "depreciationMoney", String.format("%.2f", depreciationMoney)); } diff --git a/src/main/resources/views/mobile/welfare/mine/address_edit.html b/src/main/resources/views/mobile/welfare/mine/address_edit.html index 307ec1b..bed1542 100644 --- a/src/main/resources/views/mobile/welfare/mine/address_edit.html +++ b/src/main/resources/views/mobile/welfare/mine/address_edit.html @@ -101,8 +101,8 @@ layout("/mobile/platform.html"){ this.addressInfo.name = "${@shiro.getPrincipalProperty('username')}"; this.closeLoading() } - this.areaList.province_list = {320000: "江苏省"} - this.areaList.city_list = {320200: "无锡市"} + /*this.areaList.province_list = {320000: "江苏省"} + this.areaList.city_list = {320200: "无锡市"}*/ } }) diff --git a/src/main/resources/views/platform/welfare/addressManage.html b/src/main/resources/views/platform/welfare/addressManage.html index 338535c..a7e7510 100644 --- a/src/main/resources/views/platform/welfare/addressManage.html +++ b/src/main/resources/views/platform/welfare/addressManage.html @@ -251,10 +251,10 @@ layout("/layouts/platform.html"){ }, async created() { this.pageData() - if ("${@shiro.hasRole('sysadmin')}" === 'false') { + /* if ("${@shiro.hasRole('sysadmin')}" === 'false') { this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省") this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市") - } + }*/ } }) diff --git a/src/main/resources/views/platform/welfare/list/ListMange.html b/src/main/resources/views/platform/welfare/list/ListMange.html index 29212da..a84047c 100644 --- a/src/main/resources/views/platform/welfare/list/ListMange.html +++ b/src/main/resources/views/platform/welfare/list/ListMange.html @@ -1154,11 +1154,11 @@ layout("/layouts/platform.html"){ } - if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionWelfareAdmin')}" === 'false') { + /*if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('SchoolUnionAdmin')||@shiro.hasRole('SchoolUnionWelfareAdmin')}" === 'false') { this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省") this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市") } - +*/ await this.getWelfareOptions() } diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html index c1fe208..436ea1d 100644 --- a/src/main/resources/views/platform/welfare/userChoose.html +++ b/src/main/resources/views/platform/welfare/userChoose.html @@ -745,10 +745,10 @@ layout("/layouts/platform.html"){ this.welfareSignMode = res }) - if ("${@shiro.hasRole('sysadmin')}" === 'false') { + /* if ("${@shiro.hasRole('sysadmin')}" === 'false') { this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省") this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市") - } + }*/ }