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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-05-13 17:29:11 +08:00
parent db52bdfe08
commit 652c647644
13 changed files with 138 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/service/FlowCommonService.java
+8 -2
View File
@@ -11,6 +11,7 @@ import com.budwk.app.flow.engine.event.ProcessPublisher;
import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.entity.ProcessTask;
import com.budwk.app.flow.enums.*;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain;
@@ -36,6 +37,7 @@ public class FlowCommonService {
* 执行任务
* @param args
*/
@Aop(TransAop.READ_COMMITTED)
public void executeTask(Dict args){
Long processTaskId = args.getLong(FlowConst.PROCESS_TASK_ID_KEY);
@@ -61,12 +63,16 @@ public class FlowCommonService {
args.put(FlowConst.SUBMIT_TYPE, submitType);
// 设置办理人信息到表单参数
View_user currentUser = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
// 设置办理人信息到流程表单变量，供审批记录、导出模板等场景读取。
// tf_unitId/tf_unionId 保存组织 ID；tf_unitName/tf_unionName 保存对应的展示名称。
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", currentUser == null ? "" : currentUser.getUnitName());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unionId", SecurityUtil.getUnionId());
args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unionName", currentUser == null ? "" : currentUser.getUnionName());
if (ObjectUtil.equals(submitType, ProcessSubmitTypeEnum.ROLLBACK.getCode())) {
// 退回上一个节点
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java
+30
View File
@@ -129,6 +129,36 @@ public class ProposalSecondedController {
return Result.success(pagination);
}
/**
* 统计当前登录人受邀附议待办数量。
*
* @param sessionId 教代会届次 ID，传空时统计当前登录人的全部受邀附议待办；传值时只统计该届次下的待附议数据
* @return Integer，表示当前登录人在受邀附议节点中尚未办理的任务数量
*/
@At
@SaCheckPermission(value = {"proposal.seconded", "h5.proposal.seconded"}, mode = SaMode.OR)
public Result todoCount(@Param("sessionId") String sessionId) {
Sql sql = Sqls.create("""
SELECT COUNT(DISTINCT t.id)
FROM wf_process_task t
LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
LEFT JOIN proposal_info info ON info.id = ins.businessNo
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("t.taskName", "=", "second");
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
cnd.andEX("info.sessionId", "=", sessionId);
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
}
sql.setCondition(cnd);
return Result.success(baseService.count(sql));
}
@At
@SaCheckPermission(value = {"proposal.seconded", "h5.proposal.seconded"}, mode = SaMode.OR)
@Aop(TransAop.READ_COMMITTED)
src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java
+4 -6
View File
@@ -221,13 +221,13 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
exportEntities.add(new ExcelExportEntity("提案编号", "code", 20));
exportEntities.add(new ExcelExportEntity("提案名称", "name", 20));
exportEntities.add(new ExcelExportEntity("提案案由", "brief", 40));
exportEntities.add(new ExcelExportEntity("代表调研情况", "researchFindings", 40));
// exportEntities.add(new ExcelExportEntity("代表调研情况", "researchFindings", 40));
exportEntities.add(new ExcelExportEntity("代表建议措施", "measures", 40));
exportEntities.add(new ExcelExportEntity("提案人", "createUserName", 20));
exportEntities.add(new ExcelExportEntity("提案人电话", "mobile", 20));
exportEntities.add(new ExcelExportEntity("附议人(两名)", "secondedUserNames", 20));
exportEntities.add(new ExcelExportEntity("提案单位", "unitName", 20));
exportEntities.add(new ExcelExportEntity("拟交办单位", "", 20));
// exportEntities.add(new ExcelExportEntity("拟交办单位", "", 20));
Teacher_congress_session session = dao().fetch(Teacher_congress_session.class, pageForm.getSessionId());
String title = StrUtil.format("{}第{}{}教代会提案征集汇总表", Globals.AppName, session.getJ(), session.getC());
@@ -263,8 +263,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
exportEntities.add(new ExcelExportEntity("提案人", "createUserName", 20));
exportEntities.add(new ExcelExportEntity("附议人", "secondedUserNames", 40));
exportEntities.add(new ExcelExportEntity("立案结果", "caseFilingResultName", 20));
exportEntities.add(new ExcelExportEntity("主办单位", "masterUnderTakeName", 20));
exportEntities.add(new ExcelExportEntity("协办单位", "slaveUnderTakeNamesStr", 30));
exportEntities.add(new ExcelExportEntity("承办单位", "masterUnderTakeName", 20));
exportEntities.add(new ExcelExportEntity("承办单位答复", "masterUnderTakeReply", 30));
exportEntities.add(new ExcelExportEntity("备注", "remark", 30));
exportEntities.add(new ExcelExportEntity("提案状态", "processInstanceNodeName", 20));
@@ -293,8 +292,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
exportEntities.add(new ExcelExportEntity("提案状态", "processInstanceNodeName", 20));
}
exportEntities.add(new ExcelExportEntity("立案结果", "caseFilingResultName", 20));
exportEntities.add(new ExcelExportEntity("主办单位", "masterUnderTakeName", 20));
exportEntities.add(new ExcelExportEntity("协办单位", "slaveUnderTakeNames", 30));
exportEntities.add(new ExcelExportEntity("承办单位", "masterUnderTakeName", 20));
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
return ExcelExportUtil.exportExcel(exportParams, exportEntities, list);
src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
+1 -3
View File
@@ -188,9 +188,7 @@ const PROPOSAL_INFO = {
</template>
</div>
</el-descriptions-item>
<el-descriptions-item label="主办单位" :span="3">{{task.ext.tf_masterUnitName}}
</el-descriptions-item>
<el-descriptions-item label="协办单位" :span="3">{{task?.ext?.tf_slaveUnitNameStr}}
<el-descriptions-item label="承办单位" :span="3">{{task.ext.tf_masterUnitName}}
</el-descriptions-item>
<el-descriptions-item label="办理意见" :span="3">
<div v-html="task.taskFormData.tf_opinion"></div>
src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html
+1 -2
View File
@@ -203,8 +203,7 @@ layout("/layouts/platform.html"){
{label: "是否并案", prop: "merge"},
{label: "案由", prop: "brief", visible: false},
{label: "建议措施", prop: "measures", visible: false},
{label: "主办单位", prop: "masterUnitName"},
{label: "协办单位", prop: "slaveUnitNames"},
{label: "承办单位", prop: "masterUnitName"},
{label: "当前节点", prop: "curTaskName"},
{label: "流程状态", prop: "instanceState"}
]
src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
+1 -2
View File
@@ -260,8 +260,7 @@ layout("/layouts/platform.html"){
{label: "立案结果", prop: "caseFilingResult"},
{label: "立案类型", prop: "caseFilingType"},
{label: "是否并案", prop: "merge"},
{label: "主办单位", prop: "masterUnitName"},
{label: "协办单位", prop: "slaveUnitNames"},
{label: "承办单位", prop: "masterUnitName"},
{label: "当前节点", prop: "curTaskName"},
{label: "流程状态", prop: "instanceState"}
],
src/main/resources/views/platform/zhgh/democratic/proposal/query/history/index.html
+1 -2
View File
@@ -116,8 +116,7 @@ layout("/layouts/platform.html"){
<el-tag v-else type="warning" size="small">否</el-tag>
</template>
</el-table-column>
<el-table-column label="主办单位" prop="masterUnitName" show-overflow-tooltip></el-table-column>
<el-table-column label="协办单位" prop="slaveUnitNames" show-overflow-tooltip></el-table-column>
<el-table-column label="承办单位" prop="masterUnitName" show-overflow-tooltip></el-table-column>
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}">
src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeReply/index.html
+1 -6
View File
@@ -23,16 +23,11 @@ layout("/layouts/platform.html"){
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="单位名称" prop="unitName" width="400" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="提案总数" prop="sum" sortable></el-table-column>
<el-table-column label="主办提案">
<el-table-column label="承办提案">
<el-table-column label="提案数量" prop="masterSum" sortable></el-table-column>
<el-table-column label="已答复" prop="masterReplySum" sortable></el-table-column>
<el-table-column label="未答复" prop="masterNoReplySum" sortable></el-table-column>
</el-table-column>
<el-table-column label="协办提案">
<el-table-column label="提案数量" prop="slaveSum" sortable></el-table-column>
<el-table-column label="已答复" prop="slaveReplySum" sortable v-if="slaveNeedReply"></el-table-column>
<el-table-column label="未答复" prop="slaveNoReplySum" sortable v-if="slaveNeedReply"></el-table-column>
</el-table-column>
</el-table>
</el-card>
</div>
src/main/resources/views/platform/zhgh/democratic/proposal/query/underTakeSatisfaction/index.html
+1 -2
View File
@@ -26,8 +26,7 @@ layout("/layouts/platform.html"){
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="单位名称" prop="unitName" width="400" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="提案总数" prop="sum" sortable></el-table-column>
<el-table-column label="主办提案数" prop="masterSum" sortable></el-table-column>
<el-table-column label="协办提案数" prop="slaveSum" sortable></el-table-column>
<el-table-column label="承办提案数" prop="masterSum" sortable></el-table-column>
<template v-for="dict in dict.type.PROPOSAL_FEEDBACK">
<el-table-column :label="dict.label" :prop="dict.code" sortable></el-table-column>
</template>
src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html
+1 -2
View File
@@ -112,8 +112,7 @@ layout("/layouts/platform.html"){
<el-tag size="mini" v-else type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column label="主办单位" prop="masterUnitName" show-overflow-tooltip></el-table-column>
<el-table-column label="协办单位" prop="slaveUnitNames" show-overflow-tooltip></el-table-column>
<el-table-column label="承办单位" prop="masterUnitName" show-overflow-tooltip></el-table-column>
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}">
src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html
+46 -7
View File
@@ -32,18 +32,21 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<el-tabs v-model="activeTab" type="card" @tab-click="tabChange">
<el-tab-pane name="inviteSeconded">
<span slot="label">
<i class="el-icon-message"></i>
受邀附议
</span>
</el-tab-pane>
<el-tab-pane name="positiveSeconded">
<span slot="label">
<i class="el-icon-edit-outline"></i>
主动附议
</span>
</el-tab-pane>
<el-tab-pane name="inviteSeconded">
<span slot="label">
<i class="el-icon-message"></i>
受邀附议
<span class="seconded-tab-badge" v-if="inviteSecondedTodoCount > 0">
{{ inviteSecondedTodoCount > 99 ? "99+" : inviteSecondedTodoCount }}
</span>
</span>
</el-tab-pane>
</el-tabs>
<table-tool :columns.sync="tableColumns">
@@ -110,6 +113,26 @@ layout("/layouts/platform.html"){
</guava>
</div>
<style>
.seconded-tab-badge {
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 16px;
height: 16px;
padding: 0 5px;
margin-left: 4px;
border-radius: 8px;
background: #f56c6c;
color: #fff;
font-size: 12px;
line-height: 16px;
font-weight: 500;
vertical-align: middle;
box-sizing: border-box;
}
</style>
<script nonce="${cspNonce!}">
<!--#include('../../common/info.js'){}#-->
@@ -122,7 +145,8 @@ layout("/layouts/platform.html"){
},
data: function () {
return {
activeTab: "inviteSeconded",
activeTab: "positiveSeconded",
inviteSecondedTodoCount: 0,
inviteColumns: [
{label: "提案编号", prop: "code"},
{label: "提案名称", prop: "name", width: "200px"},
@@ -239,6 +263,16 @@ layout("/layouts/platform.html"){
})
},
listInviteSecondedTodoCount: function () {
this.$axios.post("/platform/proposal/seconded/todoCount", {
sessionId: this.pageForm.sessionId
}).then((res) => {
if (res.code === 0) {
this.$set(this, "inviteSecondedTodoCount", res.data || 0)
}
})
},
showAuditButton: function (row) {
if (this.activeTab === "inviteSeconded") {
return row.taskState === 10
@@ -280,6 +314,7 @@ layout("/layouts/platform.html"){
}
this.$refs.proposalInfoRef.onOpen(row)
})
},
handleTaskAction: function (val) {
@@ -311,6 +346,7 @@ layout("/layouts/platform.html"){
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
this.listInviteSecondedTodoCount()
}
})
},
@@ -372,6 +408,7 @@ layout("/layouts/platform.html"){
this.$set(this.pageForm, "delegationId", null)
this.listDelegation()
}
this.listInviteSecondedTodoCount()
this.doSearch()
},
@@ -383,6 +420,7 @@ layout("/layouts/platform.html"){
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
this.pageData()
this.listDelegation()
this.listInviteSecondedTodoCount()
}
}
})
@@ -400,6 +438,7 @@ layout("/layouts/platform.html"){
this.syncTableColumns()
this.pageData()
this.listOpenSession()
this.listInviteSecondedTodoCount()
}
})
</script>
src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+1 -2
View File
@@ -161,8 +161,7 @@ const PROPOSAL_INFO = {
</template>
</div>
</van-cell>
<van-cell title="主办单位">{{ task.ext.tf_masterUnitName }}</van-cell>
<van-cell title="协办单位">{{ task?.ext?.tf_slaveUnitNameStr }}</van-cell>
<van-cell title="承办单位">{{ task.ext.tf_masterUnitName }}</van-cell>
</van-cell-group>
<van-cell-group :title="task.displayName" v-else>
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
+42 -2
View File
@@ -24,8 +24,15 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
<van-tabs v-model="activeTab" @change="tabChange">
<van-tab title="受邀附议" name="inviteSeconded"></van-tab>
<van-tab title="主动附议" name="positiveSeconded"></van-tab>
<van-tab name="inviteSeconded">
<template #title>
受邀附议
<span class="seconded-tab-badge" v-if="inviteSecondedTodoCount > 0">
{{ inviteSecondedTodoCount > 99 ? "99+" : inviteSecondedTodoCount }}
</span>
</template>
</van-tab>
</van-tabs>
<van-tabs v-model="pageForm.approvalText" @change="approvalTabChange">
@@ -82,6 +89,25 @@ layout("/layouts/platform_h5.html"){
</proposal-info>
</div>
<style>
.seconded-tab-badge {
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 16px;
height: 16px;
padding: 0 5px;
margin-left: 4px;
border-radius: 8px;
background: #ee0a24;
color: #fff;
font-size: 12px;
line-height: 16px;
font-weight: 500;
vertical-align: middle;
box-sizing: border-box;
}
</style>
<script nonce="${cspNonce!}">
<!--#include("../../common/info.js"){}#-->
@@ -90,7 +116,8 @@ layout("/layouts/platform_h5.html"){
store,
data() {
return {
activeTab: "inviteSeconded",
activeTab: "positiveSeconded",
inviteSecondedTodoCount: 0,
pageForm: {
pageNumber: 1,
pageSize: 10,
@@ -130,6 +157,7 @@ layout("/layouts/platform_h5.html"){
},
methods: {
onReady() {
this.listInviteSecondedTodoCount()
this.listSession()
},
tabChange(val) {
@@ -159,6 +187,7 @@ layout("/layouts/platform_h5.html"){
}
])
}
this.listInviteSecondedTodoCount()
this.doSearch()
},
listDelegation() {
@@ -194,10 +223,20 @@ layout("/layouts/platform_h5.html"){
if (this.sessionOptions.length > 0) {
this.$set(this.pageForm, "sessionId", this.sessionOptions[0].value)
this.doSearch()
this.listInviteSecondedTodoCount()
}
}
})
},
listInviteSecondedTodoCount() {
this.$axios.post("/platform/proposal/seconded/todoCount", {
sessionId: this.pageForm.sessionId
}).then((res) => {
if (res.code === 0) {
this.$set(this, "inviteSecondedTodoCount", res.data || 0)
}
})
},
currentTaskName(row) {
if (this.activeTab === "inviteSeconded") {
return row.curTaskName
@@ -287,6 +326,7 @@ layout("/layouts/platform_h5.html"){
this.$toast.success(res.msg)
this.doSearch()
this.updateSecond(val)
this.listInviteSecondedTodoCount()
}
})
},