From e4d110b8b49b584e2cb288d0b4f6c94ef0349074 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Wed, 14 Jan 2026 15:59:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E5=88=A0=E9=99=A4=E5=AD=A6=E7=A7=91]?= =?UTF-8?q?=20=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E5=BC=B9=E5=87=BA=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxhq/business/controller/PublicController.java | 16 ++++++++++++++++ .../com/hxhq/business/controller/StudyController.java | 2 ++ .../business/service/impl/StudySubjectServiceImpl.java | 9 ++++++++- .../service/impl/StudySubjectUserServiceImpl.java | 14 +++++++------- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java index 14f2fae..a787f3d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; import com.hxhq.business.dto.study.StudyListDto; import com.hxhq.business.enums.study.StudyStatusEnum; +import com.hxhq.business.form.common.SignForm; import com.hxhq.business.form.study.StudyFormPreSearchForm; import com.hxhq.business.form.study.StudySearchForm; import com.hxhq.business.form.zcg.ZcgSearchForm; @@ -18,6 +19,8 @@ import com.hxhq.common.core.web.domain.AjaxResult; import com.hxhq.common.core.web.page.TableDataInfo; import com.hxhq.common.redis.service.RedisService; import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; +import com.hxhq.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; @@ -56,6 +59,8 @@ public class PublicController extends BaseController { private RedisService redisService; @Autowired public ISnGenService snGenService; + @Autowired + public ISysUserService sysUserService; /** * 获取编号 @@ -165,5 +170,16 @@ public class PublicController extends BaseController { return AjaxResult.success(zcgService.queryList(form)); } + /** + * 判断签名密码 + * @param sign + * @return + */ + @PostMapping("/checkPassword") + public AjaxResult checkPassword(@RequestBody SignForm sign) { + sysUserService.checkPassword(SecurityUtils.getLoginUser().getSysUser(),sign.getQmrmm(),false); + return AjaxResult.success(); + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java index f7aaef7..3412d7a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java @@ -73,8 +73,10 @@ public class StudyController extends BaseController List countList = studyService.queryFormCountList(idList); if(countList.size()>0){ info.setFormCount(countList.get(0).getFormCount()); + info.setFormFinishCount(countList.get(0).getFormFinishCount()); }else{ info.setFormCount(0); + info.setFormFinishCount(0); } return AjaxResult.success(info); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java index de84143..38a39f9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java @@ -20,6 +20,7 @@ import com.hxhq.business.service.IStudyService; import com.hxhq.business.service.IStudySubjectUserService; import com.hxhq.business.utils.JctUtil; import com.hxhq.common.core.exception.ServiceException; +import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; import com.hxhq.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -114,7 +115,7 @@ public class StudySubjectServiceImpl extends ServiceImpl itemList = form.getSubjectList(); @@ -166,7 +167,13 @@ public class StudySubjectServiceImpl extends ServiceImpl0){ removeBatchByIds(deleteList); for(StudySubject del : deleteList){ studySubjectUserService.deleteByStudySubjectId(study,del.getId(),form.getSign()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java index aec2cc7..9c92454 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java @@ -108,12 +108,6 @@ public class StudySubjectUserServiceImpl extends ServiceImpl0){ - saveBatch(addList); - } - if(modifyList.size()>0){ - updateBatchById(modifyList); - } if(deleteList.size()>0){ String name = baseMapper.getHasFormNameList(study.getId(),deleteList.stream().map(o->o.getUserId()).collect(Collectors.toList())); if(StringUtils.isNoneBlank(name)){ @@ -121,9 +115,15 @@ public class StudySubjectUserServiceImpl extends ServiceImpl0){ + saveBatch(addList); + } + if(modifyList.size()>0){ + updateBatchById(modifyList); + } if(deleteList.size()>0){ removeBatchByIds(deleteList); }