diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java index ceea749c..3da4f241 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/meeting/controller/MeetingLeaveController.java @@ -117,7 +117,6 @@ public class MeetingLeaveController { cnd.and("info.userId", "=", SecurityUtil.getUserId()); cnd.and("ins.id", "is not", null); cnd.andEX("mi.type", "=", type); - cnd.and("info.createdBy", "=", SecurityUtil.getUserId()); if(year != null) { long startTime = DateUtil.parse(year + "-01-01").getTime(); long endTime = DateUtil.parse(year + "-12-31").getTime(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java index 79e67d0d..11df3df4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/controller/SiteRecordController.java @@ -65,10 +65,12 @@ public class SiteRecordController { ins.id AS instanceId, ins.state instanceState, ins.processDefineId instanceProcessDefineId, - t.displayName taskName + t.displayName taskName, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName FROM site_apply info LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 LEFT JOIN ( SELECT processInstanceId, diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java index 516694c9..04731d8e 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/site/service/impl/SiteApplyServiceImpl.java @@ -36,6 +36,9 @@ public class SiteApplyServiceImpl extends BaseServiceImpl implements @Override public Map validateApply(SiteApply apply, String day) { SiteInfo siteInfo = dao().fetch(SiteInfo.class, apply.getSiteId()); + if(apply.getJoinCount() > siteInfo.getMaxNum()) { + return Map.of(false, "预约人数最多为%s人".formatted(siteInfo.getMaxNum())); + } Sql sql = Sqls.create(""" select sa.* @@ -49,6 +52,7 @@ public class SiteApplyServiceImpl extends BaseServiceImpl implements cnd.and(SiteApply::getApplyDay, "=", day); cnd.and(SiteApply::getStartTime, "=", apply.getStartTime()); cnd.and(SiteApply::getEndTime, "=", apply.getEndTime()); + cnd.andEX("sa.id", "!=", apply.getId()); List stateList = List.of(ProcessInstanceStateEnum.DOING.getCode(), ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.PENDING.getCode()); cnd.and(ProcessInstance::getState, "in", stateList); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java index 4584ffaf..28711f40 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java @@ -21,6 +21,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -97,10 +98,14 @@ public class SourceChangeManageController { cnd.andEX("his.preparedBy", "=", pageForm.getPreparedBy()); cnd.andEX("his.userState", "=", pageForm.getUserState()); // cnd.andEX("his.changeType", "=", pageForm.getChangeType()); - cnd.andEX("his.changeOrigin", "=", pageForm.getChangeOrigins()); + cnd.andEX("his.changeOrigin", "=", pageForm.getChangeOrigin()); - if (StrUtil.isNotBlank(pageForm.getChangeType())) { - cnd.and(new Static("JSON_CONTAINS(his.changeTypes, JSON_QUOTE('%s'), '$')".formatted(pageForm.getChangeType()))); + if (Lang.isNotEmpty(pageForm.getChangeTypes())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + for (String type : pageForm.getChangeTypes()) { + seg.or(new Static("JSON_CONTAINS(his.changeTypes, JSON_QUOTE('%s'), '$')".formatted(type))); + } + cnd.and(seg); } if (StrUtil.isAllNotBlank(pageForm.getChangeDateBefore(), pageForm.getChangeDateEnd())) { diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/param/SourceChangePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/param/SourceChangePageForm.java index 493fc088..2148eb56 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/param/SourceChangePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/param/SourceChangePageForm.java @@ -46,5 +46,5 @@ public class SourceChangePageForm extends PageForm { private String changeDateEnd; //变更来源 - private List changeOrigins; + private String changeOrigin; } diff --git a/src/main/resources/views/platform/sys/role/index.html b/src/main/resources/views/platform/sys/role/index.html index e6865ba4..933ee5a0 100644 --- a/src/main/resources/views/platform/sys/role/index.html +++ b/src/main/resources/views/platform/sys/role/index.html @@ -664,10 +664,10 @@ layout("/layouts/platform.html"){ }) }, doMenu() { - if (this.searchText) { - this.$message.warning('请清空搜索条件后再提交') - return; - } + // if (this.searchText) { + // this.$message.warning('请清空搜索条件后再提交') + // return; + // } const ids = this.$refs["doMenuTree"].getCheckedKeys() if (!ids || ids.length === 0) { @@ -679,6 +679,7 @@ layout("/layouts/platform.html"){ text: "正在提交...", spinner: "el-icon-loading" }) + this.$axios .post("/platform/sys/role/menuDo", { roleId: this.roleId, diff --git a/src/main/resources/views/platform/sys/user/index.html b/src/main/resources/views/platform/sys/user/index.html index 130e6026..9bd496a8 100644 --- a/src/main/resources/views/platform/sys/user/index.html +++ b/src/main/resources/views/platform/sys/user/index.html @@ -5,7 +5,10 @@ layout("/layouts/platform.html"){ - + + + + @@ -294,7 +297,9 @@ layout("/layouts/platform.html"){ } }) } - } + }, + + units: [] } }, methods: { @@ -303,11 +308,11 @@ layout("/layouts/platform.html"){ return "" }, doSearch: function () { - let unit = this.parentUnitSearch[this.parentUnitSearch.length - 1] - if ("root" === unit) { - unit = "" - } - this.pageForm.searchUnit = unit + // let unit = this.parentUnitSearch[this.parentUnitSearch.length - 1] + // if ("root" === unit) { + // unit = "" + // } + // this.pageForm.searchUnit = unit this.pageForm.pageNumber = 1 this.pageData() }, @@ -452,8 +457,9 @@ layout("/layouts/platform.html"){ this.multipleSelection = val } }, - created() { + async created() { this.pageData() + this.units = await this.$businessTool.listUnit() } }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js index ed7dc38d..dfc9b1c2 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js @@ -88,7 +88,9 @@ const apply = { allowTimeList: [], selectDayList: [], dialogVisible: false, - formData: {}, + formData: { + applyCause: ',', + }, formRules: { applyUserId: [{required: true, message: '必填', trigger: ['blur', 'change']}], applyUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}], diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html index 6f65f995..19a68430 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/record/index.html @@ -102,7 +102,7 @@ layout("/layouts/platform.html"){ {prop: 'startTime', label: '开始时间'}, {prop: 'endTime', label: '结束时间'}, {prop: 'applyMobile', label: '联系方式'}, - {prop: 'taskName', label: '当前节点'}, + {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html index 3ed03a5a..04f20714 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/schoolUnionAudit/index.html @@ -128,7 +128,7 @@ layout("/layouts/platform.html"){ {prop: 'startTime', label: '开始时间'}, {prop: 'endTime', label: '结束时间'}, {prop: 'applyMobile', label: '联系方式'}, - {prop: 'taskName', label: '当前节点'}, + {prop: 'curTaskName', label: '当前节点'}, {prop: 'instanceState', label: '流程状态'}, ], typeOptions: [], diff --git a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html index 4ff7f110..c4574941 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html @@ -1,6 +1,23 @@ +
@@ -86,24 +126,27 @@ layout("/layouts/platform.html"){ + +