From d638f2baf90e7fc4617272809985db404a790238 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 18 Sep 2025 15:57:10 +0800 Subject: [PATCH 1/3] commit --- .../ContributionDetailedController.java | 10 +- .../ContributionProjectController.java | 12 +- .../ContributionStatisticsController.java | 6 +- .../ContributionTypeController.java | 39 ++++- .../H5ContributionListController.java | 115 ++++++++++++++ .../H5ContributionMineController.java | 90 +++++++++++ .../contribution/model/ContributionApply.java | 8 +- .../model/ContributionProject.java | 14 +- .../contribution/model/ContributionType.java | 2 +- .../service/ContributionApplyService.java | 2 +- .../PsychologyDoctorController.java | 8 +- .../contribution/detailed/index.html | 24 +-- .../contribution/list/basicForm.js | 12 +- .../staffbenefit/contribution/list/info.js | 8 +- .../contribution/statistics/index.html | 8 +- .../zhgh/staffbenefit/legal/list/index.html | 2 +- .../legal/onlinePost/basicForm.js | 2 +- .../staffbenefit/psychology/list/index.html | 2 +- .../psychology/onlinePost/basicForm.js | 2 +- .../staffbenefit/condolence/common/info.js | 1 + .../contribution/common/applyForm.js | 108 +++++++++++++ .../contribution/common/projectInfo.js | 58 +++++++ .../contribution/common/typeInfo.js | 59 ++++++++ .../staffbenefit/contribution/list/index.html | 122 +++++++++++++++ .../staffbenefit/contribution/mine/index.html | 143 ++++++++++++++++++ .../legal/onlinePost/applyForm.js | 2 +- .../psychology/onlinePost/applyForm.js | 2 +- 27 files changed, 791 insertions(+), 70 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionListController.java create mode 100644 src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/applyForm.js create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/projectInfo.js create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/typeInfo.js create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/contribution/list/index.html create mode 100644 src/main/resources/views/platform/zhghh5/staffbenefit/contribution/mine/index.html diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java index c926a975..eeca1952 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java @@ -42,7 +42,7 @@ import java.util.List; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款明细") +@Api(tags = "慈善捐助明细") @At("/platform/contribution/detailed") public class ContributionDetailedController { @@ -86,9 +86,9 @@ public class ContributionDetailedController { List entityList = new ArrayList<>(); entityList.add(new ExcelExportEntity("序号", "index", 10)); - entityList.add(new ExcelExportEntity("捐款项目", "contributionName", 20)); - entityList.add(new ExcelExportEntity("捐款人工号", "loginName", 20)); - entityList.add(new ExcelExportEntity("捐款人姓名", "userName", 20)); + entityList.add(new ExcelExportEntity("捐助项目", "contributionName", 20)); + entityList.add(new ExcelExportEntity("捐助人工号", "loginName", 20)); + entityList.add(new ExcelExportEntity("捐助人姓名", "userName", 20)); entityList.add(new ExcelExportEntity("联系方式", "mobile", 20)); entityList.add(new ExcelExportEntity("所属工会", "unionName", 20)); entityList.add(new ExcelExportEntity("所属单位", "unitName", 20)); @@ -99,6 +99,6 @@ public class ContributionDetailedController { ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, listMap); - CommonDownloadUtil.download("捐款明细.xlsx", workbook, response); + CommonDownloadUtil.download("捐助明细.xlsx", workbook, response); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java index 1c4bbb63..ef961104 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java @@ -36,7 +36,7 @@ import java.util.List; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款项目") +@Api(tags = "慈善捐助项目") @At("/platform/contribution/list") public class ContributionProjectController { @@ -76,9 +76,9 @@ public class ContributionProjectController { } @At - @ApiOperation("新增/修改慈善捐款项目") + @ApiOperation("新增/修改慈善捐助项目") @SaCheckPermission("contribution.list") - @SLog(type = "contribution", tag = "新增/修改慈善捐款项目", msg = "新增/修改慈善捐款项目") + @SLog(type = "contribution", tag = "新增/修改慈善捐助项目", msg = "新增/修改慈善捐助项目") public Object onSubmit(ContributionProject project) { if(StrUtil.isBlank(project.getId())) { project.setContributionCreationDate(DateUtil.now()); @@ -88,16 +88,16 @@ public class ContributionProjectController { } @At - @ApiOperation("删除慈善捐款项目") + @ApiOperation("删除慈善捐助项目") @SaCheckPermission("contribution.list") - @SLog(type = "contribution", tag = "删除慈善捐款项目", msg = "删除慈善捐款项目") + @SLog(type = "contribution", tag = "删除慈善捐助项目", msg = "删除慈善捐助项目") public Object onDelete(String id) { typeService.dao().delete(ContributionProject.class, id); return Result.success(); } @At - @ApiOperation("查询慈善捐款项目") + @ApiOperation("查询慈善捐助项目") @SaCheckPermission("contribution.list") public Result queryContributionList() { List list = typeService.dao().query( diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java index bd9ff960..13ab9373 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款分工会统计") +@Api(tags = "慈善捐助分工会统计") @At("/platform/contribution/statistics") public class ContributionStatisticsController { @@ -66,13 +66,13 @@ public class ContributionStatisticsController { .stream() .toList(); - //这个项目每个分工会有多少个人捐款 + //这个项目每个分工会有多少个人捐助 List list = userList.stream() .filter(n -> n.getUnionId().equals(union.getId()) && n.getContributionId().equals(contributionId)) .toList(); map.setv("contributionUserNum", list.size()); - //捐款多少笔 + //捐助多少笔 long conCount = applyList.stream() .filter(n -> n.getUnionId().equals(union.getId()) && n.getContributionId().equals(contributionId)) .count(); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java index 3525daf6..d2833844 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java @@ -6,6 +6,8 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionApply; +import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionProject; import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionType; import com.budwk.app.zhgh.staffbenefit.contribution.service.ContributionTypeService; import io.swagger.annotations.Api; @@ -13,9 +15,13 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -31,7 +37,7 @@ import java.util.List; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款专题") +@Api(tags = "慈善捐助专题") @At("/platform/contribution/type") public class ContributionTypeController { @@ -63,28 +69,47 @@ public class ContributionTypeController { } @At - @ApiOperation("新增/修改慈善捐款专题") + @ApiOperation("新增/修改慈善捐助专题") @SaCheckPermission("contribution.type") - @SLog(type = "contribution", tag = "新增/修改慈善捐款专题", msg = "新增/修改慈善捐款专题") + @SLog(type = "contribution", tag = "新增/修改慈善捐助专题", msg = "新增/修改慈善捐助专题") public Object onSubmit(ContributionType type) { typeService.insertOrUpdate(type); return Result.success(); } @At - @ApiOperation("删除慈善捐款专题") + @ApiOperation("删除慈善捐助专题") @SaCheckPermission("contribution.type") - @SLog(type = "contribution", tag = "删除慈善捐款专题", msg = "删除慈善捐款专题") + @SLog(type = "contribution", tag = "删除慈善捐助专题", msg = "删除慈善捐助专题") public Object onDelete(String id) { typeService.delete(id); return Result.success(); } @At - @ApiOperation("查询慈善捐款专题") - @SaCheckPermission("contribution.type") + @ApiOperation("查询慈善捐助专题") + @SaCheckPermission("contribution") public Result queryContributionType() { List list = typeService.query(Cnd.NEW().desc(ContributionType::getTypeCode)); return Result.success(list); } + + @At + @ApiOperation("查询单个慈善捐助专题") + @SaCheckPermission("contribution") + public Result fetchOne(String id) { + ContributionType type = typeService.fetch(id); + List list = dao.query(ContributionProject.class, Cnd.where(ContributionProject::getContributionTypeCode, "=", type.getTypeCode()).and(ContributionProject::getIsContributionEnable, "=", true)); + + List projects = list.stream().map(ContributionProject::getId).toList(); + + List applyList = dao.query(ContributionApply.class, Cnd.where(ContributionApply::getContributionId, "in", projects)); + double sum = applyList.stream().mapToDouble(ContributionApply::getMoney).sum(); + + NutMap nutMap = Lang.obj2nutmap(type); + nutMap.put("projectCount", list.size()); + nutMap.put("totalMoney", sum); + nutMap.put("peopleCount", applyList.size()); + return Result.success(nutMap); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionListController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionListController.java new file mode 100644 index 00000000..5b6f1613 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionListController.java @@ -0,0 +1,115 @@ +package com.budwk.app.zhgh.staffbenefit.contribution.h5Controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionApply; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; + +/** + * @ClassName H5ContributionListController + * @Author JyuHsin + * @Date 2025/9/18 11:12 + * @Version 1.0 + * @Description TODO + */ +@Slf4j +@IocBean +@Ok("json:full") +@Api(tags = "移动端-慈善捐助项目") +@At("/platform/contribution/list/h5") +public class H5ContributionListController { + + @Inject + private Dao dao; + @Inject + private BaseService baseService; + + @At("") + @SaCheckPermission("h5.contribution.list") + @Ok("beetl:/platform/zhghh5/staffbenefit/contribution/list/index.html") + public void index() { + } + + @At + @ApiOperation("分页查询") + @SaCheckPermission("h5.contribution.list") + public Result pageData(PageForm pageForm, + @Param(value = "year") Integer year, + @Param(value = "type") String type) { + Cnd cnd = Cnd.NEW(); + Sql sql = Sqls.create(""" + SELECT + con.*, + con.id as contributionId, + type.id as typeId, + type.typeName + FROM + `contribution_project` con + LEFT JOIN contribution_type type ON type.typeCode = con.contributionTypeCode + $condition + """); + cnd.andEX("con.contributionTypeCode", "=", type); + cnd.andEX("year(contributionCreationDate)", "=", year); + cnd.and("isContributionEnable", "=", true); + cnd.desc("contributionCreationDate"); + cnd.asc("contributionMode"); + sql.setCondition(cnd); + Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + @At + @ApiOperation("移动端-慈善捐助") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("h5.contribution.list") + @SLog(tag = "慈善捐助-捐助", msg = "慈善捐助") + public Object submit(ContributionApply apply) { + if(StrUtil.isBlank(apply.getId())) { + apply.setContributionTime(DateUtil.now()); + } + dao.insertOrUpdate(apply); + return Result.success(); + } + + @At + @ApiOperation("查询单个慈善捐助专题") + @SaCheckPermission("contribution") + public Result fetchOne(String id) { + Sql sql = Sqls.create(""" + SELECT + con.*, + ( SELECT SUM( money ) FROM contribution_apply apply WHERE apply.contributionId = con.id ) totalMoney, + ( SELECT COUNT( 1 ) FROM contribution_apply apply WHERE apply.contributionId = con.id ) peopleCount + FROM + `contribution_project` con + WHERE con.id = @id + """); + sql.setParam("id", id); + sql.setCallback(Sqls.callback.map()); + dao.execute(sql); + NutMap nutMap = (NutMap) sql.getResult(); + return Result.success(nutMap); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java new file mode 100644 index 00000000..c9dedcba --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java @@ -0,0 +1,90 @@ +package com.budwk.app.zhgh.staffbenefit.contribution.h5Controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingTimePeriod; +import com.budwk.app.zhgh.dayofficework.meeting.model.MeetingTimePeriodUser; +import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionApply; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +/** + * @ClassName H5ContributionMineController + * @Author JyuHsin + * @Date 2025/9/18 15:17 + * @Version 1.0 + * @Description TODO + */ +@Slf4j +@IocBean +@Ok("json:full") +@Api(tags = "移动端-我的慈善捐助") +@At("/platform/contribution/mine/h5") +public class H5ContributionMineController { + + @Inject + private Dao dao; + @Inject + private BaseService baseService; + + @At("") + @SaCheckPermission("h5.contribution.mine") + @Ok("beetl:/platform/zhghh5/staffbenefit/contribution/mine/index.html") + public void index() { + } + + @At + @ApiOperation("分页查询") + @SaCheckPermission("h5.contribution.mine") + public Result pageData(PageForm pageForm, + @Param(value = "year") Integer year, + @Param(value = "type") String type) { + Sql sql = Sqls.create(""" + SELECT + ca.*, + cp.contributionName AS projectName, + cp.contributionTypeCode, + cp.contributionStartTime, + cp.contributionEndTime, + ct.id as typeId + FROM + contribution_apply ca + LEFT JOIN contribution_project cp ON ca.contributionId = cp.id + LEFT JOIN contribution_type ct ON cp.contributionTypeCode = ct.typeCode + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("year(ca.contributionTime)", "=", year); + cnd.andEX("cp.contributionTypeCode", "=", type); + cnd.desc("ca.contributionTime"); + sql.setCondition(cnd); + Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + @At + @ApiOperation("删除慈善捐助") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("h5.contribution.mine") + @SLog(tag = "慈善捐助-删除慈善捐助", msg = "删除慈善捐助") + public Object delete(String id) { + dao.delete(ContributionApply.class, id); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java index 7ab75dd8..408edabe 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java @@ -19,7 +19,7 @@ import java.util.List; * @Description TODO */ @Data -@Comment("慈善捐款明细") +@Comment("慈善捐助明细") @Accessors(chain = true) @Table("contribution_apply") @EqualsAndHashCode(callSuper = true) @@ -82,7 +82,7 @@ public class ContributionApply extends BaseModel { private String mobile; @Column - @Comment("捐款金额") + @Comment("捐助金额") @ColDefine(type = ColType.DOUBLE) private double money; @@ -92,12 +92,12 @@ public class ContributionApply extends BaseModel { private String payMode; @Column - @Comment("捐款时间") + @Comment("捐助时间") @ColDefine(type = ColType.VARCHAR, width = 50) private String contributionTime; @Column - @Comment("捐款图片") + @Comment("捐助图片") @ColDefine(type = ColType.MYSQL_JSON) private List contributionFiles; } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java index 1081bd95..d4813804 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java @@ -18,7 +18,7 @@ import java.util.List; * @Description TODO */ @Data -@Comment("慈善捐款") +@Comment("慈善捐助") @Accessors(chain = true) @Table("contribution_project") @EqualsAndHashCode(callSuper = true) @@ -41,7 +41,7 @@ public class ContributionProject extends BaseModel { private String contributionIntroduce; @Column - @Comment("所属捐款专题") + @Comment("所属捐助专题") @ColDefine(type = ColType.VARCHAR, width = 10) private String contributionTypeCode; @@ -61,22 +61,22 @@ public class ContributionProject extends BaseModel { private Boolean isContributionEnable; @Column - @Comment("捐款模式") + @Comment("捐助模式") @ColDefine(type = ColType.VARCHAR, width = 30) - private String contributionMode; + private Integer contributionMode; @Column - @Comment("捐款链接") + @Comment("捐助链接") @ColDefine(type = ColType.TEXT) private String contributionUrl; @Column - @Comment("捐款开启时间") + @Comment("捐助开启时间") @ColDefine(type = ColType.VARCHAR, width = 40) private String contributionStartTime; @Column - @Comment("捐款结束时间") + @Comment("捐助结束时间") @ColDefine(type = ColType.VARCHAR, width = 40) private String contributionEndTime; } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java index 6451d603..7a004515 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java @@ -19,7 +19,7 @@ import java.util.List; * @Description TODO */ @Data -@Comment("慈善捐款专题") +@Comment("慈善捐助专题") @Accessors(chain = true) @Table("contribution_type") @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java index 2614ec60..0128dc38 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java @@ -15,7 +15,7 @@ import org.nutz.dao.sql.Sql; public interface ContributionApplyService extends BaseService { /** - * 生成查询捐款明细的sql + * 生成查询捐助明细的sql * @return */ Sql generateSql(String unionId, String unitId, String payMode, String contributionName); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java index 42b8dd23..0ce72b50 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java @@ -74,9 +74,9 @@ public class PsychologyDoctorController { @At @Aop(TransAop.READ_COMMITTED) - @ApiOperation("新增/修改心理咨询师") + @ApiOperation("新增/修改咨询师") @SaCheckPermission("psychology.doctorManage") - @SLog(tag = "心理咨询系统-心理咨询师", msg = "新增/修改心理咨询师") + @SLog(tag = "心理咨询系统-咨询师", msg = "新增/修改咨询师") public Object onSubmit(PsychologyDoctor doctor) { Sys_role role = sysRoleService.getByCode(RoleConstant.PSYCHOLOGY_DOCTOR); if(StrUtil.isBlank(doctor.getId())) { @@ -102,9 +102,9 @@ public class PsychologyDoctorController { } @At - @ApiOperation("删除心理咨询师") + @ApiOperation("删除咨询师") @SaCheckPermission("psychology.doctorManage") - @SLog(tag = "心理咨询系统-心理咨询师", msg = "删除心理咨询师") + @SLog(tag = "心理咨询系统-咨询师", msg = "删除咨询师") public Object onDelete(String id) { doctorService.delete(id); return Result.success(); diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html index d86cb5e2..21230ee2 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html @@ -42,8 +42,8 @@ layout("/layouts/platform.html"){ - - + @@ -54,7 +54,7 @@ layout("/layouts/platform.html"){ - + 导出 @@ -90,10 +90,10 @@ layout("/layouts/platform.html"){