From 94c153c10113aaf29bce5fbb4bcb9541884d9923 Mon Sep 17 00:00:00 2001 From: Paidax Date: Sun, 19 Oct 2025 16:48:00 +0800 Subject: [PATCH 1/2] bug_commit --- ...inSignUpActivityStatisticsServiceImpl.java | 4 +- .../impl/TrainSignUpUserServiceImpl.java | 4 +- .../FundMemberCommonController.java | 14 +++- .../controller/FundMemberQueryController.java | 9 ++- .../controller/FundMemberWriteController.java | 21 +++++ .../member/service/FundMemberService.java | 5 ++ .../service/impl/FundMemberServiceImpl.java | 25 ++++++ .../CheckTaskGroupAuditController.java | 14 ++++ .../controller/CheckTaskSingleController.java | 34 ++++++++ .../CheckTaskVerificationController.java | 27 +++++-- .../vo/CheckTaskVerificationVO.java | 6 ++ .../impl/WelfareStatisticsServiceImpl.java | 6 +- .../static/assets/platform/css/common.css | 2 +- .../activity/sports/applyUser/applyUser.js | 2 +- .../activity/sports/applyUser/indexList.html | 2 +- .../zhgh/activity/sports/reading/index.html | 4 +- .../trainSignUp/userAdjust/userInfo.js | 3 + .../zhgh/dayofficework/fund/member/info.js | 4 +- .../fund/member/query/index.html | 3 +- .../fund/member/write/index.html | 12 ++- .../personnelcheck/single/index.html | 25 ++++++ .../zhgh/welfare/projectMange/filterUser.js | 8 +- .../zhgh/welfare/projectMange/index.html | 2 +- .../welfare/projectMange/welfareOption.js | 54 ++++++------- .../zhgh/welfare/welfareUser/addUser.js | 6 ++ .../zhghh5/welfare/mine/selectView.js | 80 +++++++++---------- 26 files changed, 280 insertions(+), 96 deletions(-) create mode 100644 src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java create mode 100644 src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/single/index.html diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java index b9bc8aa4..acda8c41 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java @@ -133,8 +133,8 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl list = fundMemberService.query(cnd); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java index 89830adb..fe1390f3 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.fund.member.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.result.Result; import com.budwk.app.flow.constant.FlowConst; @@ -12,6 +13,7 @@ import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply; +import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; @@ -37,6 +39,8 @@ public class FundMemberWriteController { @Inject private FlowEngine flowEngine; @Inject + private FundMemberService fundMemberService; + @Inject private FlowCommonService flowCommonService; @At("") @@ -51,6 +55,9 @@ public class FundMemberWriteController { @ApiOperation("保存申请") @SLog(tag = "建言献策-填写申请", msg = "保存申请") public Result save(@Param("data") FundMemberApply fundMember) { + if (StrUtil.isBlank(fundMember.getId())) { + fundMemberService.validateApply(); + } dao.insertOrUpdate(fundMember); return Result.success(); } @@ -62,6 +69,9 @@ public class FundMemberWriteController { @Aop(TransAop.READ_COMMITTED) @SLog(tag = "基金会员-填写申请", msg = "提交申请") public Result submit(@Param("data") FundMemberApply fundMember) { + if (StrUtil.isBlank(fundMember.getId())) { + fundMemberService.validateApply(); + } fundMember.setSubmitTime(new Date()); fundMember.setIsJoin(true); dao.insertOrUpdate(fundMember); @@ -86,6 +96,9 @@ public class FundMemberWriteController { @Aop(TransAop.READ_COMMITTED) @SLog(tag = "基金会员-填写申请", msg = "重新提交申请") public Result submitAgain(@Param("data") FundMemberApply fundMember, @Param("taskId") Long taskId) { + if (StrUtil.isBlank(fundMember.getId())) { + fundMemberService.validateApply(); + } dao.insertOrUpdate(fundMember); Dict dict = Dict.create(); @@ -103,4 +116,12 @@ public class FundMemberWriteController { return Result.success(box); } + + @At + @SaCheckPermission("fundMember.write") + @ApiOperation("校验是否有申请在流程中") + public Result validateApply(){ + fundMemberService.validateApply(); + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java index 2dcaf89b..6254d7a3 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java @@ -4,4 +4,9 @@ import com.budwk.app.base.service.BaseService; import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply; public interface FundMemberService extends BaseService { + + /** + * 验证是否已经申请了 + */ + void validateApply(); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java index 0b83a54d..32e18fa8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java @@ -1,14 +1,39 @@ package com.budwk.app.zhgh.dayofficework.fund.member.service.impl; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply; import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService; +import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; @IocBean(args = {"refer:dao"}) public class FundMemberServiceImpl extends BaseServiceImpl implements FundMemberService { public FundMemberServiceImpl(Dao dao) { super(dao); } + + + @Override + public void validateApply() { + FundMemberApply apply = dao().fetch(FundMemberApply.class, + Cnd.where(FundMemberApply::getLoginName, "=", SecurityUtil.getUserLoginname()) + .and("isJoin", "=", 1) + .desc("submitTime")); + if (Lang.isEmpty(apply)) { + return; + } + + int count = dao().count(ProcessInstance.class, Cnd.where("businessNo", "=", apply.getId()) + .and(ProcessInstance::getState, "=", ProcessTaskStateEnum.DOING.getCode())); + + if (count > 0) { + throw new RuntimeException("您有申请流程正在进行中，请等待流程结束后再次操作"); + } + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java new file mode 100644 index 00000000..5a1f274c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java @@ -0,0 +1,14 @@ +package com.budwk.app.zhgh.staffmanage.personnelcheck.controller; + +import org.nutz.ioc.loader.annotation.IocBean; + +/** + * @version 1.0 + * @Author FKY + * @name：CheckTaskGroupAuditController + * @Date 2025/10/17 16:46 + * @注释 + */ +@IocBean +public class CheckTaskGroupAuditController { +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java index 0cd0fc98..fb860c73 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java @@ -1,5 +1,16 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Dao; +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; + /** * @version 1.0 * @Author FKY @@ -7,5 +18,28 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller; * @Date 2025/10/15 10:48 * @注释 */ +@Slf4j +@IocBean +@Api("个人核对") +@Ok("json:full") +@At("/platform/personnel/check/verification/manage") public class CheckTaskSingleController { + + @Inject + private Dao dao; + @Inject + private CheckTaskCommonService checkTaskCommonService; + + @At("/") + @SaCheckPermission("personnel.check.verification.single") + @Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/single/index.html") + public void index() { + } + + + @At + @SaCheckPermission("personnel.check.verification.single") + public Result getSingleCheckTask(){ + return Result.success(); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java index e975cca7..e93bfd69 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java @@ -1,6 +1,8 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.budwk.app.base.annotation.SLog; @@ -40,8 +42,8 @@ import org.nutz.mvc.upload.UploadAdaptor; */ @Slf4j @IocBean -@Ok("json:full") @Api("核对任务") +@Ok("json:full") @At("/platform/personnel/check/verification/manage") public class CheckTaskVerificationController { @@ -79,9 +81,6 @@ public class CheckTaskVerificationController { @SaCheckPermission("personnel.check.verification.manage") @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) public Result doAddOrModify(@Param("baseData") String data, TempFile file){ - log.info("=================================主体数据：{}", data); - log.info("=================================导入文件：{}", file); - CheckTaskVerificationVO vo = JSONUtil.toBean(data, CheckTaskVerificationVO.class); if (StrUtil.isNotBlank(vo.getId())) { @@ -89,14 +88,28 @@ public class CheckTaskVerificationController { // 1.重新配置核对字段，filedConfigData dao.clear(CheckTaskFiledConfig.class, Cnd.where("taskId", "=", vo.getId())); // 2.重新设置待核对人员表，personnelData -// dao.clear(Check) + dao.clear(CheckTaskPersonnel.class, Cnd.where("taskId", "=", vo.getId())); } - // 修改审核流程配置 + // 插入逻辑 + + // 1.界面可能会对相关审核步骤做修改，修改审核流程配置 dao.update(vo.getBusinessConfig()); + // 2.新增或者修改事项任务 + CheckTaskVerification verification = new CheckTaskVerification(); + verification.setId(vo.getId()); + verification.setCreateTime(vo.getCreateTime() == null ? DateUtil.date() : vo.getCreateTime()); + verification.setYear(DateUtil.year(verification.getCreateTime())); + dao.insertOrUpdate(verification); + + // 3.往字段表里面插入数据，最好做下字段映射，把相关字段与数据库的字段对应 + // todo 字段映射 + + + // 4.读取文件，构造数据（动态字段 data），往 CheckTaskPersonnel 表中插入数据 + // todo 读取文件 转换成数据 - log.info("=================================数据转换：{}", vo); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java index 8a712a97..6fc9b05e 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java @@ -36,6 +36,12 @@ public class CheckTaskVerificationVO { @ApiModelProperty("结束时间") private Date endTime; + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("状态") + private String status; + @ApiModelProperty("业务配置数据") private CheckTaskBusinessConfig businessConfig; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java index 956851b9..c04d6012 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java @@ -97,11 +97,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId", "").equals(union.getString("id"))).count(); + long teacherSum = welfareSelectionList.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId", "").equals(union.getString("id"))).count(); union.put("teacherSum", teacherSum); // 已选人数 - long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count(); + long selectedNum = welfareSelectionList.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count(); union.put("selectedNum", selectedNum); // 未选人数 @@ -109,7 +109,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count(); + long count = userSelections.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count(); union.put(option.getId(), count); } } diff --git a/src/main/resources/static/assets/platform/css/common.css b/src/main/resources/static/assets/platform/css/common.css index 72fc3ba5..87a3f625 100644 --- a/src/main/resources/static/assets/platform/css/common.css +++ b/src/main/resources/static/assets/platform/css/common.css @@ -553,7 +553,7 @@ td.no-b { } .el-transfer__buttons { - width: 200px; + /*width: 200px;*/ text-align: center; } diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js index 661c0ddc..12f71cef 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js @@ -192,7 +192,7 @@ var ACTIVITY_SPORTS_APPLY_USER = { prop="mobile" width="150"> diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html index df77fddd..abec15c5 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html @@ -7,7 +7,7 @@ layout("/layouts/platform.html"){