diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java index 2fdcebb3..07556885 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingActController.java @@ -98,7 +98,6 @@ public class CadreTrainingActController { } @At - @SaCheckPermission("cadreTraining.activity") @ApiOperation("查询单个活动信息") public Result get(@Param("id") String id) { CadreTrainingAct cadreTrainingAct = cadreTrainingActService.fetch(id); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java index 903e0ec4..63aad75e 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingCollectController.java @@ -141,7 +141,6 @@ public class CadreTrainingCollectController { @At @ApiOperation("获取活动列表") - @SaCheckPermission(value = {"cadreTraining.collect", "h5.cadreTraining.collect"}, mode = SaMode.OR) public Result getActivityList(Integer year) { Cnd cnd = Cnd.NEW(); // 添加年度筛选条件,基于报名开始时间 diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java index 25e5b3f4..465f672b 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSchoolAuditController.java @@ -112,6 +112,7 @@ public class CadreTrainingSchoolAuditController { } // 活动ID查询条件 cnd.andEX("info.cadreTrainingActId", "=", activityId); + cnd.andEX("year(info.applyTime)", "=", year); // 工会、单位名称查询条件 cnd.andEX("info.unionId", "=", unionId); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java index 115f5810..d009b12c 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/cadreTraining/controller/CadreTrainingSignUpController.java @@ -88,7 +88,7 @@ public class CadreTrainingSignUpController { Dict args = Dict.create(); args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); args.set(FlowConst.FORM_DATA, cadreTrainingSignUp); - ProcessInstance instance = flowEngine.startProcessInstanceByKey("GBPX", cadreTrainingSignUp.getId(), SecurityUtil.getUserId(), args); + ProcessInstance instance = flowEngine.startProcessInstanceByKey("GHGBPX", cadreTrainingSignUp.getId(), SecurityUtil.getUserId(), args); // 自动完成第一个申请任务 List doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java index 94ec92b1..a68bba80 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardQueryController.java @@ -112,7 +112,7 @@ public class ExerciseCardQueryController { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); String fileName = URLEncoder.encode("人员导入模版", "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + response.setHeader("Content-disposition", "attachment;filename*=" + fileName + ".xlsx"); EasyExcel.write(response.getOutputStream(), ExercisePeopleImportVo.class) .sheet("人员导入模版") .doWrite(ArrayList::new); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java index a29ccc09..b8569f27 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java @@ -101,10 +101,8 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl imple errorInfos.add(v); continue; } - //设置excel列的数据 - user.setUsername(v.getUsername()); - if (StrUtil.isNotBlank(v.getSex())) { - user.setSex(v.getSex()); + if (StrUtil.isNotBlank(v.getUsername())) { + user.setUsername(v.getUsername()); } insertOrUpdateUserList.add(user); @@ -117,7 +115,7 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl imple Record vwUser = vwUserMap.get(v.getLoginName()); if (vwUser != null) { exerciseCard.setUserId(vwUser.getString("id")); - exerciseCard.setUserId(vwUser.getString("userName")); + exerciseCard.setUserName(vwUser.getString("username")); exerciseCard.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd")); exerciseCard.setUnionId(vwUser.getString("unionId")); exerciseCard.setUnitId(vwUser.getString("unitId")); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java index 3e448b92..73fb63c8 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/controller/QsvBankController.java @@ -39,11 +39,12 @@ public class QsvBankController { @At @SaCheckPermission("qsv.bank") - public Result pageData(PageForm pageForm) { + public Result pageData(PageForm pageForm, String title) { Cnd cnd = Cnd.NEW(); if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { cnd.where().andLike(QsvBank::getTitle, pageForm.getSearchKeyword()); } + cnd.and(Cnd.likeEX("title", title)); Pagination pagination = qsvBankService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), cnd); return Result.success(pagination); } diff --git a/src/main/resources/views/platform/bpm/processDefine/index.html b/src/main/resources/views/platform/bpm/processDefine/index.html index a478dc72..c1a1afd2 100644 --- a/src/main/resources/views/platform/bpm/processDefine/index.html +++ b/src/main/resources/views/platform/bpm/processDefine/index.html @@ -16,10 +16,10 @@ layout("/layouts/platform.html"){ - + - + diff --git a/src/main/resources/views/platform/flow/definition/index.html b/src/main/resources/views/platform/flow/definition/index.html index 6060d77f..b5e4aea6 100644 --- a/src/main/resources/views/platform/flow/definition/index.html +++ b/src/main/resources/views/platform/flow/definition/index.html @@ -13,10 +13,10 @@ layout("/layouts/platform.html"){ - + - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html b/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html index ac756be3..2e70ef1e 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html @@ -7,7 +7,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html index a22af9c1..74850174 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html @@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
- - + + - - + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html index b9db3f04..d31592b8 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html @@ -11,7 +11,7 @@ layout("/layouts/platform.html"){ type="year" :clearable="false" value-format="yyyy" - placeholder="年度" + placeholder="请选择年度" style="width: 100%" @change="getActivityByYear"> diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html index 4b7babd9..77a60837 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html @@ -5,11 +5,11 @@ layout("/layouts/platform.html"){ - + - - + + @@ -32,7 +32,7 @@ layout("/layouts/platform.html"){ diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html index 2c1080fd..08b976fa 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html @@ -10,7 +10,7 @@ layout("/layouts/platform.html"){ v-model="pageForm.year" type="year" value-format="yyyy" - placeholder="年度" + placeholder="请选择年度" style="width: 100%" @change="getActivityByYear"> diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html index f785f9ce..9bcb3d86 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html @@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
- - + + - - + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html index b3dd0c98..90b931fe 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html @@ -5,10 +5,10 @@ layout("/layouts/platform.html"){
- - + + - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html index 699e1e4b..6f31dbf6 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html index 9059847b..d0608b8c 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html index 5cad6ef7..d2f80aee 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html index 3d6969c4..25c107f6 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html index 37e0d336..95057d72 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html index 6ee50b27..62f36d33 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html index 5ead82a5..4b3c2878 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html index cfbafd94..63d1f1bc 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html @@ -6,7 +6,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html index 3c719079..12e25333 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html @@ -18,7 +18,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html index d376c13a..550a9c85 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html @@ -16,7 +16,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html index 1997af51..dc75235f 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html @@ -22,7 +22,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html index 1dab4414..79122d96 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html @@ -30,7 +30,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html index 0f453944..803febf2 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html @@ -85,7 +85,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html index 3c719079..12e25333 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html @@ -18,7 +18,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html index b0abfc9a..b30b75f0 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html @@ -22,7 +22,7 @@ layout("/layouts/platform.html"){ > - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html b/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html index 8684a257..412fc8a9 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html @@ -12,7 +12,7 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html index 0c8a8c6d..07eea3ea 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html @@ -10,7 +10,7 @@ layout("/layouts/platform.html"){ - + placeholder="请选择所属工会" style="width: 100%;"> diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html index 29735766..d5346173 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html @@ -9,7 +9,7 @@ layout("/layouts/platform.html"){ - + placeholder="请选择所属工会" style="width: 100%;"> diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html index ad5a7f67..1bec75e4 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html @@ -7,11 +7,11 @@ layout("/layouts/platform.html"){ - - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html index 631c1a38..ec1f8f02 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html @@ -6,10 +6,10 @@ layout("/layouts/platform.html"){ - + - - + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html b/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html index 9515948e..1126d0bf 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html @@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
- - + + - - + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html b/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html index 404f1f7e..d1f49c29 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html @@ -11,7 +11,7 @@ layout("/layouts/platform.html"){