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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-10-19 18:51:28 +08:00
parent 71860af928
commit 1cc6e62f07
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+5 -2
View File
@@ -368,10 +368,13 @@ public class TeacherCongressDelegatePushController {
@ApiOperation("本单位代表上报情况") @ApiOperation("本单位代表上报情况")
@SaCheckPermission("tc.delegate.push") @SaCheckPermission("tc.delegate.push")
public Result selfUnionPushMetric(String sessionId, String unionId) { public Result selfUnionPushMetric(String sessionId, String unionId) {
if (StrUtil.isBlank(unionId)){
unionId = SecurityUtil.getUnionId();
}
Teacher_congress_quota_allocation allocation = dao.fetch(Teacher_congress_quota_allocation.class, Teacher_congress_quota_allocation allocation = dao.fetch(Teacher_congress_quota_allocation.class,
Cnd.where(Teacher_congress_quota_allocation::getSessionId, "=", sessionId) Cnd.where(Teacher_congress_quota_allocation::getSessionId, "=", sessionId)
.and(Teacher_congress_quota_allocation::getUnionId, "=", SecurityUtil.getUnionId())); .and(Teacher_congress_quota_allocation::getUnionId, "=", unionId));
if (allocation == null) { if (allocation == null) {
return Result.success(); return Result.success();
} }
@@ -404,7 +407,7 @@ public class TeacherCongressDelegatePushController {
"""); """);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.andEX("info.sessionId", "=", sessionId); cnd.andEX("info.sessionId", "=", sessionId);
cnd.andEX("info.unionId", "=", SecurityUtil.getUnionId()); cnd.andEX("info.unionId", "=", unionId);
cnd.andEX("info.representativeType", "=", "正式代表"); cnd.andEX("info.representativeType", "=", "正式代表");
cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
sql.setCondition(cnd); sql.setCondition(cnd);
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+2 -2
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
<push-progress ref="pushProgressRef"></push-progress> <push-progress ref="pushProgressRef" ></push-progress>
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
@@ -238,7 +238,7 @@ layout("/layouts/platform.html"){
this.pageData() this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName; const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName) this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName,this.pageForm.unionId)
}, },
onView(row) { onView(row) {
this.writeDialog = true this.writeDialog = true