From e865951a7c6e9e493a441fd976cb6b7e08f7f723 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Fri, 21 Nov 2025 10:50:35 +0800 Subject: [PATCH] commit --- .../senior/ProposalSeniorBasicController.java | 2 +- .../common/ProposalCommonServiceImpl.java | 3 - .../impl/ProposalExportServiceImpl.java | 5 +- ...TeacherCongressDelegatePushController.java | 3 +- ...CongressDelegatePushZgAuditController.java | 20 +++-- .../platform/js/mixin/initTableMixins.js | 2 +- .../proposal/export/comprehensive/index.html | 2 +- .../proposal/senior/basic/index.html | 16 +++- .../proposal/transact/feedback/index.html | 4 +- .../proposal/transact/write/index.html | 3 + .../teachercongress/delegate/push/index.html | 2 +- .../delegate/push/push-progress.js | 11 ++- .../teachercongress/delegate/push/write.js | 4 +- .../transact/feedbackEvaluation/index.html | 8 +- .../proposal/transact/write/index.html | 74 ++++++++----------- 15 files changed, 84 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorBasicController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorBasicController.java index 9500816..d06892d 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorBasicController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalSeniorBasicController.java @@ -89,7 +89,7 @@ public class ProposalSeniorBasicController { @ApiOperation(value = "提案内容修改") @Aop(TransAop.READ_COMMITTED) public Result update(@Valid @Param("info") ProposalInfo proposalInfo) { - dao.update(proposalInfo,"^name|typeId|brief|measures|excerpt|suggestUnits$"); + dao.update(proposalInfo,"^name|code|typeId|brief|measures|excerpt|suggestUnits$"); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java index d0a6904..f6b9cf2 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java @@ -143,9 +143,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp Cnd cnd = Cnd.NEW(); cnd.and(ProposalUndertakeSuggestion::getProposalId, "=", id); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and(ProposalUndertakeSuggestion::getUnitId, "=", getSelfManageUndertake().getId()); - } cnd.desc(ProposalUndertakeSuggestion::getTime); List undertakeSuggestions = dao().query(ProposalUndertakeSuggestion.class, cnd); info.put("undertakeSuggestions", undertakeSuggestions); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java index 907db9d..19270e7 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java @@ -164,6 +164,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp info.id, info.name, info.code, + info.suggestUnits, info.researchFindings, info.brief, info.measures, @@ -194,6 +195,8 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp list.get(i).put("index", i + 1); list.get(i).put("brief", HtmlUtil.cleanHtmlTag(list.get(i).getString("brief"))); list.get(i).put("measures", HtmlUtil.cleanHtmlTag(list.get(i).getString("measures"))); + list.get(i).put("suggestUnits", list.get(i).getString("suggestUnits").replace("[", "").replace("]", "")); + // 流程实例 ProcessInstance instance = dao().fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", list.get(i).getString("id"))); @@ -224,7 +227,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp 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("拟交办单位", "suggestUnits", 20)); Teacher_congress_session session = dao().fetch(Teacher_congress_session.class, pageForm.getSessionId()); String title = StrUtil.format("{}第{}{}教代会提案征集汇总表", Globals.AppName, session.getJ(), session.getC()); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java index 5740fbf..a106760 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java @@ -432,6 +432,7 @@ public class TeacherCongressDelegatePushController { """); Cnd cnd = Cnd.NEW(); SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62"); group.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801"); group.or("t.taskName", "is", null); cnd.and(group); @@ -561,7 +562,7 @@ public class TeacherCongressDelegatePushController { if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){ sql = getSql(pageForm, sessionId, unionId, isFormalOrAttendance); } else { - sql = getSql(pageForm, sessionId, SecurityUtil.getUnitId(), isFormalOrAttendance); + sql = getSql(pageForm, sessionId, SecurityUtil.getUnionId(), isFormalOrAttendance); } List exportList = baseService.listMap(sql); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java index 9bd7693..abfa608 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java @@ -20,6 +20,7 @@ import com.budwk.app.base.utils.PageUtil; import com.budwk.app.base.utils.SysOfficeTemplateUtil; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.flow.entity.ProcessTask; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.flow.vo.ProcessTaskVO; @@ -126,6 +127,11 @@ public class TeacherCongressDelegatePushZgAuditController { item.put("worker", item.getBoolean("worker") ? "是" : "否"); item.put("intermediateBelow", item.getBoolean("intermediateBelow") ? "是" : "否"); item.put("seniorTeacher", item.getBoolean("seniorTeacher") ? "是" : "否"); + if (item.getInt("instanceState") == ProcessInstanceStateEnum.FINISHED.getCode()) { + item.put("instanceStateName", "已通过"); + } else if (item.getInt("instanceState") == ProcessInstanceStateEnum.REJECT.getCode()) { + item.put("instanceStateName", "已拒绝"); + } }); @@ -146,6 +152,7 @@ public class TeacherCongressDelegatePushZgAuditController { entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20)); entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20)); + entityList.add(new ExcelExportEntity("状态", "instanceStateName", 20)); ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); @@ -231,11 +238,11 @@ public class TeacherCongressDelegatePushZgAuditController { @SaCheckPermission("tc.delegate.push.zcAudit") @SLog(tag = "代表管理-代表资格审查", msg = "审查通过") public Result submit(@Param("data") String param, @Valid String id) { - + Dict args = Json.fromJson(Dict.class, param); TeacherCongressDelegatePush delegatePush = baseService.dao().fetch(TeacherCongressDelegatePush.class, id); View_user user = baseService.dao().fetch(View_user.class, Cnd.where("id", "=", delegatePush.getUserId())); - if (delegatePush.getIsJdh()) { + if (delegatePush.getIsJdh() && args.getInt("submitType") == 1) { Teacher_congress_delegate delegate = new Teacher_congress_delegate(); Sys_user_role userRole = new Sys_user_role(); @@ -257,8 +264,8 @@ public class TeacherCongressDelegatePushZgAuditController { .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId())); if (ObjectUtil.isNotEmpty(delegation_unit)) { - delegate.setDelegationId(delegation_unit.getId()); - userRole.setTcDelegationId(delegation_unit.getId()); + delegate.setDelegationId(delegation_unit.getDelegationId()); + userRole.setTcDelegationId(delegation_unit.getDelegationId()); } else { return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。"); } @@ -277,9 +284,8 @@ public class TeacherCongressDelegatePushZgAuditController { userRole.setTcSessionId(delegatePush.getSessionId()); baseService.dao().insert(delegate); baseService.dao().insert(userRole); - } - Dict args = Json.fromJson(Dict.class, param); + flowCommonService.executeTask(args); return Result.success(); } @@ -298,7 +304,7 @@ public class TeacherCongressDelegatePushZgAuditController { try { response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition", "attachment;filename=" + - java.net.URLEncoder.encode("教代会代表推荐表.zip", "UTF-8")); + java.net.URLEncoder.encode("教代会代表推荐表.zip", "UTF-8")); ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream()); Sql sql = getSql(pageForm, sessionId, unionId, approval, isFormalOrAttendance); diff --git a/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js b/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js index f038667..9761855 100644 --- a/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js +++ b/src/main/resources/static/assets/platform/js/mixin/initTableMixins.js @@ -16,7 +16,7 @@ const initTableMixins = { searchName: "", searchKeyword: "", pageNumber: 1, - pageSize: 10, + pageSize: 20, totalCount: 0, pageOrderName: "", pageOrderBy: "", diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html index 3ae3f0a..910d4a2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html @@ -199,7 +199,7 @@ layout("/layouts/platform.html"){ {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "立案结果", prop: "caseFilingResult"}, - {label: "立案类型", prop: "caseFilingType"}, + // {label: "立案类型", prop: "caseFilingType"}, {label: "是否并案", prop: "merge"}, {label: "案由", prop: "brief", visible: false}, {label: "建议措施", prop: "measures", visible: false}, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html index 12b0a52..4fc8755 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html @@ -134,15 +134,22 @@ layout("/layouts/platform.html"){ + + + + + + + + + - - - @@ -170,6 +177,9 @@ layout("/layouts/platform.html"){ v-for="item in suggestUnitOptions"> + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html index b521a17..52293d2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html @@ -92,7 +92,7 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> -