From 304b1004ec96572d31c0984190168b178e71416f Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 25 May 2026 20:18:45 +0800 Subject: [PATCH] commit --- .../common/ProposalCommonController.java | 3 +- .../ProposalCommissionerController.java | 7 +- .../ProposalCommitteeFilingController.java | 13 +- .../ProposalPositiveSecondedController.java | 2 +- ...roposalSchoolLeaderApprovalController.java | 9 +- src/main/resources/logback.xml | 98 +++- .../proposal/transact/commissioner/index.html | 71 ++- .../transact/committeeFiling/index.html | 478 ++++++++++++++++++ 8 files changed, 640 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java index 7e6cac3..43f7496 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.common; import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaMode; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.result.Result; @@ -33,7 +34,7 @@ public class ProposalCommonController { private ProposalCommonService proposalCommonService; @At - @SaCheckPermission("proposal") + @SaCheckPermission(value = {"proposal", "h5.proposal"}, mode = SaMode.OR) @ApiOperation("提案详情") public Result proposalInfo(@Valid String id) { return Result.success(proposalCommonService.info(id)); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java index 58b34de..dc6ad10 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommissionerController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.Dict; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; @@ -57,13 +58,13 @@ public class ProposalCommissionerController { @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/commissioner/index.html") - @SaCheckPermission("proposal.commissioner") + @SaCheckPermission("h5.proposal.commissioner") public void h5Index() { } @At - @SaCheckPermission("proposal.commissioner") + @SaCheckPermission(value = {"proposal.commissioner", "h5.proposal.commissioner"}, mode = SaMode.OR) public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { Sql sql = Sqls.create(""" SELECT @@ -124,7 +125,7 @@ public class ProposalCommissionerController { } @At - @SaCheckPermission("proposal.commissioner") + @SaCheckPermission(value = {"proposal.commissioner", "h5.proposal.commissioner"}, mode = SaMode.OR) @SLog(tag = "提案委员会委员意见", msg = "") @Aop(TransAop.READ_COMMITTED) public Result doApproval(Long processTaskId, String proposalId, String opinion, String caseFilingResult, String caseFilingType) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java index bf6f3c5..73b2c4f 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalCommitteeFilingController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.Dict; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; @@ -56,8 +57,14 @@ public class ProposalCommitteeFilingController { public void index() { } + @At("/h5") + @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html") + @SaCheckPermission("h5.proposal.committeeFiling") + public void h5Index() { + } + @At - @SaCheckPermission("proposal.committeeFiling") + @SaCheckPermission(value = {"proposal.committeeFiling", "h5.proposal.committeeFiling"}, mode = SaMode.OR) @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { Sql sql = Sqls.create(""" @@ -122,14 +129,14 @@ public class ProposalCommitteeFilingController { } @At - @SaCheckPermission("proposal.committeeFiling") + @SaCheckPermission(value = {"proposal.committeeFiling", "h5.proposal.committeeFiling"}, mode = SaMode.OR) @ApiOperation("查询提案分管校领导") public Result listBranchSchoolLeader(String keyword) { return Result.success(proposalCommitteeFilingService.listBranchSchoolLeader(keyword)); } @At - @SaCheckPermission("proposal.committeeFiling") + @SaCheckPermission(value = {"proposal.committeeFiling", "h5.proposal.committeeFiling"}, mode = SaMode.OR) @ApiOperation("并案审核") @Aop(TransAop.READ_COMMITTED) public Result merge(@Param("data") String data) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPositiveSecondedController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPositiveSecondedController.java index f6ad524..91e5cc6 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPositiveSecondedController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPositiveSecondedController.java @@ -191,7 +191,7 @@ public class ProposalPositiveSecondedController { } @At - @SaCheckPermission(value = {"proposal.seconded", "h5.proposal.seconded", "proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR) + @SaCheckPermission(value = {"proposal.seconded", "h5.proposal.seconded", "proposal.commissioner", "h5.proposal.commissioner", "proposal.committeeFiling", "h5.proposal.committeeFiling", "proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR) public Result listPositiveSeconded(String bizId) { List list = dao.query(ProposalSecond.class, Cnd.where(ProposalSecond::getProposalId, "=", bizId).and(ProposalSecond::getMode, "=", false)); return Result.success(list); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java index f3826ed..985ae6c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSchoolLeaderApprovalController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.proposal.controller.transact; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.Dict; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; @@ -53,13 +54,13 @@ public class ProposalSchoolLeaderApprovalController { @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html") - @SaCheckPermission("proposal.schoolLeaderApproval") + @SaCheckPermission("h5.proposal.schoolLeaderApproval") public void h5Index() { } @At - @SaCheckPermission("proposal.schoolLeaderApproval") + @SaCheckPermission(value = {"proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR) @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { // List vos = processTaskService.jumpAbleTaskNameList(280L); @@ -127,7 +128,7 @@ public class ProposalSchoolLeaderApprovalController { } @At - @SaCheckPermission("proposal.schoolLeaderApproval") + @SaCheckPermission(value = {"proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR) @ApiOperation("获取主办单位") public Result getHostUnitId(){ @@ -137,7 +138,7 @@ public class ProposalSchoolLeaderApprovalController { @At - @SaCheckPermission("proposal.schoolLeaderApproval") + @SaCheckPermission(value = {"proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR) @ApiOperation("执行任务") public Result executeTask(@Param("data") String data) { Dict args = Json.fromJson(Dict.class, data); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 4a00be9..87e2ef2 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,17 +1,85 @@ - + - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + + + + + ${LOG_HOME}/app.log + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + ${LOG_HOME}/app-%d{yyyy-MM-dd}.log + 300 + + + + + + + + + + + + + + + + + + + + + + + + <!– ERROR级别日志文件配置 –> ${LOG_HOME}/error.log @@ -41,19 +109,31 @@ ${LOG_HOME}/error-%d{yyyy-MM-dd}.log - 30 + 300 - + <!– 框架日志级别 –> + <!– –> - + <!– 日志级别和appender的关联 –> + - + --> + + + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html index 9492419..e228a99 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html @@ -2,7 +2,7 @@ layout("/layouts/platform_h5.html"){ #-->
- + @change="approvalTabChange"> @@ -53,7 +53,7 @@ layout("/layouts/platform_h5.html"){
-
提案委员会成员意见
+
提案委委员审议
@@ -78,19 +78,19 @@ layout("/layouts/platform_h5.html"){ @@ -144,21 +144,39 @@ layout("/layouts/platform_h5.html"){ components: { "proposal-info": PROPOSAL_INFO }, + computed: { + caseFilingResultColumns() { + return this.dict.type.PROPOSAL_CASE_FILING_RESULT.map(function (item) { + return {text: item.label, value: item.code} + }) + }, + caseFilingTypeColumns() { + return this.dict.type.PROPOSAL_CASE_FILING_TYPE.map(function (item) { + return {text: item.label, value: item.code} + }) + } + }, methods: { onReady() { this.listSession() }, + approvalTabChange(val) { + this.$set(this.pageForm, "approval", val === "1") + this.doSearch() + }, listSession() { this.$axios.post("/platform/proposal/common/listSession").then((res) => { if (res.code === 0) { - this.sessionOptions = [ + this.$set(this, "sessionOptions", [ { text: "全部届次", value: null } - ].concat(res.data.map((v) => ({text: v.fullName, value: v.id}))) + ].concat(res.data.map(function (v) { + return {text: v.fullName, value: v.id} + }))) if (this.sessionOptions.length > 0) { - this.pageForm.sessionId = this.sessionOptions[0].value + this.$set(this.pageForm, "sessionId", this.sessionOptions[0].value) this.doSearch() } } @@ -166,26 +184,39 @@ layout("/layouts/platform_h5.html"){ }, onView(row) { - this.showApprovalForm = false + this.$set(this, "showApprovalForm", false) this.$refs.proposalInfoRef.onOpen(row) }, - // 确定立案类型 + openCaseFilingResultPicker() { + this.$set(this, "showCaseFilingResultPicker", true) + }, + hideCaseFilingResultPicker() { + this.$set(this, "showCaseFilingResultPicker", false) + }, + openCaseFilingTypePicker() { + this.$set(this, "showCaseFilingTypePicker", true) + }, + hideCaseFilingTypePicker() { + this.$set(this, "showCaseFilingTypePicker", false) + }, + + // 确定立案结果 onCaseFilingResultConfirm(value) { this.$set(this.formData, "caseFilingResultName", value.text) this.$set(this.formData, "caseFilingResult", value.value) - this.showCaseFilingResultPicker = false + this.$set(this, "showCaseFilingResultPicker", false) }, // 确定立案类型 onCaseFilingTypeConfirm(value) { this.$set(this.formData, "caseFilingTypeName", value.text) this.$set(this.formData, "caseFilingType", value.value) - this.showCaseFilingTypePicker = false + this.$set(this, "showCaseFilingTypePicker", false) }, onApproval(row) { - this.showApprovalForm = true + this.$set(this, "showApprovalForm", true) this.$refs.proposalInfoRef.onOpen(row) this.$set(this, "formData", { processTaskId: row.taskId, @@ -220,8 +251,8 @@ layout("/layouts/platform_h5.html"){ doSearch() { this.$nextTick(() => { - this.pageForm.pageNumber = 1 - this.pageForm.totalCount = 0 + this.$set(this.pageForm, "pageNumber", 1) + this.$set(this.pageForm, "totalCount", 0) this.$refs.tableListRef.doSearch() }) }, diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html new file mode 100644 index 0000000..dfd397f --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html @@ -0,0 +1,478 @@ + +
+ + + + + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + + + + + + + + + + + + + + + + +
+ 取消 + 选择协办单位 + 确定 +
+ + + + + + + + + + + + + + + + +
+ 退回到提案人 + 提交 +
+
+ +
+ +