From 3a6e709f7f7cab8f57f523e26a4363e7584bf670 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 2 Feb 2026 18:11:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/SystemLogController.java | 4 +- .../form/systemLog/SystemLogSearchForm.java | 61 ---------------------- .../form/systemlog/SystemLogSearchForm.java | 61 ++++++++++++++++++++++ .../hxhq/business/service/ISystemLogService.java | 4 +- .../business/service/impl/StudyServiceImpl.java | 3 +- .../service/impl/StudySubjectServiceImpl.java | 24 ++------- .../service/impl/StudySubjectUserServiceImpl.java | 18 ++----- .../service/impl/SystemLogServiceImpl.java | 2 +- .../service/impl/SysDictDataServiceImpl.java | 3 +- 9 files changed, 74 insertions(+), 106 deletions(-) delete mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemLog/SystemLogSearchForm.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemlog/SystemLogSearchForm.java diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java index 0a1a463..0c81d1f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/SystemLogController.java @@ -1,16 +1,14 @@ package com.hxhq.business.controller; -import java.util.Arrays; import java.util.List; -import com.hxhq.business.form.systemLog.SystemLogSearchForm; +import com.hxhq.business.form.systemlog.SystemLogSearchForm; import com.hxhq.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.hxhq.business.domain.SystemLog; import com.hxhq.business.service.ISystemLogService; import com.hxhq.common.core.web.controller.BaseController; -import com.hxhq.common.core.web.domain.AjaxResult; import com.hxhq.common.core.web.page.TableDataInfo; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemLog/SystemLogSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemLog/SystemLogSearchForm.java deleted file mode 100644 index 9e37c50..0000000 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemLog/SystemLogSearchForm.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hxhq.business.form.systemLog; - -/** - * @author memory - */ -public class SystemLogSearchForm { - /** 操作类型 */ - private String jcmc; - - /** 操作内容 */ - private String jcnr; - - /** 操作人名称 */ - private String qmrMc; - - /** 开始日期 */ - private String startDate; - - /** 结束日期 */ - private String endDate; - - public String getJcmc() { - return jcmc; - } - - public void setJcmc(String jcmc) { - this.jcmc = jcmc; - } - - public String getJcnr() { - return jcnr; - } - - public void setJcnr(String jcnr) { - this.jcnr = jcnr; - } - - public String getQmrMc() { - return qmrMc; - } - - public void setQmrMc(String qmrMc) { - this.qmrMc = qmrMc; - } - - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } -} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemlog/SystemLogSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemlog/SystemLogSearchForm.java new file mode 100644 index 0000000..3dcfe04 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/systemlog/SystemLogSearchForm.java @@ -0,0 +1,61 @@ +package com.hxhq.business.form.systemlog; + +/** + * @author memory + */ +public class SystemLogSearchForm { + /** 操作类型 */ + private String jcmc; + + /** 操作内容 */ + private String jcnr; + + /** 操作人名称 */ + private String qmrMc; + + /** 开始日期 */ + private String startDate; + + /** 结束日期 */ + private String endDate; + + public String getJcmc() { + return jcmc; + } + + public void setJcmc(String jcmc) { + this.jcmc = jcmc; + } + + public String getJcnr() { + return jcnr; + } + + public void setJcnr(String jcnr) { + this.jcnr = jcnr; + } + + public String getQmrMc() { + return qmrMc; + } + + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java index 17854e6..1665090 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISystemLogService.java @@ -5,10 +5,8 @@ import java.util.List; import com.hxhq.business.domain.StudyJcgj; import com.hxhq.business.domain.SystemLog; import com.baomidou.mybatisplus.extension.service.IService; -import com.hxhq.business.enums.zykgl.JcgjlxEnum; -import com.hxhq.business.enums.zykgl.JcmcysEnum; import com.hxhq.business.form.common.SignForm; -import com.hxhq.business.form.systemLog.SystemLogSearchForm; +import com.hxhq.business.form.systemlog.SystemLogSearchForm; /** * 系统日志Service接口 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java index 5242b2c..c421858 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java @@ -307,7 +307,6 @@ public class StudyServiceImpl extends ServiceImpl implements jcgj.setQmrId(SecurityUtils.getUserId()); jcgj.setQmrMc(SecurityUtils.getNickName()); jcgj.setQmrMcEn(SecurityUtils.getUsername()); -// jcgj.setRemark(sign.getRemark()); } jcgjList.add(jcgj); } @@ -679,7 +678,7 @@ public class StudyServiceImpl extends ServiceImpl implements } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void autoGh() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status",StudyStatusEnum.gd.getValue()); 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 6ddb99d..4124c44 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 @@ -113,13 +113,9 @@ public class StudySubjectServiceImpl extends ServiceImpl itemList = form.getSubjectList(); - //已经设置的学科信息 List oldList = getListByStudyId(form.getStudyId()); List deleteList = new ArrayList<>(); @@ -131,13 +127,11 @@ public class StudySubjectServiceImpl extends ServiceImpl deleteNameList = new ArrayList<>(); List deleteNameEnList = new ArrayList<>(); - for(StudySubject item : itemList){ List exists = oldList.stream().filter(o->o.getDeptId().equals(item.getDeptId())).collect(Collectors.toList()); if(exists.size()==0){ item.setStudyId(form.getStudyId()); addList.add(item); - addNameList.add(item.getLeaderName()); addNameEnList.add(item.getLeaderNameEn()); }else{ @@ -150,7 +144,6 @@ public class StudySubjectServiceImpl extends ServiceImplo.getDeptId().equals(old.getDeptId())).collect(Collectors.toList()).size()==0){ deleteList.add(old); @@ -158,7 +151,6 @@ public class StudySubjectServiceImpl extends ServiceImpl0){ //已有表单的学科不能删除(预填+填报) List formCountList = baseMapper.queryFormCountList(deleteList.stream().map(o->o.getId()).collect(Collectors.toList())); @@ -169,10 +161,7 @@ public class StudySubjectServiceImpl extends ServiceImpl0){ removeBatchByIds(deleteList); @@ -180,7 +169,6 @@ public class StudySubjectServiceImpl extends ServiceImpl0){ saveBatch(addList); } @@ -191,14 +179,10 @@ public class StudySubjectServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ - formData.put("新增人员", String.join("，",addNameList)); -// formDataEn.put("Add Person", String.join("，",addNameEnList)); - formDataEn.put("Add Person", String.join("，",addNameList)); + formData.put("新增人员", String.join("，",addNameList)); formDataEn.put("Add Person", String.join("，",addNameList)); } if(deleteNameList.size()>0){ - formData.put("删除人员", String.join("，",deleteNameList)); -// formDataEn.put("Remove Person", String.join("，",deleteNameEnList)); - formDataEn.put("Remove Person", String.join("，",deleteNameList)); + formData.put("删除人员", String.join("，",deleteNameList)); formDataEn.put("Remove Person", String.join("，",deleteNameList)); } form.getSign().setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); form.getSign().setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Change of Person":""); 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 f484324..ccfd684 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 @@ -58,14 +58,9 @@ public class StudySubjectUserServiceImpl extends ServiceImpl itemList = form.getSubjectUserList(); //已经设置的学科信息 @@ -100,7 +95,6 @@ public class StudySubjectUserServiceImpl extends ServiceImplo.getUserId().equals(old.getUserId())).collect(Collectors.toList()).size()==0){ deleteList.add(old); @@ -114,9 +108,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl0){ saveBatch(addList); @@ -127,18 +119,15 @@ public class StudySubjectUserServiceImpl extends ServiceImpl0){ removeBatchByIds(deleteList); } - if(deleteNameList.size()>0 || addNameList.size()>0){ Map formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join("，",addNameList)); -// formDataEn.put("Add Person", String.join("，",addNameEnList)); formDataEn.put("Add Person", String.join("，",addNameList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join("，",deleteNameList)); -// formDataEn.put("Remove Person", String.join("，",deleteNameEnList)); formDataEn.put("Remove Person", String.join("，",deleteNameList)); } form.getSign().setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); @@ -159,7 +148,6 @@ public class StudySubjectUserServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); formData.put("删除人员", String.join("，",deleteNameList)); -// formDataEn.put("Remove Person", String.join("，",deleteNameEnList)); formDataEn.put("Remove Person", String.join("，",deleteNameList)); sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java index e94ec6a..79d47b4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SystemLogServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.StudyJcgj; import com.hxhq.business.form.common.SignForm; -import com.hxhq.business.form.systemLog.SystemLogSearchForm; +import com.hxhq.business.form.systemlog.SystemLogSearchForm; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import org.springframework.stereotype.Service; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java index 62fda39..3ce0c57 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysDictDataServiceImpl.java @@ -30,7 +30,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService @Override public List selectDictDataList(SysDictData dictData) { - if(dictData.getDictType().contains(",")) { + String split = ","; + if(dictData.getDictType().contains(split)) { List sysDictDataList = new ArrayList<>(); String[] dictTypeList = dictData.getDictType().split(","); for (String dictType : dictTypeList) {