c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-08-29 17:52:16 +08:00
parent a08ae49f03
commit 06a8e2fda4
90 changed files with 2475 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java
+2 -3
View File
@@ -68,7 +68,7 @@ public class CondolenceApplyController {
@At
@ApiOperation("保存申请")
@SaCheckPermission("condolence.apply")
@SLog(type = "condolence", tag = "职工慰问-慰问申请", msg = "保存职工慰问申请")
@SLog(tag = "职工慰问系统-慰问申请", msg = "保存申请")
public Result save(@Param("data") Condolence condolence) {
if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now());
dao.insertOrUpdate(condolence);
@@ -78,7 +78,7 @@ public class CondolenceApplyController {
@At
@ApiOperation("提交申请")
@SaCheckPermission("condolence.apply")
@SLog(type = "condolence", tag = "职工慰问-慰问申请", msg = "提交职工慰问申请")
@SLog(tag = "职工慰问系统-慰问申请", msg = "提交申请")
public Result submit(@Param("data") Condolence condolence) {
if(StrUtil.isBlank(condolence.getId())) condolence.setCreateTime(DateUtil.now());
dao.insertOrUpdate(condolence);
@@ -113,7 +113,6 @@ public class CondolenceApplyController {
@At
@ApiOperation("查询用户")
@SaCheckPermission("condolence.apply")
@SLog(type = "condolence", tag = "查询用户", msg = "查询用户")
public Object listUser(String keyword) {
Sql sql = Sqls.create("""
select
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class CondolenceMineController {
@ApiOperation("删除")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("condolence")
@SLog(type = "condolence", tag = "删除职工慰问", msg = "删除职工慰问")
@SLog(tag = "职工慰问系统-我的申请", msg = "删除职工慰问")
public Result delete(@Param("id") String id) {
condolenceService.delete(id);
flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java
+2 -2
View File
@@ -66,7 +66,7 @@ public class CondolenceTypeController {
@At
@ApiOperation("新增/修改职工慰问类型")
@SaCheckPermission("condolence.type")
@SLog(type = "condolence", tag = "新增/修改职工慰问类型", msg = "新增/修改职工慰问类型")
@SLog(tag = "职工慰问系统-慰问类型", msg = "新增/修改职工慰问类型")
public Object onSubmit(CondolenceType type) {
typeService.insertOrUpdate(type);
return Result.success();
@@ -75,7 +75,7 @@ public class CondolenceTypeController {
@At
@ApiOperation("删除职工慰问类型")
@SaCheckPermission("condolence.type")
@SLog(type = "condolence", tag = "删除职工慰问类型", msg = "删除职工慰问类型")
@SLog(tag = "职工慰问系统-慰问类型", msg = "删除职工慰问类型")
public Object onDelete(String id) {
typeService.delete(id);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalApplyController.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class LegalApplyController {
@At
@ApiOperation("新增/修改法律援助预约")
@SaCheckPermission("legal.apply")
@SLog(type = "legal", tag = "新增/修改法律援助预约", msg = "新增/修改法律援助预约")
@SLog(tag = "法律援助系统-援助申请", msg = "新增/修改法律援助预约")
public Object onSubmit(LegalApply apply) {
LegalApply legalApply = applyService.fetch(apply.getId());
if(StrUtil.isNotBlank(legalApply.getUserId())) {
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalAppointmentSetController.java
+3 -3
View File
@@ -87,7 +87,7 @@ public class LegalAppointmentSetController {
@At
@ApiOperation("新增/修改法律援助安排")
@SaCheckPermission("legal.appointmentSet")
@SLog(type = "legal", tag = "新增/修改法律援助安排", msg = "新增/修改法律援助安排")
@SLog(tag = "法律援助系统-预约安排", msg = "新增/修改法律援助安排")
public Object onSubmit(LegalApply apply) {
long startTimeTs = com.budwk.app.base.utils.DateUtil.formatDate(apply.getStartTime());
long endTimeTs = com.budwk.app.base.utils.DateUtil.formatDate(apply.getEndTime());
@@ -114,7 +114,7 @@ public class LegalAppointmentSetController {
@At
@ApiOperation("修改法律援助安排")
@SaCheckPermission("legal.appointmentSet")
@SLog(type = "legal", tag = "修改法律援助安排", msg = "修改法律援助安排")
@SLog(tag = "法律援助系统-预约安排", msg = "修改法律援助安排")
public Object onEdit(String id, String[] askType) {
LegalApply apply = applyService.fetch(id);
apply.setAskType(Lang.isNotEmpty(askType) ? Arrays.asList(askType) : new ArrayList<>());
@@ -127,7 +127,7 @@ public class LegalAppointmentSetController {
@At
@ApiOperation("删除法律援助安排")
@SaCheckPermission("legal.appointmentSet")
@SLog(type = "legal", tag = "删除法律援助安排", msg = "删除法律援助安排")
@SLog(tag = "法律援助系统-预约安排", msg = "删除法律援助安排")
public Object onDelete(String id) {
applyService.delete(id);
//TODO：以后这里加个发短信
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalDoctorController.java
+3 -4
View File
@@ -74,9 +74,9 @@ public class LegalDoctorController {
@At
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("新增/修改法律援助师")
@ApiOperation("提交法律援助预约")
@SaCheckPermission("legal.doctorManage")
@SLog(type = "legal", tag = "新增/修改法律援助师", msg = "新增/修改法律援助师")
@SLog(tag = "法律援助系统-援助申请", msg = "提交法律援助预约")
public Object onSubmit(LegalDoctor doctor) {
Sys_role role = sysRoleService.getByCode(RoleConstant.LEGAL_DOCTOR);
if(StrUtil.isBlank(doctor.getId())) {
@@ -104,7 +104,7 @@ public class LegalDoctorController {
@At
@ApiOperation("删除法律援助师")
@SaCheckPermission("legal.doctorManage")
@SLog(type = "legal", tag = "删除法律援助师", msg = "删除法律援助师")
@SLog(tag = "法律援助系统-援助师管理", msg = "删除法律援助师")
public Object onDelete(String id) {
doctorService.delete(id);
return Result.success();
@@ -113,7 +113,6 @@ public class LegalDoctorController {
@At
@ApiOperation("查询用户")
@SaCheckPermission("legal.doctorManage")
@SLog(type = "legal", tag = "查询用户", msg = "查询用户")
public Object listUser(String keyword) {
Sql sql = Sqls.create("""
select
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalListController.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class LegalListController {
@At
@ApiOperation("删除法律援助预约")
@SaCheckPermission("legal.list")
@SLog(type = "legal", tag = "删除法律援助预约", msg = "删除法律援助预约")
@SLog(tag = "法律援助系统-法律援助预约", msg = "删除法律援助预约")
public Object onDelete(String id) {
LegalApply apply = applyService.fetch(id);
apply.setUserId(null);
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalOnlinePostController.java
+2 -2
View File
@@ -86,7 +86,7 @@ public class LegalOnlinePostController {
@At
@ApiOperation("新增/修改法律援助线上发帖")
@SaCheckPermission("legal.onlinePost")
@SLog(type = "legal", tag = "新增/修改法律援助线上发帖", msg = "新增/修改法律援助线上发帖")
@SLog(tag = "法律援助系统-线上发帖", msg = "新增/修改法律援助线上发帖")
public Object onSubmit(LegalOnlinePost post) {
if(StrUtil.isBlank(post.getId())) {
View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
@@ -107,7 +107,7 @@ public class LegalOnlinePostController {
@At
@ApiOperation("删除法律援助线上发帖")
@SaCheckPermission("legal.onlinePost")
@SLog(type = "legal", tag = "删除法律援助线上发帖", msg = "删除法律援助线上发帖")
@SLog(tag = "法律援助系统-线上发帖", msg = "删除法律援助线上发帖")
public Object onDelete(String id) {
dao.delete(LegalOnlinePost.class, id);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalOnlineReplyController.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class LegalOnlineReplyController {
@At
@ApiOperation("新增/修改法律援助线上回复")
@SaCheckPermission("legal.onlineReply")
@SLog(type = "legal", tag = "新增/修改法律援助线上回复", msg = "新增/修改法律援助线上回复")
@SLog(tag = "法律援助系统-线上回复", msg = "新增/修改法律援助线上回复")
public Object onSubmit(LegalOnlineReply reply) {
if (StrUtil.isBlank(reply.getId())) {
View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalStudyController.java
+2 -2
View File
@@ -78,7 +78,7 @@ public class LegalStudyController {
@At
@ApiOperation("新增/修改法律援助资料")
@SaCheckPermission("legal.study")
@SLog(type = "legal", tag = "新增/修改法律援助资料", msg = "新增/修改法律援助资料")
@SLog(tag = "法律援助系统-援助资料", msg = "新增/修改法律援助资料")
public Object onSubmit(LegalStudy study) {
dao.insertOrUpdate(study);
return Result.success();
@@ -87,7 +87,7 @@ public class LegalStudyController {
@At
@ApiOperation("删除法律援助资料")
@SaCheckPermission("legal.study")
@SLog(type = "legal", tag = "删除法律援助资料", msg = "删除法律援助资料")
@SLog(tag = "法律援助系统-援助资料", msg = "删除法律援助资料")
public Object onDelete(String id) {
dao.delete(LegalStudy.class, id);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyApplyController.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class PsychologyApplyController {
@At
@ApiOperation("新增/修改心理咨询预约")
@SaCheckPermission("psychology.apply")
@SLog(type = "psychology", tag = "新增/修改心理咨询预约", msg = "新增/修改心理咨询预约")
@SLog(tag = "心理咨询系统-心理咨询预约", msg = "新增/修改心理咨询预约")
public Object onSubmit(PsychologyApply apply) {
PsychologyApply psychologyApply = applyService.fetch(apply.getId());
if(StrUtil.isNotBlank(psychologyApply.getUserId())) {
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyAppointmentSetController.java
+3 -3
View File
@@ -91,7 +91,7 @@ public class PsychologyAppointmentSetController {
@At
@ApiOperation("新增/修改心理咨询安排")
@SaCheckPermission("psychology.appointmentSet")
@SLog(type = "psychology", tag = "新增/修改心理咨询安排", msg = "新增/修改心理咨询安排")
@SLog(tag = "心理咨询系统-心理咨询安排", msg = "新增/修改心理咨询安排")
public Object onSubmit(PsychologyApply apply) {
long startTimeTs = com.budwk.app.base.utils.DateUtil.formatDate(apply.getStartTime());
long endTimeTs = com.budwk.app.base.utils.DateUtil.formatDate(apply.getEndTime());
@@ -118,7 +118,7 @@ public class PsychologyAppointmentSetController {
@At
@ApiOperation("修改心理咨询安排")
@SaCheckPermission("psychology.appointmentSet")
@SLog(type = "psychology", tag = "修改心理咨询安排", msg = "修改心理咨询安排")
@SLog(tag = "心理咨询系统-心理咨询安排", msg = "修改心理咨询安排")
public Object onEdit(String id, String[] askType) {
PsychologyApply apply = applyService.fetch(id);
apply.setAskType(Lang.isNotEmpty(askType) ? Arrays.asList(askType) : new ArrayList<>());
@@ -131,7 +131,7 @@ public class PsychologyAppointmentSetController {
@At
@ApiOperation("删除心理咨询安排")
@SaCheckPermission("psychology.appointmentSet")
@SLog(type = "psychology", tag = "删除心理咨询安排", msg = "删除心理咨询安排")
@SLog(tag = "心理咨询系统-心理咨询安排", msg = "删除心理咨询安排")
public Object onDelete(String id) {
applyService.delete(id);
//TODO：以后这里加个发短信
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java
+2 -3
View File
@@ -76,7 +76,7 @@ public class PsychologyDoctorController {
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("新增/修改心理咨询师")
@SaCheckPermission("psychology.doctorManage")
@SLog(type = "psychology", tag = "新增/修改心理咨询师", msg = "新增/修改心理咨询师")
@SLog(tag = "心理咨询系统-心理咨询师", msg = "新增/修改心理咨询师")
public Object onSubmit(PsychologyDoctor doctor) {
Sys_role role = sysRoleService.getByCode(RoleConstant.PSYCHOLOGY_DOCTOR);
if(StrUtil.isBlank(doctor.getId())) {
@@ -104,7 +104,7 @@ public class PsychologyDoctorController {
@At
@ApiOperation("删除心理咨询师")
@SaCheckPermission("psychology.doctorManage")
@SLog(type = "psychology", tag = "删除心理咨询师", msg = "删除心理咨询师")
@SLog(tag = "心理咨询系统-心理咨询师", msg = "删除心理咨询师")
public Object onDelete(String id) {
doctorService.delete(id);
return Result.success();
@@ -113,7 +113,6 @@ public class PsychologyDoctorController {
@At
@ApiOperation("查询用户")
@SaCheckPermission("psychology.doctorManage")
@SLog(type = "psychology", tag = "查询用户", msg = "查询用户")
public Object listUser(String keyword) {
Sql sql = Sqls.create("""
select
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyListController.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class PsychologyListController {
@At
@ApiOperation("删除心理咨询预约")
@SaCheckPermission("psychology.list")
@SLog(type = "psychology", tag = "删除心理咨询预约", msg = "删除心理咨询预约")
@SLog(tag = "心理咨询系统-心理咨询预约", msg = "删除心理咨询预约")
public Object onDelete(String id) {
PsychologyApply apply = applyService.fetch(id);
apply.setUserId(null);
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyOnlinePostController.java
+2 -2
View File
@@ -86,7 +86,7 @@ public class PsychologyOnlinePostController {
@At
@ApiOperation("新增/修改心理咨询线上发帖")
@SaCheckPermission("psychology.onlinePost")
@SLog(type = "psychology", tag = "新增/修改心理咨询线上发帖", msg = "新增/修改心理咨询线上发帖")
@SLog(tag = "心理咨询系统-线上发帖", msg = "新增/修改心理咨询线上发帖")
public Object onSubmit(PsychologyOnlinePost post) {
if(StrUtil.isBlank(post.getId())) {
View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
@@ -107,7 +107,7 @@ public class PsychologyOnlinePostController {
@At
@ApiOperation("删除心理咨询线上发帖")
@SaCheckPermission("psychology.onlinePost")
@SLog(type = "psychology", tag = "删除心理咨询线上发帖", msg = "删除心理咨询线上发帖")
@SLog(tag = "心理咨询系统-线上发帖", msg = "删除心理咨询线上发帖")
public Object onDelete(String id) {
dao.delete(PsychologyOnlinePost.class, id);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyOnlineReplyController.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class PsychologyOnlineReplyController {
@At
@ApiOperation("新增/修改心理咨询线上回复")
@SaCheckPermission("psychology.onlineReply")
@SLog(type = "psychology", tag = "新增/修改心理咨询线上回复", msg = "新增/修改心理咨询线上回复")
@SLog(tag = "心理咨询系统-线上回复", msg = "新增/修改心理咨询线上回复")
public Object onSubmit(PsychologyOnlineReply reply) {
if (StrUtil.isBlank(reply.getId())) {
View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyStudyController.java
+2 -2
View File
@@ -78,7 +78,7 @@ public class PsychologyStudyController {
@At
@ApiOperation("新增/修改心理咨询资料")
@SaCheckPermission("psychology.study")
@SLog(type = "psychology", tag = "新增/修改心理咨询资料", msg = "新增/修改心理咨询资料")
@SLog(tag = "心理咨询系统-咨询资料", msg = "新增/修改心理咨询资料")
public Object onSubmit(PsychologyStudy study) {
dao.insertOrUpdate(study);
return Result.success();
@@ -87,7 +87,7 @@ public class PsychologyStudyController {
@At
@ApiOperation("删除心理咨询资料")
@SaCheckPermission("psychology.study")
@SLog(type = "psychology", tag = "删除心理咨询资料", msg = "删除心理咨询资料")
@SLog(tag = "心理咨询系统-咨询资料", msg = "删除心理咨询资料")
public Object onDelete(String id) {
dao.delete(PsychologyStudy.class, id);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/constant/RecuperationSignUpMode.java
+2 -2
View File
@@ -19,12 +19,12 @@ public enum RecuperationSignUpMode {
/**
* 分工会模式
*/
UNION(1, "分工会组织", new String[]{"H04", "A06", "sysadmin"}),
UNION(1, "分工会组织", new String[]{"BRANCH_UNION_ADMIN", "BRANCH_UNION_CHAIRMAN", "SCHOOL_UNION_ADMIN", "SYSADMIN"}),
/**
* 自由模式
*/
FREE(2, "校工会组织", new String[]{"A06", "sysadmin"});
FREE(2, "校工会组织", new String[]{"SCHOOL_UNION_ADMIN", "SYSADMIN"});
private final int value;
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationBaseManagerController.java
+4 -4
View File
@@ -151,7 +151,7 @@ public class RecuperationBaseManagerController {
@ApiOperation("新增/编辑疗休养基地")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.baseManagement")
@SLog(type = "recuperation", tag = "新增/编辑疗休养基地", msg = "新增/编辑疗休养基地")
@SLog(tag = "疗休养管理-基地管理", msg = "新增/编辑疗休养基地")
public Result onSubmit(RecuperationBaseManagement baseManagement) {
baseManagement.setCreateUnionId(SecurityUtil.getUnionId());
dao.insertOrUpdate(baseManagement);
@@ -162,7 +162,7 @@ public class RecuperationBaseManagerController {
@ApiOperation("开启或关闭基地")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.baseManagement")
@SLog(type = "recuperation", tag = "开启或关闭基地", msg = "开启或关闭基地")
@SLog(tag = "疗休养管理-基地管理", msg = "开启或关闭基地")
public Result openClosedBase(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -175,7 +175,7 @@ public class RecuperationBaseManagerController {
@ApiOperation("删除基地")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.baseManagement")
@SLog(type = "recuperation", tag = "删除基地", msg = "删除基地")
@SLog(tag = "疗休养管理-基地管理", msg = "删除基地")
public Result onDelete(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -290,7 +290,7 @@ public class RecuperationBaseManagerController {
@ApiOperation("目的地导入")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.baseManagement")
@SLog(type = "recuperation", tag = "目的地导入", msg = "目的地导入")
@SLog(tag = "疗休养管理-基地管理", msg = "目的地导入")
@AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
public Result baseManagementImport(@Param("file") TempFile file) {
List<BaseManagerExcelMode> excelList = ExcelImportUtil.importExcel(file.getFile(), BaseManagerExcelMode.class, new ImportParams());
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationBranchUnionUserQueryController.java
+2 -2
View File
@@ -189,7 +189,7 @@ public class RecuperationBranchUnionUserQueryController {
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("设置出行人员")
@SaCheckPermission("recuperation.branchUnionUserQuery")
@SLog(type = "recuperation", tag = "设置出行人员", msg = "设置出行人员")
@SLog(tag = "疗休养管理-分工会查询", msg = "设置出行人员")
public Result setUpParticipants(@Param("data") String data) {
List<NutMap> list = Json.fromJsonAsList(NutMap.class, data);
for (NutMap map : list) {
@@ -205,7 +205,7 @@ public class RecuperationBranchUnionUserQueryController {
@At
@ApiOperation("删除报名信息")
@SaCheckPermission("recuperation.baseManagement")
@SLog(type = "recuperation", tag = "删除报名信息", msg = "删除报名信息")
@SLog(tag = "疗休养管理-分工会查询", msg = "删除报名信息")
public Result deleteMyEnrollInfoById(String id) {
enrollService.deleteMyEnrollInfoById(id);
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationConfigController.java
+2 -2
View File
@@ -53,7 +53,7 @@ public class RecuperationConfigController {
@ApiOperation("新增/编辑疗休养配置")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.config")
@SLog(type = "recuperation", tag = "新增/编辑疗休养配置", msg = "新增/编辑疗休养配置")
@SLog(tag = "疗休养管理-疗休养配置", msg = "新增/编辑疗休养配置")
public Result onSubmit(RecuperationConfig config, String[] lotDeleteList) {
if (Strings.isNotBlank(config.getId())) {
if (Lang.isNotEmpty(lotDeleteList)) {
@@ -103,7 +103,7 @@ public class RecuperationConfigController {
@ApiOperation("强制删除标段时长，会删除已绑定的线路和目的地")
@SaCheckLogin
@Aop(TransAop.READ_COMMITTED)
@SLog(type = "recuperation", tag = "删除标段", msg = "删除标段")
@SLog(tag = "疗休养管理-疗休养配置", msg = "删除标段")
public Result deleteLotById(String lotId) {
dao.clear(RecuperationLot.class, Cnd.where("id","=",lotId));
List<RecuperationLine> lineList = dao.query(RecuperationLine.class, Cnd.where("lotId", "=", lotId));
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationLineController.java
+4 -4
View File
@@ -119,7 +119,7 @@ public class RecuperationLineController {
@ApiOperation("新增/编辑疗休养线路")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.line")
@SLog(type = "recuperation", tag = "新增/编辑疗休养线路", msg = "新增/编辑疗休养线路")
@SLog(tag = "疗休养管理-疗休养线路", msg = "新增/编辑疗休养线路")
public Result onSubmit(RecuperationLine line) {
if (StrUtil.isBlank(line.getId())) {
if (lineService.count(Cnd.where("serialNumber", "=", line.getSerialNumber())) > 0) {
@@ -139,7 +139,7 @@ public class RecuperationLineController {
@ApiOperation("开启或关闭线路")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.line")
@SLog(type = "recuperation", tag = "开启或关闭线路", msg = "开启或关闭线路")
@SLog(tag = "疗休养管理-疗休养线路", msg = "开启或关闭线路")
public Result openClosedLine(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -152,7 +152,7 @@ public class RecuperationLineController {
@ApiOperation("删除线路")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.line")
@SLog(type = "recuperation", tag = "删除线路", msg = "删除线路")
@SLog(tag = "疗休养管理-疗休养线路", msg = "删除线路")
public Result onDelete(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -253,7 +253,7 @@ public class RecuperationLineController {
@ApiOperation("线路导入")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.line")
@SLog(type = "recuperation", tag = "线路导入", msg = "线路导入")
@SLog(tag = "疗休养管理-线路管理", msg = "线路导入")
@AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
public Result lineImport(@Param("file") TempFile file) {
List<LineExcelMode> excelList = ExcelImportUtil.importExcel(file.getFile(), LineExcelMode.class, new ImportParams());
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationLineSelectController.java
+6 -6
View File
@@ -163,7 +163,7 @@ public class RecuperationLineSelectController {
@At("/selectLine")
@ApiOperation("选择线路")
@SaCheckPermission(value = {"recuperation.branchUnionSelect", "recuperation.schoolUnionSelect"}, mode = SaMode.OR)
@SLog(type = "recuperation", tag = "选择线路", msg = "选择线路")
@SLog(tag = "疗休养管理-选择线路", msg = "选择线路")
public Result selectLine(RecuperationLineSelect us) {
lineSelectService.selectLine(us);
return Result.success();
@@ -179,7 +179,7 @@ public class RecuperationLineSelectController {
@ApiOperation("选择线路时间")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"recuperation.branchUnionSelect", "recuperation.schoolUnionSelect"}, mode = SaMode.OR)
@SLog(type = "recuperation", tag = "选择线路时间", msg = "选择线路时间")
@SLog(tag = "疗休养管理-选择线路", msg = "选择线路时间")
public Result selectLineTimes(@Param("lineSelects") RecuperationLineSelect[] lineSelects) {
if (Lang.isNotEmpty(lineSelects)) {
RecuperationLineSelect lineUnionSelect = lineSelects[0];
@@ -251,7 +251,7 @@ public class RecuperationLineSelectController {
@ApiOperation("取消选择线路")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"recuperation.branchUnionSelect", "recuperation.schoolUnionSelect"}, mode = SaMode.OR)
@SLog(tag = "recuperation", msg = "取消选择线路", param = true, result = true)
@SLog(tag = "疗休养管理-选择线路", msg = "取消选择线路")
public Result deSelect(@Param("lineId") String lineId, @Param("unionId") String unionId) {
try {
Assert.notBlank(lineId);
@@ -289,7 +289,7 @@ public class RecuperationLineSelectController {
@ApiOperation("是否公开分工会选择线路")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"recuperation.branchUnionSelect", "recuperation.schoolUnionSelect"}, mode = SaMode.OR)
@SLog(tag = "recuperation", msg = "公开分工会选择线路", param = true, result = true)
@SLog(tag = "疗休养管理-选择线路", msg = "公开分工会选择线路")
public Result isOpenUnionLine(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -324,7 +324,7 @@ public class RecuperationLineSelectController {
@ApiOperation("一键统赋时间，针对于已选择的线路")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"recuperation.branchUnionSelect", "recuperation.schoolUnionSelect"}, mode = SaMode.OR)
@SLog(type = "普惠疗休养", tag = "分工会/校工会选择线路", msg = "一键统赋时间，针对于已选择的线路", param = true, result = true)
@SLog(tag = "疗休养管理-选择线路", msg = "一键统赋时间，针对于已选择的线路")
public Result setGiveLineTimes(@Param("lineIds") String[] lineIds,
@Param("lineUnionSelects") RecuperationLineSelect[] lineSelects,
@Param(value = "year") Integer year) {
@@ -358,7 +358,7 @@ public class RecuperationLineSelectController {
@ApiOperation("是否开放对外报名")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission(value = {"recuperation.branchUnionSelect", "recuperation.schoolUnionSelect"}, mode = SaMode.OR)
@SLog(type = "普惠疗休养", tag = "分工会/校工会选择线路", msg = "是否开放对外报名", param = true, result = true)
@SLog(tag = "疗休养管理-选择线路", msg = "是否开放对外报名")
public Result doEditOpen(String id) {
dao.update(RecuperationLineSelect.class, Chain.makeSpecial("isOpen", "isOpen ^ 1"), Cnd.where("id", "=", id));
return Result.success();
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationSchoolUnionUserQueryController.java
+3 -3
View File
@@ -194,7 +194,7 @@ public class RecuperationSchoolUnionUserQueryController {
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("设置出行人员")
@SaCheckPermission("recuperation.schoolUnionUserQuery")
@SLog(type = "recuperation", tag = "设置出行人员", msg = "设置出行人员")
@SLog(tag = "疗休养管理-校工会查询", msg = "设置出行人员")
public Result setUpParticipants(@Param("data") String data) {
List<NutMap> list = Json.fromJsonAsList(NutMap.class, data);
for (NutMap map : list) {
@@ -210,7 +210,7 @@ public class RecuperationSchoolUnionUserQueryController {
@At
@ApiOperation("删除报名信息")
@SaCheckPermission("recuperation.schoolUnionUserQuery")
@SLog(type = "recuperation", tag = "删除报名信息", msg = "删除报名信息")
@SLog(tag = "疗休养管理-校工会查询", msg = "删除报名信息")
public Result deleteMyEnrollInfoById(String id) {
enrollService.deleteMyEnrollInfoById(id);
return Result.success();
@@ -288,7 +288,7 @@ public class RecuperationSchoolUnionUserQueryController {
@Aop(TransAop.READ_COMMITTED)
@ApiOperation("修改报名信息")
@SaCheckPermission("recuperation.schoolUnionUserQuery")
@SLog(type = "recuperation", tag = "修改报名信息", msg = "修改报名信息")
@SLog(tag = "疗休养管理-校工会查询", msg = "修改报名信息")
public Result doEdit(RecuperationEnroll enroll) {
enroll.setNormal(true);
dao.updateIgnoreNull(enroll);
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/controller/RecuperationTravelAgencyController.java
+7 -7
View File
@@ -98,7 +98,7 @@ public class RecuperationTravelAgencyController {
@ApiOperation("新增/编辑疗休养旅行社")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.travelAgency")
@SLog(type = "recuperation", tag = "新增/编辑疗休养旅行社", msg = "新增/编辑疗休养旅行社")
@SLog(tag = "疗休养管理-旅行社管理", msg = "新增/编辑疗休养旅行社")
public Result onSubmit(RecuperationTravelAgency travelAgency) {
if (StrUtil.isBlank(travelAgency.getId())) {
if (travelAgencyService.count(Cnd.where("serialNumber", "=", travelAgency.getSerialNumber())) > 0) {
@@ -118,7 +118,7 @@ public class RecuperationTravelAgencyController {
@ApiOperation("开启或关闭旅行社")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.travelAgency")
@SLog(type = "recuperation", tag = "开启或关闭旅行社", msg = "开启或关闭旅行社")
@SLog(tag = "疗休养管理-旅行社管理", msg = "开启或关闭旅行社")
public Result openClosedTravelAgency(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -131,7 +131,7 @@ public class RecuperationTravelAgencyController {
@ApiOperation("删除旅行社")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.travelAgency")
@SLog(type = "recuperation", tag = "删除旅行社", msg = "删除旅行社")
@SLog(tag = "疗休养管理-旅行社管理", msg = "删除旅行社")
public Result onDelete(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数错误");
@@ -142,7 +142,7 @@ public class RecuperationTravelAgencyController {
@At
@ApiOperation("查询旅行社")
@SaCheckPermission("recuperation.travelAgency")
@SaCheckPermission("recuperation")
public Result selectTravelAgency(Integer year) {
Cnd cnd = Cnd.NEW();
cnd.andEX("year", "=", year);
@@ -152,7 +152,7 @@ public class RecuperationTravelAgencyController {
@At
@ApiOperation("年度区间查询旅行社")
@SaCheckPermission("recuperation.travelAgency")
@SaCheckPermission("recuperation")
public Result selectTravelAgencyByYears(Integer startYear, Integer endYear) {
Cnd cnd = Cnd.NEW();
cnd.andEX("year", ">=", startYear);
@@ -163,7 +163,7 @@ public class RecuperationTravelAgencyController {
@At
@ApiOperation("根据旅行社id查线路")
@SaCheckPermission("recuperation.travelAgency")
@SaCheckPermission("recuperation")
public Result selectLineByAgencyId(String agencyId) {
Sql sql = Sqls.create("""
SELECT id,lineName FROM `the_rapy_recuperation_line` WHERE travelAgencyId=@travelAgencyId
@@ -213,7 +213,7 @@ public class RecuperationTravelAgencyController {
@ApiOperation("旅行社导入")
@Aop(TransAop.READ_COMMITTED)
@SaCheckPermission("recuperation.travelAgency")
@SLog(type = "recuperation", tag = "旅行社导入", msg = "旅行社导入")
@SLog(tag = "疗休养管理-旅行社管理", msg = "旅行社导入")
@AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
public Result travelAgencyImport(@Param("file") TempFile file) {
List<TravelAgencyExcelMode> travelAgency = ExcelImportUtil.importExcel(file.getFile(), TravelAgencyExcelMode.class, new ImportParams());
src/main/java/com/budwk/app/zhgh/staffbenefit/recuperation/mode/LineExcelMode.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class LineExcelMode extends ExcelImportError {
@Excel(name = "线路名称")
private String lineName;
@Excel(name = "旅行社名称")
@Excel(name = "所属旅行社")
private String travelAgencyId;
@Excel(name = "活动范围")