diff --git a/src/main/java/com/budwk/app/flow/service/FlowCommonService.java b/src/main/java/com/budwk/app/flow/service/FlowCommonService.java index 6e9f07c5..6ba1f693 100644 --- a/src/main/java/com/budwk/app/flow/service/FlowCommonService.java +++ b/src/main/java/com/budwk/app/flow/service/FlowCommonService.java @@ -36,7 +36,7 @@ public class FlowCommonService { args.put(FlowConst.TASK_FORM_DATA_PREFIX + "userName", SecurityUtil.getUserUsername()); args.put(FlowConst.TASK_FORM_DATA_PREFIX + "loginName", SecurityUtil.getUserLoginname()); args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitId", SecurityUtil.getUnitId()); - args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", SecurityUtil.getUnitId()); + args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", SecurityUtil.getUnitName()); args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unionId", SecurityUtil.getUnionId()); if (ObjectUtil.equals(submitType, ProcessSubmitTypeEnum.ROLLBACK.getCode())) { diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java index 7b4a6887..ea025070 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java @@ -395,6 +395,7 @@ public class SysUserServiceImpl extends BaseServiceImpl implements Sys .set("loginname", Strings.sNull(user.getLoginname())) .set("username", Strings.sNull(user.getUsername())) .set("unitId", Strings.sNull(user.getUnitId())) + .set("unitName", Strings.sNull(user.getUnit().getName())) .set("unitPath", Strings.sNull(user.getUnitPath())) .set("unionId", ObjectUtil.isEmpty(user.getUnion()) ? "" : user.getUnion().getId()) .set("unionGroupId", Strings.sNull(viewUser.getUnionGroupId())) diff --git a/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java b/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java index 3c82cce2..e92904d9 100644 --- a/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java +++ b/src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java @@ -40,6 +40,10 @@ public class SecurityUtil { return Strings.sNull(getSession().get("unitId")); } + public static String getUnitName() { + return Strings.sNull(getSession().get("unitName")); + } + /** * 获取当前用户工会ID */ diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java index 0b273ebb..3fd90cb1 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java @@ -215,14 +215,15 @@ public class ProposalMineController { SELECT t1.loginName, t1.userName, - t1.sex, + ifnull(t1.sex, u.sex) AS sex, t1.unitName, t1.unionName, - t1.mobile, + ifnull(t1.mobile, u.mobile) AS mobile, t2.NAME AS delegationName FROM teacher_congress_delegate t1 LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId + LEFT JOIN vw_user u ON u.id = t1.userId $condition """); Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId); @@ -281,14 +282,15 @@ public class ProposalMineController { t1.userId, t1.loginName, t1.userName, - t1.sex, + ifnull(t1.sex, u.sex) AS sex, t1.unitName, t1.unionName, - t1.mobile, + ifnull(t1.mobile, u.mobile) AS mobile, t2.NAME AS delegationName FROM teacher_congress_delegate t1 LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId + LEFT JOIN vw_user u ON u.id = t1.userId $condition """); sql.setCondition(Cnd.where("t1.loginName", "in", seconders).groupBy("t1.loginName")); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java index de9dc5f8..82c9dee9 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java @@ -71,7 +71,13 @@ public class ProposalQueryComprehensiveParam extends PageForm { cnd = Cnd.NEW(); } //教代会届次 - cnd.andEX("info.sessionId", "=", searchParam.getSessionId()); + SqlExpressionGroup expressionGroup = new SqlExpressionGroup(); + expressionGroup.orEX("info.sessionId", "=", searchParam.getSessionId()); + expressionGroup.orEX("info.sessionId", "in", searchParam.getSessionIds()); + if(!expressionGroup.isEmpty()){ + cnd.and(expressionGroup); + } + //提案名称 if (StrUtil.isNotBlank(searchParam.getName())) { cnd.where().andLike("info.name", searchParam.getName()); diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html index 29366a23..a6c7059f 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html @@ -172,12 +172,12 @@ layout("/layouts/platform.html"){ - + @@ -329,20 +329,20 @@ layout("/layouts/platform.html"){ this.pageForm.delegationId = null this.listDelegation() }, - listDelegation() { + /*listDelegation() { this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { if (res.code === 0) { this.delegationOptions = res.data } }) - }, + },*/ listSession() { this.$axios.post("/platform/proposal/common/listSession").then((res) => { if (res.code === 0) { this.sessionOptions = res.data if (this.sessionOptions) { - this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) - this.listDelegation() + /*this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id) + this.listDelegation()*/ this.pageData() } } diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html index 8170879e..ff77bf23 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html @@ -231,6 +231,14 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { + // 是否有协办单位 + let tf_helpunitreply; + if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) { + tf_helpunitreply = 'HAS_HELP_UNIT' + } else { + tf_helpunitreply = 'NO_HELP_UNIT' + } + const loading = createLoading('提交中') this.$axios.post("/flow/common/executeTask", { data: JSON.stringify({ @@ -239,6 +247,7 @@ layout("/layouts/platform.html"){ tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null, tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name), tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','), + tf_helpunitreply: tf_helpunitreply }) }).then((res) => { if (res.code === 0) { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js index d7bd213d..0800b45e 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js @@ -123,6 +123,14 @@ const merge = { cancelButtonText: "取消", type: "warning" }).then(() => { + // 是否有协办单位 + let tf_helpunitreply; + if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) { + tf_helpunitreply = 'HAS_HELP_UNIT' + } else { + tf_helpunitreply = 'NO_HELP_UNIT' + } + const loading = createLoading('提交中') this.$axios.post("/platform/proposal/committeeFiling/merge", { data: JSON.stringify({ @@ -132,6 +140,7 @@ const merge = { tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null, tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name), tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','), + tf_helpunitreply: tf_helpunitreply }) }).then((res) => { if (res.code === 0) { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html index 4c0c008f..a084700d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html @@ -127,8 +127,8 @@ layout("/layouts/platform.html"){ }, openAudit(row) { // 找这个代表团的副团长 - - + + this.$refs.guava.edit(() => { this.showApprovalForm = true this.formData = { @@ -148,6 +148,8 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { + console.log(this.formData) + return this.$axios.post("/flow/common/executeTask", { data: JSON.stringify({ ...this.formData,