From aff992faf0c3dd4ddbb29d118fc637aa50d5a295 Mon Sep 17 00:00:00 2001 From: hongqiwei <1143662660@qq.com> Date: Fri, 9 Oct 2026 10:06:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=A1=88=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../budwk/app/base/constant/RoleConstant.java | 1 + .../FlowSchoolUnionChairmanHandler.java | 54 +++ .../handler/FlowUnitSchoolLeaderHandler.java | 49 +++ .../sys/services/SysDataUserPullService.java | 3 +- .../impl/SysDataUnitPullServiceImpl.java | 297 ++----------- .../impl/SysDataUserAllUpdateServiceImpl.java | 78 +++- .../SysDataUserIncrUpdateServiceImpl.java | 67 ++- .../impl/SysDataUserPullServiceImpl.java | 141 +++--- .../ProposalQueryYearReportController.java | 1 - .../senior/ProposalSeniorBasicController.java | 2 +- .../ProposalCommitteeFilingController.java | 20 +- .../ProposalDelegationController.java | 11 +- .../transact/ProposalPreAuditController.java | 24 +- ...roposalSchoolLeaderApprovalController.java | 17 +- .../ProposalUnSubmitQueryController.java | 14 +- .../ProposalUnderTakeReplyController.java | 24 +- .../ProposalQueryComprehensiveParam.java | 13 +- .../proposal/param/ProposalSearchParam.java | 5 +- .../common/ProposalCommonServiceImpl.java | 40 +- .../ProposalCommitteeFilingServiceImpl.java | 8 +- ...roposalCommitteeFilingUnitServiceImpl.java | 139 +----- .../impl/ProposalExportServiceImpl.java | 14 +- .../ProposalUnderTakeReplyServiceImpl.java | 2 +- .../impl/WelfareProjectServiceImpl.java | 9 +- .../views/platform/sys/data/user/pull.html | 4 +- .../zhgh/democratic/proposal/common/info.js | 13 +- .../proposal/config/unit/index.html | 10 +- .../democratic/proposal/config/unit/user.js | 2 +- .../proposal/export/comprehensive/index.html | 2 - .../proposal/query/collectProgress/index.html | 2 - .../proposal/query/comprehensive/index.html | 5 - .../proposal/query/yearReport/index.html | 2 - .../proposal/senior/basic/index.html | 7 - .../proposal/senior/delete/index.html | 2 - .../proposal/senior/expediting/index.html | 2 - .../proposal/senior/feedback/index.html | 2 - .../proposal/senior/type/index.html | 2 - .../proposal/transact/caseCheck/index.html | 1 - .../transact/committeeFiling/index.html | 1 - .../transact/committeeFilingUnit/index.html | 19 +- .../proposal/transact/control/index.html | 2 - .../proposal/transact/delegation/index.html | 1 - .../proposal/transact/feedback/index.html | 1 - .../proposal/transact/preAudit/index.html | 5 +- .../transact/schoolLeaderApproval/index.html | 1 - .../transact/unSubmitQuery/index.html | 25 +- .../proposal/transact/unitReply/index.html | 7 +- .../zhgh/welfare/projectMange/index.html | 126 ++++-- .../zhghh5/democratic/proposal/common/info.js | 3 +- .../democratic/proposal/common/task-popup.js | 151 ++++++- .../proposal/transact/caseCheck/index.html | 1 - .../transact/committeeFiling/index.html | 415 ++++++++++++++++++ .../proposal/transact/delegation/index.html | 2 +- .../proposal/transact/preAudit/index.html | 7 +- .../views/platform/zhghh5/sys/home/todo.js | 2 +- 55 files changed, 1150 insertions(+), 708 deletions(-) create mode 100644 src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionChairmanHandler.java create mode 100644 src/main/java/com/budwk/app/flow/handler/FlowUnitSchoolLeaderHandler.java create mode 100644 src/main/resources/views/platform/zhghh5/democratic/proposal/transact/committeeFiling/index.html diff --git a/src/main/java/com/budwk/app/base/constant/RoleConstant.java b/src/main/java/com/budwk/app/base/constant/RoleConstant.java index 69f1abf..c9e23d5 100644 --- a/src/main/java/com/budwk/app/base/constant/RoleConstant.java +++ b/src/main/java/com/budwk/app/base/constant/RoleConstant.java @@ -50,6 +50,7 @@ RoleConstant { BRANCH_UNION_WENTI_SPORTS("分工会文体福利委员"), UNIT_PARTY_SECRETARY("单位党委书记"), + UNIT_SCHOOL_LEADER("分管校领导"), TEACHER_CONGRESS_DELEGATE_FORMAL("教代会正式代表"), TEACHER_CONGRESS_DELEGATE_ATTENDANCE("教代会列席代表"), diff --git a/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionChairmanHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionChairmanHandler.java new file mode 100644 index 0000000..4753ff0 --- /dev/null +++ b/src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionChairmanHandler.java @@ -0,0 +1,54 @@ +package com.budwk.app.flow.handler; + +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.flow.engine.AssignmentHandler; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.engine.model.TaskModel; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; + +import java.util.List; + +/** + * 为校工会主席审核任务分配拥有校工会主席角色的用户。 + */ +public class FlowSchoolUnionChairmanHandler implements AssignmentHandler { + + /** + * 按校工会主席角色查询参与者，去除同一用户的重复角色记录。 + * + * @param model 当前流程任务模型，无需额外传入人员参数 + * @param execution 当前流程执行上下文，无需额外传入业务参数 + * @return 用户 ID 列表，供流程引擎创建任务参与者；未配置角色用户时返回空列表 + */ + @Override + public List assign(TaskModel model, Execution execution) { + Dao dao = ServiceContext.find(Dao.class); + Sql sql = Sqls.create(""" + SELECT + userRole.userId + FROM + `sys_user_role` userRole + LEFT JOIN sys_role role ON role.id = userRole.roleId + WHERE + role.`code` = @roleCode + GROUP BY + userRole.userId + """).setParam("roleCode", RoleConstant.SCHOOL_UNION_CHAIRMAN.name()); + sql.setCallback(Sqls.callback.strList()); + dao.execute(sql); + return sql.getList(String.class); + } + + @Override + public String getMessage() { + return "获取校工会主席"; + } + + @Override + public int getOrder() { + return AssignmentHandler.super.getOrder(); + } +} diff --git a/src/main/java/com/budwk/app/flow/handler/FlowUnitSchoolLeaderHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowUnitSchoolLeaderHandler.java new file mode 100644 index 0000000..5878e58 --- /dev/null +++ b/src/main/java/com/budwk/app/flow/handler/FlowUnitSchoolLeaderHandler.java @@ -0,0 +1,49 @@ +package com.budwk.app.flow.handler; + +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.flow.engine.AssignmentHandler; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.engine.model.TaskModel; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; + +import java.util.List; + +/** + * 为分管校领导审核任务分配拥有 UNIT_SCHOOL_LEADER 角色的用户。 + */ +public class FlowUnitSchoolLeaderHandler implements AssignmentHandler { + + /** + * 按角色查询参与者，去除同一用户的重复角色记录。 + * + * @param model 当前流程任务模型，无需额外传入人员参数 + * @param execution 当前流程执行上下文，无需额外传入业务参数 + * @return 用户 ID 列表，供流程引擎创建任务参与者；未配置角色用户时返回空列表 + */ + @Override + public List assign(TaskModel model, Execution execution) { + Dao dao = ServiceContext.find(Dao.class); + Sql sql = Sqls.create(""" + SELECT + userRole.userId + FROM + sys_user_role userRole + LEFT JOIN sys_role role ON role.id = userRole.roleId + WHERE + role.`code` = @roleCode + GROUP BY + userRole.userId + """).setParam("roleCode", RoleConstant.UNIT_SCHOOL_LEADER.name()); + sql.setCallback(Sqls.callback.strList()); + dao.execute(sql); + return sql.getList(String.class); + } + + @Override + public String getMessage() { + return "获取分管校领导"; + } +} diff --git a/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java b/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java index d12dec1..2b23d87 100644 --- a/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java +++ b/src/main/java/com/budwk/app/sys/services/SysDataUserPullService.java @@ -11,7 +11,8 @@ import java.util.Map; public interface SysDataUserPullService extends BaseService { /** - * 从信息中心拉取数据 + * 从本地中间表同步单位，并将人员写入 sys_user_source 快照；不更新 sys_user。 + * 返回本次人员快照的拉取时间。 */ Date pull(); diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java index c42ecf1..238a0a9 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java @@ -1,15 +1,6 @@ package com.budwk.app.sys.services.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.core.util.URLUtil; -import cn.hutool.http.Header; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import com.budwk.app.base.config.DataCenterProperties; import com.budwk.app.base.exception.BaseException; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.sys.models.Sys_unit; @@ -17,41 +8,24 @@ import com.budwk.app.sys.services.SysDataUnitPullService; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; import org.nutz.ioc.aop.Aop; -import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; /** - * @version 1.0 - * @Author zzr - * @name：SysDataUnitPullServiceImpl - * @Date 2025/9/15 17:52 - * @注释 + * 将本地单位中间表同步到系统单位表。 */ @Slf4j @IocBean(args = {"refer:dao"}) public class SysDataUnitPullServiceImpl extends BaseServiceImpl implements SysDataUnitPullService { - private static final String DMP_UNIT_KEY = "unit"; - private static final int DMP_PAGE_SIZE = 1000; - - @Inject - private DataCenterProperties dataCenterProperties; - public SysDataUnitPullServiceImpl(Dao dao) { super(dao); } - @Override @Aop(TransAop.READ_COMMITTED) public void updateUnits() { @@ -59,240 +33,65 @@ public class SysDataUnitPullServiceImpl extends BaseServiceImpl implem } /** - * 拉取单位数据 + * 从 unit_middle 同步全部二级单位。 + * unitIds 是旧调用链传入的已有单位 ID 列表；中间表同步按全表执行，不依赖此参数。 + * 返回值为空；已存在单位只更新中间表明确提供的字段。 */ @Override @Aop(TransAop.READ_COMMITTED) public void updateUnits(List unitIds) { - String accessToken = getDmpAccessToken(); - List rawDataList = distinctDmpUnits(pullDmpUnits(getDmpUnitUrl(), accessToken)); - Set parentCodes = rawDataList.stream() - .map(this::getNormalizedParentCode) - .filter(StrUtil::isNotBlank) - .collect(Collectors.toSet()); - - rawDataList.stream() - .sorted(Comparator.comparingInt(this::getUnitLevel)) - .forEach(raw -> saveOrUpdateUnit(raw, parentCodes)); - - log.info("信息中心单位数据同步完成，本次接口返回单位数量: {}，待检查单位编码数量: {}", rawDataList.size(), unitIds == null ? 0 : unitIds.size()); - } - - /** - * 获取信息中心开放平台访问令牌。 - * 参数来自 data-center.token-url、data-center.key、data-center.secret； - * 返回值为后续单位接口 body 中 access_token 使用的字符串。 - */ - private String getDmpAccessToken() { - String tokenUrl = dataCenterProperties.getTokenUrl(); - if (StrUtil.isBlank(tokenUrl)) { - throw new BaseException("未配置信息中心token地址: data-center.token-url"); - } - String key = dataCenterProperties.getKey(); - if (StrUtil.isBlank(key)) { - throw new BaseException("未配置信息中心token key: data-center.key"); - } - String secret = dataCenterProperties.getSecret(); - if (StrUtil.isBlank(secret)) { - throw new BaseException("未配置信息中心token secret: data-center.secret"); + List middleUnits = listMap(Sqls.create("SELECT DWDM, DWMC, BMFLMC FROM unit_middle")); + if (middleUnits.isEmpty()) { + throw new BaseException("本地单位中间表没有数据，已停止同步"); } - String params = URLUtil.buildQuery(Map.of("key", key, "secret", secret), StandardCharsets.UTF_8); - String tokenResBody = HttpUtil.createGet(tokenUrl + "?" + params).execute().body(); - JSONObject tokenJsonBody = JSONUtil.parseObj(tokenResBody); - String accessToken = tokenJsonBody.getStr("access_token"); - if (StrUtil.isBlank(accessToken) && tokenJsonBody.getJSONObject("result") != null) { - accessToken = tokenJsonBody.getJSONObject("result").getStr("access_token"); - } - if (StrUtil.isBlank(accessToken) && tokenJsonBody.getJSONObject("data") != null) { - accessToken = tokenJsonBody.getJSONObject("data").getStr("access_token"); - } - if (StrUtil.isBlank(accessToken)) { - accessToken = tokenJsonBody.getStr("token"); - } - if (StrUtil.isBlank(accessToken)) { - throw new BaseException("获取信息中心token失败"); - } - return accessToken; - } - - /** - * 读取信息中心单位接口地址。 - * 配置项为 data-center.urls.unit，返回值为单位全量接口URL。 - */ - private String getDmpUnitUrl() { - String url = dataCenterProperties.getUrls().get(DMP_UNIT_KEY); - if (StrUtil.isBlank(url)) { - throw new BaseException("未配置信息中心单位接口地址: data-center.urls." + DMP_UNIT_KEY); - } - return url; - } - - /** - * 分页拉取单位接口数据。 - * 入参 url 为单位接口地址，accessToken 为信息中心令牌； - * 请求 body 包含 access_token、per_page、page； - * 返回值为 result.data 合并后的单位原始 JSON 列表。 - */ - private List pullDmpUnits(String url, String accessToken) { - List rawDataList = new ArrayList<>(); - int page = 1; - int maxPage = 1; - int total = 0; - - do { - HttpRequest httpRequest = HttpUtil.createPost(url); - httpRequest.header(Header.CONTENT_TYPE, "application/json"); - httpRequest.body(JSONUtil.toJsonStr(Map.of( - "access_token", accessToken, - "per_page", String.valueOf(DMP_PAGE_SIZE), - "page", String.valueOf(page) - ))); - - log.info("请求信息中心单位数据，第{}页: {}", page, httpRequest); - String resBody = httpRequest.execute().body(); - log.info("请求信息中心单位数据第{}页结果: {}", page, resBody); - JSONObject jsonBody = JSONUtil.parseObj(resBody); - - if (jsonBody.getInt("code") != 10000) { - throw new BaseException("获取信息中心单位数据失败，错误码: " + jsonBody.getInt("code") + "；错误原因：" + jsonBody.getStr("message")); + for (NutMap raw : middleUnits) { + String unitCode = StrUtil.trim(raw.getString("DWDM")); + String unitName = StrUtil.trim(raw.getString("DWMC")); + if (StrUtil.isBlank(unitCode) || unitCode.length() != 3 || StrUtil.isBlank(unitName)) { + throw new BaseException("单位中间表存在无效的二级单位代码或名称，已停止同步"); } - JSONObject result = jsonBody.getJSONObject("result"); - if (result == null) { - break; + Sys_unit unit = fetch(unitCode); + if (unit == null) { + unit = new Sys_unit(); + unit.setId(unitCode); + unit.setParentId("0"); + unit.setPath(getUnitPath("0")); + unit.setAliasName(unitName); + unit.setUnitTypeCode(1); + unit.setHasChildren(false); + unit.setName(unitName); + unit.setUnitcode(unitCode); + unit.setUnitLevel(2); + if (StrUtil.isNotBlank(raw.getString("BMFLMC"))) { + unit.setUnitType(raw.getString("BMFLMC")); + } + dao().fastInsert(unit); + } else { + unit.setName(unitName); + unit.setUnitcode(unitCode); + unit.setUnitLevel(2); + unit.setUnitTypeCode(1); + unit.setParentId("0"); + if (StrUtil.isBlank(unit.getPath())) { + unit.setPath(getUnitPath("0")); + } + if (StrUtil.isNotBlank(raw.getString("BMFLMC"))) { + unit.setUnitType(raw.getString("BMFLMC")); + } + dao().updateIgnoreNull(unit); } - total = result.getInt("total", total); - maxPage = result.getInt("max_page", maxPage); - JSONArray data = result.getJSONArray("data"); - if (CollUtil.isNotEmpty(data)) { - rawDataList.addAll(data.stream().map(v -> (JSONObject) v).toList()); - } - log.info("信息中心单位数据拉取进度: {}/{}", rawDataList.size(), total); - page++; - } while (page <= maxPage); - - return rawDataList; + } + log.info("本地单位中间表同步完成，单位数量: {}", middleUnits.size()); } /** - * 按单位代码去重，避免接口分页或源数据重复导致同一 DWDM 重复写入。 - */ - private List distinctDmpUnits(List rawDataList) { - Map unitMap = new LinkedHashMap<>(); - for (JSONObject raw : rawDataList) { - String unitCode = raw.getStr("DWDM"); - if (StrUtil.isBlank(unitCode)) { - continue; - } - unitMap.putIfAbsent(unitCode, raw); - } - return new ArrayList<>(unitMap.values()); - } - - /** - * 保存或更新单位。 - * DWDM 对应系统单位 id/unitcode，DWMC 对应名称，LSDWH 对应父级单位号，DWCC 对应信息中心原始单位层级。 - */ - private void saveOrUpdateUnit(JSONObject raw, Set parentCodes) { - String unitCode = raw.getStr("DWDM"); - if (StrUtil.isBlank(unitCode)) { - return; - } - - String parentId = getParentId(unitCode, getNormalizedParentCode(raw)); - Sys_unit unit = fetch(unitCode); - if (unit == null) { - unit = new Sys_unit(); - unit.setId(unitCode); - unit.setUnitcode(unitCode); - unit.setPath(getUnitPath(parentId)); - setUnitValue(unit, raw, parentId, parentCodes); - dao().fastInsert(unit); - } else { - setUnitValue(unit, raw, parentId, parentCodes); - if (StrUtil.isBlank(unit.getPath())) { - unit.setPath(getUnitPath(parentId)); - } - dao().updateIgnoreNull(unit); - } - } - - /** - * 根据接口字段给系统单位赋值。 - * DWYXBS 表示单位是否有效，DWCC 表示信息中心原始单位层次； - * 系统内置根单位占用一级层级，因此保存时统一将 DWCC 加一。 - */ - private void setUnitValue(Sys_unit unit, JSONObject raw, String parentId, Set parentCodes) { - String unitCode = raw.getStr("DWDM"); - String unitName = raw.getStr("DWMC"); - String aliasName = StrUtil.blankToDefault(raw.getStr("DWJC"), unitName); - Integer rawUnitLevel = raw.getInt("DWCC"); - Integer unitLevel = getNormalizedUnitLevel(raw); - boolean availableBusinessUnit = "是".equals(raw.getStr("DWYXBS")) && Integer.valueOf(2).equals(rawUnitLevel); - - unit.setParentId(parentId); - unit.setName(unitName); - unit.setAliasName(aliasName); - unit.setUnitcode(unitCode); - unit.setAddress(raw.getStr("DWDZ")); - unit.setUnitLevel(unitLevel); - unit.setUnitType(raw.getStr("DWLB")); - unit.setUnitTypeCode(availableBusinessUnit ? 1 : 0); - unit.setHasChildren(parentCodes.contains(unitCode)); - } - - /** - * 计算父级单位号。 - * LSDWH 为空、等于自身或本地不存在该父级时按根级处理；系统根单位 0 允许直接作为父级。 - */ - private String getParentId(String unitCode, String parentCode) { - if (StrUtil.isBlank(parentCode) || unitCode.equals(parentCode)) { - return ""; - } - if ("0".equals(parentCode)) { - return parentCode; - } - Sys_unit parentUnit = fetch(parentCode); - return parentUnit == null ? "" : parentCode; - } - - /** - * 根据父级 path 生成当前单位 path。 - * 父级为空时生成根节点 path，父级存在时在父级 path 下生成子节点 path。 + * 按系统根单位的 path 生成新二级单位路径，供单位树正常展示。 */ private String getUnitPath(String parentId) { - String parentPath = ""; - if (StrUtil.isNotBlank(parentId)) { - Sys_unit parentUnit = fetch(parentId); - parentPath = parentUnit == null ? "" : parentUnit.getPath(); - } + Sys_unit parentUnit = fetch(parentId); + String parentPath = parentUnit == null ? "" : parentUnit.getPath(); return getSubPath("sys_unit", "path", parentPath); } - - /** - * 信息中心一级单位应挂在系统根单位 0 下，其余单位沿用接口返回的 LSDWH。 - */ - private String getNormalizedParentCode(JSONObject raw) { - Integer rawUnitLevel = raw.getInt("DWCC"); - if (Integer.valueOf(1).equals(rawUnitLevel)) { - return "0"; - } - return raw.getStr("LSDWH"); - } - - /** - * 系统内置根单位占用一级层级，信息中心单位层次入库时统一加一。 - */ - private Integer getNormalizedUnitLevel(JSONObject raw) { - Integer rawUnitLevel = raw.getInt("DWCC"); - return rawUnitLevel == null ? null : rawUnitLevel + 1; - } - - /** - * DWCC 为信息中心单位层次，排序时用于尽量先处理父级单位，便于后续子级找到父节点。 - */ - private int getUnitLevel(JSONObject raw) { - return raw.getInt("DWCC", 0); - } } diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index 790ad4d..b367cdd 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -131,12 +131,18 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService log.info("开始全量更新用户数据"); // 获取角色信息 - Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC); +// Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC); // 获取单位信息，后续判断单位变更 List unitList = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1")); unitIdNameMap = unitList.stream().collect(Collectors.toMap(Sys_unit::getId, Sys_unit::getName)); + // 民族来源值为代码，更新系统用户前按现有码表换成名称。 + Map nationNames = dao.query(Sys_data_dict.class, Cnd.where("parentCode", "=", "USER_NATION")) + .stream() + .filter(dict -> StrUtil.isAllNotBlank(dict.getCode(), dict.getName())) + .collect(Collectors.toMap(Sys_data_dict::getCode, Sys_data_dict::getName, (first, second) -> first)); + // 查询数据源 Cnd cnd = Cnd.where(Sys_user_source::getPullTime, "=", updateParam.getPullTime()); @@ -159,8 +165,14 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // 处理每条数据 for (Sys_user_source source : sources) { + normalizeSourceForUpdate(source, nationNames); + if (StrUtil.isBlank(source.getLoginname())) { + log.warn("数据源中存在空工号，跳过该记录"); + continue; + } Sys_user user = userMap.get(source.getLoginname()); - source.setMember(null); + // 会员及福利会员由会员业务维护；来源快照中的默认 0 不参与本次人员更新。 + clearMembershipFields(source); String unitId = source.getUnitId(); if (StringUtils.isNotBlank(unitId) && unitId.length() == 5) { source.setUnitId(unitId.substring(0, 3)); @@ -180,11 +192,6 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService } else { // 修改现有用户 u.setId(user.getId()); - /* - * aidFundMember 由基金会员业务维护，数据中心源表默认值为 0。 - * 全量更新已有用户时置空，避免 updateIgnoreNull 把已迁移的基金会员标识覆盖为非会员。 - */ - u.setAidFundMember(null); u.setPersonType(null); needDoUpdateList.add(u); } @@ -220,6 +227,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService updateTasks.add(insertTask); // 异步处理公共角色分配 + /* 暂停人员更新时的角色变动；新用户仅写基本信息。 if (!needInitUserList.isEmpty()) { CompletableFuture roleTask = CompletableFuture.runAsync(() -> { try { @@ -248,6 +256,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService }, executorService); // 不等待角色分配完成 } + */ } // 2. 更新现有用户 - 使用批量处理 @@ -352,10 +361,12 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // 6. 处理其他任务 // 6.1 更新提案的校领导角色，发送订阅 + /* 暂停人员更新触发的角色刷新。 ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt")); for (String unitId : config.getSchoolLeaderUnitIds()) { RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE)); } + */ /* * 所有异步用户更新完成后再校正待确认状态，避免主事务提前锁定 sys_user， @@ -373,6 +384,52 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService + " 条"; } + /** + * 更新前将来源记录的空白字符串转为 null，供 updateIgnoreNull 跳过，同时避免生成空白变更记录。 + * 入参 source 为本次 sys_user_source 记录，nationNames 为 USER_NATION 的代码名称映射； + * 方法直接规范化 source，无返回值。未匹配到的非空民族代码保留原值。 + */ + private void normalizeSourceForUpdate(Sys_user_source source, Map nationNames) { + for (Field field : cn.hutool.core.util.ReflectUtil.getFields(Sys_user_source.class)) { + if (field.getType() != String.class) { + continue; + } + try { + field.setAccessible(true); + String value = (String) field.get(source); + field.set(source, StrUtil.isBlank(value) ? null : StrUtil.trim(value)); + } catch (IllegalAccessException e) { + throw new IllegalStateException("规范化人员来源字段失败: " + field.getName(), e); + } + } + if ("1".equals(source.getSex())) { + source.setSex("男"); + } else if ("2".equals(source.getSex())) { + source.setSex("女"); + } + if (StrUtil.isNotBlank(source.getNation())) { + source.setNation(nationNames.getOrDefault(source.getNation(), source.getNation())); + } + } + + /** + * 将人员来源中的会员字段置空，避免快照默认值修改系统会员和福利会员状态。 + * source 是当前内存中的 sys_user_source 记录；方法不更新来源表，无返回值。 + */ + private void clearMembershipFields(Sys_user_source source) { + source.setMember(null); + source.setMemberTime(null); + source.setWelfareMember(null); + source.setWantJoinLoveMutualAidAssociation(null); + source.setPreparationMemberFee(null); + source.setContractMemberFee(null); + source.setAidFundMember(null); + source.setAidFundMemberUserType(null); + source.setAidFundDeductTime(null); + source.setAidFundMemberJoinTime(null); + source.setAidFundMemberQuitTime(null); + } + /** * 根据指定批次的完整数据源校正系统用户待确认状态。 * 已人工确认且仍未重新出现的人员保持已确认状态，避免每次全量更新重复转为待确认。 @@ -489,7 +546,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // } // 2. 单位变更 - if (!ObjectUtil.equals(user.getUnitId(), source.getUnitId())) { + if (StrUtil.isNotBlank(source.getUnitId()) && !ObjectUtil.equals(user.getUnitId(), source.getUnitId())) { changeTypes.add(MemberChangeType.UNIT_CHANGE.name()); NutMap change = NutMap.NEW(); change.put("fieldName", "单位"); @@ -499,8 +556,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService changeList.add(change); // 单位异动发送订阅消息，清空原单位的所有角色 - UserChangePublisher.broadcast(new UserChangeMsg(List.of(user.getId()), - UserChangeMsg.UNIT_CHANGE_OPERATION, user.getUnitId(), source.getUnitId())); + // 单位代码和历史仍更新，角色清理由会员及权限业务另行处理。 +// UserChangePublisher.broadcast(new UserChangeMsg(List.of(user.getId()), +// UserChangeMsg.UNIT_CHANGE_OPERATION, user.getUnitId(), source.getUnitId())); } // 如果没有任何变更，返回null diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java index 251258d..7a49155 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java @@ -27,8 +27,11 @@ import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.random.R; +import java.lang.reflect.Field; import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; /** * 增量更新系统用户数据 @@ -58,6 +61,17 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic // 执行查询 List userSources = dao.query(Sys_user_source.class, cnd); + // 新增人员也按系统显示值保存性别和民族，空白来源字段不写入新用户。 + Map nationNames = dao.query(Sys_data_dict.class, Cnd.where("parentCode", "=", "USER_NATION")) + .stream() + .filter(dict -> StrUtil.isAllNotBlank(dict.getCode(), dict.getName())) + .collect(Collectors.toMap(Sys_data_dict::getCode, Sys_data_dict::getName, (first, second) -> first)); + userSources.forEach(source -> normalizeSourceForUpdate(source, nationNames)); + userSources = userSources.stream().filter(source -> StrUtil.isNotBlank(source.getLoginname())).toList(); + + // 增量新增人员不从来源快照复制会员状态及福利会员状态。 + userSources.forEach(this::clearMembershipFields); + //加入到系统用户表 List sysUsers = BeanUtil.copyToList(userSources, Sys_user.class); for (Sys_user sysUser : sysUsers) { @@ -88,9 +102,9 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic List>> splitHistoryFutures = splitHistories.stream().map(v -> CompletableFuture.supplyAsync(() -> dao.fastInsert(v))).toList(); AsyncUtil.waitAll(CompletableFuture.allOf(splitHistoryFutures.toArray(new CompletableFuture[0]))); - Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC); +// Sys_role publicRole = sysRoleService.getByCode(RoleConstant.PUBLIC); - //添加公共角色 + /* 暂停人员更新时的角色分配。 List sysUserRoles = sysUsers.stream().map(user -> { Sys_user_role sysUserRole = new Sys_user_role(); sysUserRole.setUserId(user.getId()); @@ -101,6 +115,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic dao.insert(sysUserRoles); }); sysRoleService.clearCache(); + */ //比较单位数据 List sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2)); @@ -130,14 +145,62 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic }); // 6.1 更新提案的校领导角色，发送订阅 + /* 暂停人员更新触发的角色刷新。 ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.where("delFlag", "=", false).desc("updatedAt")); for (String unitId : config.getSchoolLeaderUnitIds()) { RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE)); } + */ if (sysUsers.isEmpty() && insertUnits.isEmpty()) { return "本次没有新增人员或单位。"; } return StrUtil.format("增量更新成功,本次新增人员{}人,新增单位{}个。", sysUsers.size(), insertUnits.size()); } + + /** + * 新增用户前规范化来源字段：空白字符串不入库，性别和民族代码转为现有系统名称。 + * 入参 source 为 sys_user_source 记录，nationNames 为 USER_NATION 的代码名称映射； + * 方法直接修改内存中的 source，无返回值。未识别的非空编码保持原值。 + */ + private void normalizeSourceForUpdate(Sys_user_source source, Map nationNames) { + for (Field field : cn.hutool.core.util.ReflectUtil.getFields(Sys_user_source.class)) { + if (field.getType() != String.class) { + continue; + } + try { + field.setAccessible(true); + String value = (String) field.get(source); + field.set(source, StrUtil.isBlank(value) ? null : StrUtil.trim(value)); + } catch (IllegalAccessException e) { + throw new IllegalStateException("规范化人员来源字段失败: " + field.getName(), e); + } + } + if ("1".equals(source.getSex())) { + source.setSex("男"); + } else if ("2".equals(source.getSex())) { + source.setSex("女"); + } + if (StrUtil.isNotBlank(source.getNation())) { + source.setNation(nationNames.getOrDefault(source.getNation(), source.getNation())); + } + } + + /** + * 新增系统用户前排除来源快照的会员字段；新账号会员状态按系统默认值初始化。 + * source 是当前内存中的 sys_user_source 记录；不修改来源表，无返回值。 + */ + private void clearMembershipFields(Sys_user_source source) { + source.setMember(null); + source.setMemberTime(null); + source.setWelfareMember(null); + source.setWantJoinLoveMutualAidAssociation(null); + source.setPreparationMemberFee(null); + source.setContractMemberFee(null); + source.setAidFundMember(null); + source.setAidFundMemberUserType(null); + source.setAidFundDeductTime(null); + source.setAidFundMemberJoinTime(null); + source.setAidFundMemberQuitTime(null); + } } diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java index 894af09..5917df4 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java @@ -115,96 +115,81 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl @Aop(TransAop.READ_COMMITTED) public Date pull() { try { - // 获取数据中心的字典 - List dataDictList = dao().query(Sys_data_dict.class, Cnd.NEW()); - // 字典码表Map，key为父级编码，value为子级字典列表 - Map> dataDictMap = dataDictList.stream().collect(Collectors.groupingBy(Sys_data_dict::getParentCode)); - - String accessToken = getDmpAccessToken(); - List rawDataList = new ArrayList<>(); - rawDataList.addAll(pullDmpUsers(getDmpUrl(DMP_TEACHER_KEY), accessToken, "在岗教职工")); - rawDataList.addAll(pullDmpUsers(getDmpUrl(DMP_DISPATCH_KEY), accessToken, "在岗劳务派遣")); - rawDataList = distinctDmpUsers(rawDataList); - + // 先确认本地中间表有人员，避免空表产生一个看似成功的拉取批次。 + List rawDataList = listMap(Sqls.create("SELECT * FROM user_middle")); if (rawDataList.isEmpty()) { - log.warn("当前未获取到人员数据"); + throw new BaseException("本地人员中间表没有数据，已停止拉取"); } + // 单位必须先入库；人员快照的 DWDM 已是三位二级单位代码。 + sysDataUnitPullService.updateUnits(); Date nowDate = new Date(); - - // 赋值 - List latestSourceList = rawDataList.stream().map(raw -> { - Sys_user_source sysUser = new Sys_user_source(); - - // 使用缓存的字段映射 - for (FieldMapping mapping : getFieldMappings()) { - try { - // 根据字段类型设置值 - if (mapping.field.getType() == String.class) { - - if (StrUtil.isNotBlank(mapping.dict)) { - List sysDataDicts = dataDictMap.getOrDefault(mapping.dict, Collections.emptyList()); - Sys_data_dict sysDataDict = sysDataDicts.stream() - .filter(v -> raw.getStr(mapping.key, "").equals(v.getCode())) - .findFirst().orElse(new Sys_data_dict()); - mapping.field.set(sysUser, StrUtil.blankToDefault(sysDataDict.getName(), raw.getStr(mapping.key))); - } else { - // 特殊处理 根据身份证号获取性别和出生年月 - if ("SFZJH".equals(mapping.key)) { - String idCard = raw.getStr(mapping.key); - mapping.field.set(sysUser, idCard); - // 设置出生年月 - try { - sysUser.setBirthday(IdcardUtil.getBirthDate(idCard)); - } catch (Exception e) { - sysUser.setBirthday(null); - } - } else if ("LXNY".equals(mapping.key)) { - mapping.field.set(sysUser, normalizeArrivalAtSchoolDate(raw.getStr(mapping.key))); - } else { - mapping.field.set(sysUser, raw.getStr(mapping.key)); - } - } - } else if (mapping.field.getType() == Date.class) { - mapping.field.set(sysUser, raw.getDate(mapping.key)); - } - } catch (IllegalAccessException e) { - log.error("设置字段值失败: {}", mapping.field.getName(), e); - } + Map sourceMap = new LinkedHashMap<>(); + for (NutMap raw : rawDataList) { + String loginname = StrUtil.trim(raw.getString("ZGH")); + if (StrUtil.isBlank(loginname)) { + throw new BaseException("人员中间表存在空工号，已停止拉取"); } - - sysUser.setUnitName(raw.getStr("SZDW")); - sysUser.setUnitId(resolveSourceUnitId(raw.getStr("SZDWH"))); - - // 设置拉取时间 - sysUser.setPullTime(nowDate); - - return sysUser; - }).toList(); - - log.info("用户数据初始化完成，等待插入，当前数据条数{}", latestSourceList.size()); - // 插入到数据库 - if (CollUtil.isNotEmpty(latestSourceList)) { - dao().insert(latestSourceList); - } - - // 人员的单位数据和数据库的单位数据比较，如果人员里面有单位不存在，去更新单位数据 - List sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).filter(StrUtil::isNotBlank).distinct().toList(); - Sql sql = Sqls.create("select id from sys_unit group by id"); - sql.setCallback(Sqls.callback.strList()); - dao().execute(sql); - List unitIds = sql.getList(String.class); - - if (!new HashSet<>(unitIds).containsAll(sourceUnitIds)) { - log.info("单位需要更新，正在同步更新"); - sysDataUnitPullService.updateUnits(unitIds); + sourceMap.putIfAbsent(loginname, mapMiddleUser(raw, nowDate)); } + dao().insert(new ArrayList<>(sourceMap.values())); + log.info("本地人员中间表拉取完成，原始记录数: {}，去重后记录数: {}", rawDataList.size(), sourceMap.size()); return nowDate; } catch (Exception e) { throw new BaseException("数据拉取失败,{}", e.getMessage()); } } + /** + * 将 user_middle 的一条人员记录映射为本次拉取快照。 + * raw 包含工号 ZGH、姓名 XM、单位 DWDM/DWMC 等本地中间表字段；pullTime 是本次批次时间。 + * 返回 Sys_user_source，仅用于写入数据源表，不修改 sys_user。 + */ + private Sys_user_source mapMiddleUser(NutMap raw, Date pullTime) { + Sys_user_source source = new Sys_user_source(); + source.setLoginname(StrUtil.trim(raw.getString("ZGH"))); + source.setUsername(middleValue(raw, "XM")); + source.setUnitId(middleValue(raw, "DWDM")); + source.setUnitName(middleValue(raw, "DWMC")); + source.setSex(middleValue(raw, "XB")); + source.setNation(middleValue(raw, "MZ")); + source.setUserState(middleValue(raw, "DQZT")); + source.setPersonType(middleValue(raw, "JZGRYLB")); + source.setEducation(middleValue(raw, "XL")); + source.setMobile(middleValue(raw, "SJH")); + source.setAcademicDegree(middleValue(raw, "XW")); + source.setProfessionalTitle(middleValue(raw, "ZYJSZW")); + source.setProfessionalLevel(middleValue(raw, "ZYJSGWDJ")); + source.setPolitical(middleValue(raw, "ZZMM")); + source.setIdCard(middleValue(raw, "SFZJH")); + source.setBirthday(parseMiddleBirthDate(raw.getString("CSRQ"))); + source.setPullTime(pullTime); + return source; + } + + /** + * 将中间表的空字符串转为 null，避免后续正式更新时用空值覆盖系统用户字段。 + */ + private String middleValue(NutMap raw, String column) { + String value = StrUtil.trim(raw.getString(column)); + return StrUtil.isBlank(value) ? null : value; + } + + /** + * CSRQ 当前以 yyyy/MM/dd 开头，后面可能包含时间；只取日期部分。 + * 空值返回 null，异常格式抛错以阻止生成不完整的拉取批次。 + */ + private Date parseMiddleBirthDate(String birthDate) { + if (StrUtil.isBlank(birthDate)) { + return null; + } + String dateText = birthDate.length() >= 10 ? birthDate.substring(0, 10).replace('/', '-') : ""; + if (!dateText.matches("\\d{4}-\\d{2}-\\d{2}")) { + throw new BaseException("人员中间表存在异常出生日期，已停止拉取"); + } + return DateUtil.parseDate(dateText); + } + /** * 规范化信息中心返回的来校时间。 * 入参 arrivalAtSchoolDate 对应信息中心 LXNY 字段，允许 yyyy-MM-dd 或 yyyy-MM； diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryYearReportController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryYearReportController.java index 9f5d1c3..2c1e054 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryYearReportController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryYearReportController.java @@ -35,7 +35,6 @@ public class ProposalQueryYearReportController { */ private static final Map YEAR_REPORT_ORDER_COLUMNS = Map.ofEntries( Map.entry("code", "info.code"), - Map.entry("caseFilingCode", "info.caseFilingCode"), Map.entry("name", "info.name"), Map.entry("createUserName", "info.createUserName"), Map.entry("typeName", "typeName"), 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 492b2af..6b44aef 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 @@ -97,7 +97,7 @@ public class ProposalSeniorBasicController { return Result.error("提案编号已存在"); } - dao.update(proposalInfo,"^code|caseFilingCode|name|typeId|brief|measures|excerpt|suggestUnits|files$"); + dao.update(proposalInfo,"^code|name|typeId|brief|measures|excerpt|suggestUnits|files$"); return Result.success(); } 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 1c28eca..2617f1f 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; @@ -11,6 +12,7 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam; import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService; +import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService; import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -44,16 +46,24 @@ public class ProposalCommitteeFilingController { @Inject private ProposalCommitteeFilingService proposalCommitteeFilingService; @Inject + private ProposalCommitteeFilingUnitService proposalCommitteeFilingUnitService; + @Inject private ProposalCommonService proposalCommonService; @At("") - @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html") + @Ok("beetl:/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html") @SaCheckPermission("proposal.committeeFiling") 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(""" @@ -112,7 +122,7 @@ public class ProposalCommitteeFilingController { cnd.desc("t.createdAt"); } sql.setCondition(cnd); - Pagination pagination = proposalCommitteeFilingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + Pagination pagination = proposalCommitteeFilingUnitService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); } @@ -126,11 +136,11 @@ public class ProposalCommitteeFilingController { } @At - @SaCheckPermission("proposal.committeeFiling") + @SaCheckPermission(value = {"proposal.committeeFiling", "h5.proposal.committeeFiling"}, mode = SaMode.OR) @ApiOperation("执行单案立案审核任务") @Aop(TransAop.READ_COMMITTED) public Result executeTask(@Param("data") String data) { - // data 包含流程任务ID、提交类型、立案结果及主协办单位；Service 校验负责人后执行 WF，成功返回统一 Result。 + // data 包含流程任务 ID、提交类型、提案 ID、立案结果及主协办单位；Service 先保存立案数据再执行 WF，成功返回统一 Result。 Dict args = Json.fromJson(Dict.class, data); proposalCommitteeFilingService.executeFlowTask(args); return Result.success(); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java index d2b11aa..63fe213 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalDelegationController.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 com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; @@ -34,13 +35,13 @@ import javax.validation.Valid; import java.util.List; /** - * 团长审核 + * 分工会主席审核 */ @IocBean @At("/platform/proposal/delegation") @Slf4j @Ok("json:full") -@Api(tags = "提案-办理-团长审核") +@Api(tags = "提案-办理-分工会主席审核") public class ProposalDelegationController { @Inject @@ -60,12 +61,12 @@ public class ProposalDelegationController { @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/delegation/index.html") - @SaCheckPermission("proposal.delegation") + @SaCheckPermission("h5.proposal.delegation") public void h5Index() { } @At - @SaCheckPermission("proposal.delegation") + @SaCheckPermission(value = {"proposal.delegation", "h5.proposal.delegation"}, mode = SaMode.OR) @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm,boolean approval) { Sql sql = Sqls.create(""" @@ -116,7 +117,7 @@ public class ProposalDelegationController { } ProposalSearchParam.buildSearch(cnd, pageForm); cnd.groupBy("t.id"); - // 团长审核列表未指定有效排序时保留任务创建时间倒序。 + // 分工会主席审核列表未指定有效排序时保留任务创建时间倒序。 if (!proposalCommonService.applySafeProposalListOrder(cnd, pageForm, "delegation")) { cnd.desc("t.createdAt"); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java index 498e08e..c9625ce 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalPreAuditController.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 com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.ExportTableColumns; @@ -30,15 +31,15 @@ import java.util.List; /** * @version 1.0 * @Author FKY - * @name：ProposalPreAuditController + * @name：校工会主席审核（复用原预审核页面） * @Date 2026/3/16 17:30 * @注释 */ @IocBean -@At("/platform/proposal/pre/audit") +@At("/platform/proposal/schoolUnionChairApproval") @Slf4j @Ok("json:full") -@Api(tags = "提案管理-校工会预审核") +@Api(tags = "提案管理-校工会主席审核") public class ProposalPreAuditController { @Inject @@ -48,18 +49,18 @@ public class ProposalPreAuditController { @At("") @Ok("beetl:/platform/zhgh/democratic/proposal/transact/preAudit/index.html") - @SaCheckPermission("proposal.preAudit") + @SaCheckPermission("proposal.schoolUnionChairApproval") public void index() { } @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/preAudit/index.html") - @SaCheckPermission("proposal.preAudit") + @SaCheckPermission("h5.proposal.schoolUnionChairApproval") public void h5Index() { } @At - @SaCheckPermission("proposal.preAudit") + @SaCheckPermission(value = {"proposal.schoolUnionChairApproval", "h5.proposal.schoolUnionChairApproval"}, mode = SaMode.OR) @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) { Sql sql = Sqls.create(""" @@ -98,7 +99,8 @@ public class ProposalPreAuditController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "preAudit"); + // 校工会主席沿用预审核界面，待办必须按已发布流程的实际节点编码筛选。 + cnd.and("t.taskName", "=", "schoolUnionChairApproval"); if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){ cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); @@ -113,8 +115,8 @@ public class ProposalPreAuditController { cnd.andEX("vu.unionId", "=", pageForm.getUnionId()); ProposalSearchParam.buildSearch(cnd, pageForm); cnd.groupBy("t.id"); - // 预审核列表未指定有效排序时保留任务创建时间倒序。 - if (!proposalCommonService.applySafeProposalListOrder(cnd, pageForm, "preAudit")) { + // 校工会主席审核列表未指定有效排序时保留任务创建时间倒序。 + if (!proposalCommonService.applySafeProposalListOrder(cnd, pageForm, "schoolUnionChairApproval")) { cnd.desc("t.createdAt"); } sql.setCondition(cnd); @@ -124,10 +126,10 @@ public class ProposalPreAuditController { @At @Ok("void") - @SaCheckPermission("proposal.preAudit") + @SaCheckPermission("proposal.schoolUnionChairApproval") @ApiOperation("导出列表") public void exportList(@Valid @Param("pageForm") ProposalSearchParam pageForm, boolean approval, @Param("tableColumns") ExportTableColumns[] tableColumns, HttpServletResponse response) { - proposalCommonService.exportWorkflowList("preAudit", pageForm, approval, tableColumns, response); + proposalCommonService.exportWorkflowList("schoolUnionChairApproval", pageForm, approval, tableColumns, response); } } 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 ef9e610..cd9d0b6 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 cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -13,7 +14,6 @@ import com.budwk.app.base.vo.LabelValueVO; import com.budwk.app.flow.constant.FlowConst; import com.budwk.app.flow.entity.ProcessInstance; import com.budwk.app.flow.entity.ProcessTask; -import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; import com.budwk.app.flow.enums.ProcessTaskStateEnum; import com.budwk.app.flow.service.FlowCommonService; import com.budwk.app.flow.service.ProcessTaskService; @@ -70,12 +70,12 @@ 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); @@ -121,7 +121,7 @@ public class ProposalSchoolLeaderApprovalController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "schoolLeader"); + cnd.and("t.taskName", "=", "school_leader"); if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); @@ -163,18 +163,13 @@ public class ProposalSchoolLeaderApprovalController { } @At - @SaCheckPermission("proposal.schoolLeaderApproval") + @SaCheckPermission(value = {"proposal.schoolLeaderApproval", "h5.proposal.schoolLeaderApproval"}, mode = SaMode.OR) @ApiOperation("执行任务") @Aop(TransAop.READ_COMMITTED) public Result executeTask(@Param("data") String data) { Dict args = Json.fromJson(Dict.class, data); - if("back".equals(args.getStr("tf_approval"))) { - args.put("submitType", ProcessSubmitTypeEnum.JUMP.getCode()); - args.put("taskName", "committee"); - flowCommonService.executeTask(args); - return Result.success(); - } + // 退回答复由已发布的 WF 分支按 tf_approval=back 流转到主办单位答复。 String proposalId = args.getStr("proposalId"); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnSubmitQueryController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnSubmitQueryController.java index 2406545..114728c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnSubmitQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnSubmitQueryController.java @@ -44,7 +44,9 @@ public class ProposalUnSubmitQueryController { Sql sql = Sqls.create(""" SELECT distinct - info.id, + info.id, + ins.id AS instanceId, + ins.processDefineId AS instanceProcessDefineId, info.code as proposalCode, info.name as proposalName, vu.username, @@ -55,15 +57,17 @@ public class ProposalUnSubmitQueryController { manner.name as mannerName, (select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id) AS secondedNum, (select count(DISTINCT(seconderId))from proposal_second where proposalId = info.id and isAgree = 1) AS secondedAgreeNum, - IF(info.stateCode <= 200 ,'未审核','已审核') AS delegationAudit + IF(EXISTS (SELECT 1 FROM wf_process_task dt WHERE dt.processInstanceId = ins.id + AND dt.taskName = 'delegation' AND dt.taskState = 20), '已审核', '未审核') AS delegationAudit FROM proposal_info info left join vw_user vu on info.createUserId = vu.id left join teacher_congress_delegation tcd on info.delegationId = tcd.id left join proposal_type pt on info.typeId = pt.id left join sys_dict manner on manner.`code` = info.source - left join `wf_process_instance` ins on ins.businessNo = info.id - left join wf_process_task nt on nt.processInstanceId = ins.id + left join `wf_process_instance` ins on ins.id = ( + select latest.id from wf_process_instance latest + where latest.businessNo = info.id order by latest.createdAt desc, latest.id desc limit 1) $condition """); Cnd cnd = Cnd.NEW(); @@ -76,6 +80,8 @@ public class ProposalUnSubmitQueryController { SqlExpressionGroup group2 = Cnd.exps("ins.state", "=", 30); group2.or("ins.state", "=", 45); group2.or(new Static("ins.id not in (select processInstanceId from wf_process_task where taskName='delegation')")); + // 尚未发起 WF 实例的提案也属于未提交汇总，不能被 NOT IN 的 NULL 判断排除。 + group2.orIsNull("ins.id"); cnd.and(group2); if(searchName != null && StrUtil.isNotBlank(searchKeyword)) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java index e38aa45..3e69525 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalUnderTakeReplyController.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 cn.hutool.core.util.ObjectUtil; import com.budwk.app.base.constant.RoleConstant; @@ -70,12 +71,12 @@ public class ProposalUnderTakeReplyController { @At("/h5") @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/unitReply/index.html") - @SaCheckPermission("proposal.unitReply") + @SaCheckPermission("h5.proposal.unitReply") public void h5Index() { } @At - @SaCheckPermission("proposal.unitReply") + @SaCheckPermission(value = {"proposal.unitReply", "h5.proposal.unitReply"}, mode = SaMode.OR) @ApiOperation("分页列表") public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval, boolean transfer) { /* @@ -134,8 +135,8 @@ public class ProposalUnderTakeReplyController { $condition """); Cnd cnd = Cnd.NEW(); -// cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply")); - cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply")); + // 当前已发布的 WF 版本使用主办、协办和建议办理三个答复节点。 + cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply")); if (!SecurityUtil.getUserLoginname().equals("superadmin")) { cnd.and("ta.actorId", "=", SecurityUtil.getUserId()); @@ -159,9 +160,9 @@ public class ProposalUnderTakeReplyController { for (NutMap row : list) { /* * 承办单位答复撤回必须按“当前整组待办节点”统一判断。 - * 这里不能再用 contains，只要出现过 unit_reply/two_unit_reply 就会误判可撤回； + * 这里不能再用 contains，否则出现过其他答复节点时会误判可撤回； * 正确规则是：curTaskKey 必须精确等于某一个允许撤回的节点编码， - * 像 unit_reply,two_unit_reply 这种混合状态一律不允许撤回。 + * 多个答复节点同时存在的混合状态一律不允许撤回。 */ row.setv("canRevoke", isReplyTaskGroupRevocable(row)); } @@ -173,9 +174,8 @@ public class ProposalUnderTakeReplyController { /** * 承办单位答复节点撤回需要基于整组当前节点判断。 * 只有“当前流程正在办理的节点”和“这条列表记录所属节点”完全一致时，才允许撤回； - * 这样流程已经从 unit_reply 走到 two_unit_reply 后，历史 unit_reply 记录会自动失去撤回资格。 - * 主办只能撤回 unit_reply、two_unit_reply、school_leader； - * 协办只能撤回 unit_reply、two_unit_reply。 + * 这样流程进入后续节点后，历史答复记录会自动失去撤回资格。 + * 主办只能在主办或建议办理节点仍为当前节点时撤回；协办只能在协办节点撤回。 */ private boolean isReplyTaskGroupRevocable(NutMap row) { if (!ObjectUtil.equal(row.getInt("taskState"), ProcessTaskStateEnum.FINISHED.getCode())) { @@ -187,10 +187,10 @@ public class ProposalUnderTakeReplyController { return false; } if (row.getInt("underTakeIsMaster") == 1) { - return Stream.of("unit_reply", "two_unit_reply", "school_leader") + return Stream.of("master_reply", "opinion_master_reply") .anyMatch(a -> ObjectUtil.equal(a, taskKey)); } - return Stream.of("unit_reply", "two_unit_reply") + return Stream.of("slave_reply") .anyMatch(a -> ObjectUtil.equal(a, taskKey)); } @@ -200,7 +200,7 @@ public class ProposalUnderTakeReplyController { @At @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("proposal.unitReply") + @SaCheckPermission(value = {"proposal.unitReply", "h5.proposal.unitReply"}, mode = SaMode.OR) @ApiOperation("执行任务") public Result executeTask(@Param("data") String data) { Dict args = Json.fromJson(Dict.class, data); 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 db266a5..8e1ba5c 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 @@ -19,8 +19,6 @@ public class ProposalQueryComprehensiveParam extends PageForm { private String name; @ApiModelProperty(name = "提案编号") private String code; - @ApiModelProperty(name = "立案编号") - private String caseFilingCode; @ApiModelProperty(name = "教代会ID") private String sessionId; @ApiModelProperty(name = "search session id") @@ -63,7 +61,7 @@ public class ProposalQueryComprehensiveParam extends PageForm { @ApiModelProperty(name = "通用关键字") private String commonKeyword; - @ApiModelProperty(name = "提案名称或编号搜索字段，仅支持name、code、caseFilingCode") + @ApiModelProperty(name = "提案名称或编号搜索字段，仅支持name、code") private String proposalSearchField; @ApiModelProperty(name = "提案名称或编号搜索内容") @@ -77,7 +75,7 @@ public class ProposalQueryComprehensiveParam extends PageForm { * 将综合查询参数追加到查询条件中，无返回值，处理结果直接写入 cnd。 * * @param cnd 查询条件容器，用于接收届次、名称/编号、提案人、组织及立案条件 - * @param searchParam 页面查询参数；proposalSearchField 传 name、code 或 caseFilingCode， + * @param searchParam 页面查询参数；proposalSearchField 传 name 或 code， * proposalKeyword 传对应字段的模糊搜索内容 */ public static void buildSearch(Cnd cnd, ProposalQueryComprehensiveParam searchParam) { @@ -93,12 +91,11 @@ public class ProposalQueryComprehensiveParam extends PageForm { // Isolated single-session filter for pages that should not reuse sessionId semantics. cnd.andEX("info.sessionId", "=", searchParam.getSearchSessionId()); - // 名称/编号组合搜索仅允许三个固定字段，前端提交值不能直接作为SQL字段使用。 + // 名称/编号组合搜索仅允许两个固定字段，前端提交值不能直接作为SQL字段使用。 if (StrUtil.isNotBlank(searchParam.getProposalKeyword())) { String proposalSearchColumn = switch (StrUtil.blankToDefault(searchParam.getProposalSearchField(), "name")) { case "name" -> "info.name"; case "code" -> "info.code"; - case "caseFilingCode" -> "info.caseFilingCode"; default -> null; }; if (proposalSearchColumn != null) { @@ -114,10 +111,6 @@ public class ProposalQueryComprehensiveParam extends PageForm { if (StrUtil.isNotBlank(searchParam.getCode())) { cnd.where().andLike("info.code", searchParam.getCode()); } - // 立案编号由立案环节生成，支持按已生成编号进行模糊检索。 - if (StrUtil.isNotBlank(searchParam.getCaseFilingCode())) { - cnd.where().andLike("info.caseFilingCode", searchParam.getCaseFilingCode()); - } //代表团ID cnd.andEX("info.delegationId", "=", searchParam.getDelegationId()); if (StrUtil.isNotBlank(searchParam.getCreateUserName())) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalSearchParam.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalSearchParam.java index ea439b8..4ea47bc 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalSearchParam.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalSearchParam.java @@ -24,7 +24,7 @@ public class ProposalSearchParam extends PageForm { private String createUserLoginName; private String createUserKeyword; private String caseFilingResult; - /** 名称/编号组合搜索字段，仅支持 name、code、caseFilingCode。 */ + /** 名称/编号组合搜索字段，仅支持 name、code。 */ private String proposalSearchField; /** 名称/编号组合搜索内容。 */ private String proposalKeyword; @@ -33,7 +33,7 @@ public class ProposalSearchParam extends PageForm { * 将提案列表参数追加到查询条件中，无返回值，处理结果直接写入 cnd。 * * @param cnd 查询条件容器，用于接收名称/编号、届次、提案人及立案结果条件 - * @param searchParam 页面查询参数；proposalSearchField 传 name、code 或 caseFilingCode， + * @param searchParam 页面查询参数；proposalSearchField 传 name 或 code， * proposalKeyword 传对应字段的模糊搜索内容 */ public static void buildSearch(Cnd cnd, ProposalSearchParam searchParam) { @@ -45,7 +45,6 @@ public class ProposalSearchParam extends PageForm { String proposalSearchColumn = switch (StrUtil.blankToDefault(searchParam.getProposalSearchField(), "name")) { case "name" -> "info.name"; case "code" -> "info.code"; - case "caseFilingCode" -> "info.caseFilingCode"; default -> null; }; if (proposalSearchColumn != null) { 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 c7b1ff7..bf5706d 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 @@ -103,7 +103,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp /** 征集进度页面允许排序的字段，避免排序参数直接拼接到SQL。 */ private static final Map COLLECT_PROGRESS_ORDER_COLUMNS = Map.ofEntries( Map.entry("code", "info.code"), - Map.entry("caseFilingCode", "info.caseFilingCode"), Map.entry("name", "info.name"), Map.entry("createUserName", "info.createUserName"), Map.entry("delegationName", "delegationName"), @@ -116,7 +115,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp /** 征集进度页面允许自定义导出的字段及固定表头。 */ private static final Map COLLECT_PROGRESS_EXPORT_COLUMNS = Map.ofEntries( Map.entry("code", "提案编号"), - Map.entry("caseFilingCode", "立案编号"), Map.entry("name", "提案名称"), Map.entry("createUserName", "提案人"), Map.entry("delegationName", "代表团"), @@ -147,7 +145,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp /** 综合查询页面允许排序的字段，避免前端排序参数直接进入SQL。 */ private static final Map COMPREHENSIVE_ORDER_COLUMNS = Map.ofEntries( Map.entry("code", "info.code"), - Map.entry("caseFilingCode", "info.caseFilingCode"), Map.entry("name", "info.name"), Map.entry("createUserName", "info.createUserName"), Map.entry("typeName", "typeName"), @@ -163,7 +160,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp /** 综合查询页面允许自定义导出的字段及固定表头，防止请求伪造页面外字段。 */ private static final Map COMPREHENSIVE_EXPORT_COLUMNS = Map.ofEntries( Map.entry("code", "提案编号"), - Map.entry("caseFilingCode", "立案编号"), Map.entry("name", "提案名称"), Map.entry("createUserName", "提案人"), Map.entry("typeName", "提案类别"), @@ -402,10 +398,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp keywordCondition.orLike("info.createUserName", keyword); keywordCondition.orLike("info.createUserLoginName", keyword); } - // 立案编号由立案环节生成，选中该搜索来源时按编号进行模糊匹配。 - if (ArrayUtil.contains(pageForm.getOrigins(), "caseFilingCode")) { - keywordCondition.orLike("info.caseFilingCode", keyword); - } if (searchAnswer) { keywordCondition.orLike("JSON_EXTRACT(replyTask.variable,'$.tf_opinion')", keyword); } @@ -469,7 +461,6 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp info.id, info.name, info.code, - info.caseFilingCode, info.createUserName, type.NAME AS typeName, tcs.fullName AS sessionName, @@ -924,19 +915,20 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp pages.put("commissioner", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "CONFIRM_FILING_COUNT", "CONFIRM_FILING_COUNT", "SUGGESTION_COUNT", "SUGGESTION_COUNT", "NOT_COUNT", "NOT_COUNT", "taskName", "taskName", "instanceState", "ins.state")); pages.put("feedbackEvaluation", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "merge", "merge", "curTaskName", "curTaskName", "instanceState", "ins.state")); pages.put("delegation", standardOrderColumns()); - pages.put("control", mergeOrderColumns(standardOrderColumns(), orderColumns("caseFilingCode", "info.caseFilingCode"))); + pages.put("control", standardOrderColumns()); pages.put("schoolLeaderApproval", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "undertakeUnits", "masterUnitName", "merge", "merge", "curTaskName", "curTaskName", "auditUser", "auditUser", "instanceState", "ins.state")); pages.put("committeeFilingUnit", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "sessionName", "tcs.fullName", "caseFilingResult", "info.caseFilingResult", "delegationName", "tcd.name", "curTaskName", "curTaskName", "instanceState", "ins.state")); pages.put("allFinished", orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "instanceState", "ins.state")); pages.put("preAudit", standardOrderColumns()); + pages.put("schoolUnionChairApproval", standardOrderColumns()); pages.put("committeeFiling", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "sessionName", "tcs.fullName", "caseFilingResult", "info.caseFilingResult", "delegationName", "tcd.name", "curTaskName", "curTaskName", "instanceState", "ins.state")); pages.put("caseCheck", orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "curTaskName", "curTaskName", "instanceState", "ins.state", "finishTime", "t.finishTime")); - pages.put("exportComprehensive", orderColumns("code", "info.code", "caseFilingCode", "info.caseFilingCode", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "caseFilingType", "info.caseFilingType", "merge", "merge", "brief", "info.brief", "measures", "info.measures", "undertakeUnits", "masterUnitName", "curTaskName", "curTaskName", "instanceState", "ins.state")); + pages.put("exportComprehensive", orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "sessionName", "tcs.fullName", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "caseFilingType", "info.caseFilingType", "merge", "merge", "brief", "info.brief", "measures", "info.measures", "undertakeUnits", "masterUnitName", "curTaskName", "curTaskName", "instanceState", "ins.state")); pages.put("exportSingleCustom", standardOrderColumns()); pages.put("configUnit", orderColumns("name", "t1.name", "code", "t1.code", "unitLeader", "u2.username")); pages.put("configType", orderColumns("name", "name", "code", "code")); pages.put("seniorBasic", seniorOrderColumns()); - pages.put("expediting", orderColumns("code", "info.code", "caseFilingCode", "info.caseFilingCode", "name", "info.name", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "curTaskName", "curTaskName", "underTakeName", "underTakeName", "taskName", "t.displayName", "actorName", "ta.actorName", "instanceState", "ins.state")); + pages.put("expediting", orderColumns("code", "info.code", "name", "info.name", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "curTaskName", "curTaskName", "underTakeName", "underTakeName", "taskName", "t.displayName", "actorName", "ta.actorName", "instanceState", "ins.state")); pages.put("seniorDelete", seniorOrderColumns()); pages.put("seniorFeedback", mergeOrderColumns(seniorOrderColumns(), orderColumns("tf_feedback", "tf_feedback"))); pages.put("seniorType", seniorOrderColumns()); @@ -950,7 +942,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp /** 创建高级管理列表共用的字段映射。 */ private static Map seniorOrderColumns() { - return orderColumns("code", "info.code", "caseFilingCode", "info.caseFilingCode", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "isConsolidation", "merge", "curTaskName", "curTaskName", "instanceState", "ins.state"); + return orderColumns("code", "info.code", "name", "info.name", "createUserName", "info.createUserName", "typeName", "type.name", "delegationName", "tcd.name", "caseFilingResult", "info.caseFilingResult", "isConsolidation", "merge", "curTaskName", "curTaskName", "instanceState", "ins.state"); } /** @@ -1013,7 +1005,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp private Sql buildWorkflowExportSql(String pageCode, ProposalSearchParam pageForm, boolean approval) { boolean isUnitReply = "unitReply".equals(pageCode); boolean isSchoolLeaderApproval = "schoolLeaderApproval".equals(pageCode); - boolean requiresUnionFilter = Set.of("preAudit", "committeeFiling", "committeeFilingUnit", + boolean requiresUnionFilter = Set.of("preAudit", "schoolUnionChairApproval", "committeeFiling", "committeeFilingUnit", "schoolLeaderApproval", "caseCheck").contains(pageCode); String taskName = getWorkflowTaskName(pageCode); @@ -1068,7 +1060,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp Cnd cnd = Cnd.NEW(); if (isUnitReply) { - cnd.and("t.taskName", "in", List.of("unit_reply", "two_unit_reply", "opinion_unit_reply")); + cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply")); if (!"superadmin".equals(SecurityUtil.getUserLoginname())) { cnd.and("ta.actorId", "=", SecurityUtil.getUserId()); } @@ -1102,9 +1094,10 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp Map taskNames = Map.of( "delegation", "delegation", "preAudit", "preAudit", + "schoolUnionChairApproval", "schoolUnionChairApproval", "committeeFiling", "committee", "committeeFilingUnit", "committeeFilingUnit", - "schoolLeaderApproval", "schoolLeader", + "schoolLeaderApproval", "school_leader", "feedbackEvaluation", "feedback", "caseCheck", "caseCheck" ); @@ -1170,22 +1163,23 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl imp /** 初始化各办理页面可导出的列表字段白名单。 */ private static Map> createWorkflowExportColumns() { - Set commonColumns = Set.of("code", "caseFilingCode", "name", "createUserName", "typeName", + Set commonColumns = Set.of("code", "name", "createUserName", "typeName", "sessionName", "delegationName", "curTaskName", "instanceState"); Map> columns = new HashMap<>(); columns.put("delegation", commonColumns); columns.put("preAudit", commonColumns); - columns.put("caseCheck", Set.of("code", "caseFilingCode", "name", "createUserName", "typeName", + columns.put("schoolUnionChairApproval", commonColumns); + columns.put("caseCheck", Set.of("code", "name", "createUserName", "typeName", "sessionName", "delegationName", "curTaskName", "instanceState", "finishTime")); - columns.put("committeeFiling", Set.of("code", "caseFilingCode", "name", "typeName", "sessionName", + columns.put("committeeFiling", Set.of("code", "name", "typeName", "sessionName", "caseFilingResult", "delegationName", "curTaskName", "instanceState")); - columns.put("committeeFilingUnit", Set.of("code", "caseFilingCode", "name", "typeName", "sessionName", + columns.put("committeeFilingUnit", Set.of("code", "name", "typeName", "sessionName", "caseFilingResult", "delegationName", "curTaskName", "instanceState")); - columns.put("schoolLeaderApproval", Set.of("code", "caseFilingCode", "name", "typeName", "undertakeUnits", + columns.put("schoolLeaderApproval", Set.of("code", "name", "typeName", "undertakeUnits", "merge", "curTaskName", "auditUser", "instanceState")); - columns.put("unitReply", Set.of("code", "caseFilingCode", "name", "typeName", "caseFilingResult", + columns.put("unitReply", Set.of("code", "name", "typeName", "caseFilingResult", "merge", "underTakeName", "underTakeIsMaster", "curTaskName", "auditUser", "instanceState")); - columns.put("feedbackEvaluation", Set.of("code", "caseFilingCode", "name", "typeName", "merge", + columns.put("feedbackEvaluation", Set.of("code", "name", "typeName", "merge", "curTaskName", "instanceState")); return Collections.unmodifiableMap(columns); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java index fd434c1..d2bc77c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalCommitteeFilingServiceImpl.java @@ -20,6 +20,7 @@ import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo; import com.budwk.app.zhgh.democratic.proposal.models.ProposalMerge; import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake; import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService; +import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingUnitService; import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; @@ -44,6 +45,8 @@ public class ProposalCommitteeFilingServiceImpl extends BaseServiceImpl proposalIds) { - String caseFilingResultKey = FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult"; - String caseFilingCodeKey = FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingCode"; - String caseFilingTypeKey = FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingType"; - String caseFilingResult = args.getStr(caseFilingResultKey); - if (!"CONFIRM_FILING".equals(caseFilingResult)) { - // 立案类型仅适用于确定立案，切换为其他结果时同步清理历史值。 - args.put(caseFilingTypeKey, ""); - } - - Integer submitType = args.getInt(FlowConst.SUBMIT_TYPE); - if (submitType == null) { - submitType = ProcessSubmitTypeEnum.AGREE.getCode(); - args.put(FlowConst.SUBMIT_TYPE, submitType); - } - if (!ProcessSubmitTypeEnum.AGREE.getCode().equals(submitType)) { - args.put(caseFilingCodeKey, ""); - return; - } - - String codePrefix = resolveCaseFilingCodePrefix(caseFilingResult); - int currentYear = java.time.LocalDate.now().getYear(); - String codeHead = currentYear + codePrefix; - - /* - * proposal_config 当前是单行配置表，锁定该行可让所有应用实例串行生成流水号。 - * 行锁一直持有到本次 WF 提交事务结束，避免两个审核请求同时读到相同最大值。 - */ - Sql lockSql = Sqls.create("SELECT id FROM proposal_config ORDER BY id LIMIT 1 FOR UPDATE"); - lockSql.setCallback(Sqls.callback.map()); - dao().execute(lockSql); - Map configRow = lockSql.getObject(Map.class); - if (ObjectUtil.isEmpty(configRow)) { - throw new BaseException("提案配置不存在，无法生成立案编号"); - } - - String reusableCode = findReusableCaseFilingCode(proposalIds, caseFilingResult, codeHead); - if (StrUtil.isNotBlank(reusableCode)) { - args.put(caseFilingCodeKey, reusableCode); - return; - } - - Sql maxSequenceSql = Sqls.create(""" - SELECT COALESCE(MAX(CAST(SUBSTRING(caseFilingCode, 6) AS UNSIGNED)), 0) - FROM proposal_info - WHERE caseFilingCode REGEXP @codePattern - """); - maxSequenceSql.setParam("codePattern", "^" + codeHead + "[0-9]{3,}$"); - maxSequenceSql.setCallback(Sqls.callback.integer()); - dao().execute(maxSequenceSql); - int nextSequence = maxSequenceSql.getInt() + 1; - String caseFilingCode = codeHead + String.format("%03d", nextSequence); - args.put(caseFilingCodeKey, caseFilingCode); - } - - /** - * 将立案结果转换成编号前缀，未知结果直接阻止流程提交，避免生成无业务含义的编号。 - * - * @param caseFilingResult 立案结果编码 - * @return 确定立案返回 A、工作建议返回 B、不予立案返回 C - */ - private String resolveCaseFilingCodePrefix(String caseFilingResult) { - return switch (StrUtil.nullToEmpty(caseFilingResult)) { - case "CONFIRM_FILING" -> "A"; - case "SUGGESTION" -> "B"; - case "NOT" -> "C"; - default -> throw new BaseException("立案结果不正确，无法生成立案编号"); - }; - } - - /** - * 流程撤回或重新提交时，复用同一批提案已有的本年同类型编号，避免流水号无意义增长。 - * 只有全部提案的结果和编号完全一致且符合新编号格式时才允许复用。 - * - * @param proposalIds 当前单案或并案提案主键集合 - * @param caseFilingResult 本次选择的立案结果 - * @param codeHead 年份和编号前缀，例如 2026A - * @return 可复用的编号；不存在时返回空字符串 - */ - private String findReusableCaseFilingCode(List proposalIds, String caseFilingResult, String codeHead) { - List proposalInfos = dao().query(ProposalInfo.class, - Cnd.where(ProposalInfo::getId, "in", proposalIds)); - if (proposalInfos.size() != new LinkedHashSet<>(proposalIds).size()) { - return ""; - } - boolean allProposalsMatch = proposalInfos.stream().allMatch(proposalInfo -> - Objects.equals(caseFilingResult, proposalInfo.getCaseFilingResult()) - && StrUtil.isNotBlank(proposalInfo.getCaseFilingCode())); - if (!allProposalsMatch) { - return ""; - } - LinkedHashSet existingCodes = proposalInfos.stream() - .map(ProposalInfo::getCaseFilingCode) - .map(StrUtil::trim) - .collect(Collectors.toCollection(LinkedHashSet::new)); - if (existingCodes.size() != 1) { - return ""; - } - String existingCode = existingCodes.iterator().next(); - return existingCode.matches(codeHead + "\\d{3,}") ? existingCode : ""; - } - - /** - * old-flow 页面提交后，需要把立案编号、立案结果以及主协办单位同步落业务表。 + * 立案审核提交后，只同步立案结果、立案类型和主协办单位，不生成立案编号。 * 若这次改成“不予立案”等无需承办单位的结果，也要先清掉旧的承办单位记录，避免脏数据残留。 */ private void syncCommitteeFilingUnitData(List proposalIds, Dict args) { - String caseFilingCode = args.getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingCode"); String caseFilingResult = args.getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingResult"); String caseFilingType = args.getStr(FlowConst.TASK_FORM_DATA_PREFIX + "caseFilingType"); dao().update(ProposalInfo.class, - Chain.make("caseFilingCode", caseFilingCode) - .add("caseFilingResult", caseFilingResult) + Chain.make("caseFilingResult", caseFilingResult) .add("caseFilingType", caseFilingType), Cnd.where(ProposalInfo::getId, "in", proposalIds)); - verifyCommitteeFilingUnitData(proposalIds, caseFilingCode, caseFilingResult, caseFilingType); + verifyCommitteeFilingUnitData(proposalIds, caseFilingResult, caseFilingType); dao().clear(ProposalReplyUnit.class, Cnd.where(ProposalReplyUnit::getProposalId, "in", proposalIds)); if (!List.of("CONFIRM_FILING", "SUGGESTION").contains(caseFilingResult)) { @@ -276,7 +179,7 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl proposalIds, String caseFilingCode, + private void verifyCommitteeFilingUnitData(List proposalIds, String caseFilingResult, String caseFilingType) { List proposalInfos = dao().query(ProposalInfo.class, Cnd.where(ProposalInfo::getId, "in", proposalIds)); @@ -284,9 +187,7 @@ public class ProposalCommitteeFilingUnitServiceImpl extends BaseServiceImpl - !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingCode(), ""), - StrUtil.nullToDefault(caseFilingCode, "")) - || !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingResult(), ""), + !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingResult(), ""), StrUtil.nullToDefault(caseFilingResult, "")) || !Objects.equals(StrUtil.nullToDefault(proposalInfo.getCaseFilingType(), ""), StrUtil.nullToDefault(caseFilingType, ""))); 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 03eaa73..e47409b 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 @@ -189,7 +189,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp info.id, info.name, info.code, - info.caseFilingCode, info.caseFilingResult, info.caseFilingType, info.researchFindings, @@ -259,7 +258,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("序号", "index", 10)); exportEntities.add(new ExcelExportEntity("提案编号", "code", 20)); - exportEntities.add(new ExcelExportEntity("立案编号", "caseFilingCode", 20)); exportEntities.add(new ExcelExportEntity("立案结果", "caseFilingResultName", 15)); exportEntities.add(new ExcelExportEntity("立案类型", "caseFilingTypeName", 15)); exportEntities.add(new ExcelExportEntity("是否并案", "isConsolidationName", 12)); @@ -318,7 +316,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp NutMap proposalRow = proposalRows.computeIfAbsent(proposalId, key -> NutMap.NEW() .addv("id", proposalId) .addv("code", row.getString("code")) - .addv("caseFilingCode", row.getString("caseFilingCode")) .addv("name", row.getString("name")) .addv("createUserName", row.getString("createUserName")) .addv("caseFilingResult", row.getString("caseFilingResult")) @@ -373,7 +370,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp SELECT DISTINCT info.id, info.code, - info.caseFilingCode, info.name, info.createUserName, info.caseFilingResult, @@ -413,9 +409,8 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp LinkedHashSet masterUnitNames = getUnitNameSet(proposalRow, "masterUnitNames"); LinkedHashSet slaveUnitNames = getUnitNameSet(proposalRow, "slaveUnitNames"); NutMap excelRow = NutMap.NEW() - // 承办单位表统一展示为“立案编号”；未生成立案编号的工作建议回退显示提案编号。 - .addv("caseFilingCode", StrUtil.blankToDefault(proposalRow.getString("caseFilingCode"), - proposalRow.getString("code"))) + // 承办单位表只展示提案编号，立案结果不再生成独立编号。 + .addv("code", proposalRow.getString("code")) .addv("name", proposalRow.getString("name")) .addv("createUserName", proposalRow.getString("createUserName")) .addv("masterUnitNames", "") @@ -434,7 +429,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp } if (!suggestionRows.isEmpty()) { filingRows.add(NutMap.NEW() - .addv("caseFilingCode", WORK_SUGGESTION_SECTION_MARKER) + .addv("code", WORK_SUGGESTION_SECTION_MARKER) .addv("name", "") .addv("createUserName", "") .addv("masterUnitNames", "") @@ -450,7 +445,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp */ private Workbook buildUndertakeUnitWorkbook(String title, String unitName, List excelRows) { List exportEntities = new ArrayList<>(); - exportEntities.add(new ExcelExportEntity("立案编号", "caseFilingCode", 11)); + exportEntities.add(new ExcelExportEntity("提案编号", "code", 11)); exportEntities.add(new ExcelExportEntity("提案名称", "name", 43)); exportEntities.add(new ExcelExportEntity("提案人", "createUserName", 13)); exportEntities.add(new ExcelExportEntity("主办单位", "masterUnitNames", 19)); @@ -925,7 +920,6 @@ public class ProposalExportServiceImpl extends BaseServiceImpl imp info.id, info.name, info.code, - info.caseFilingCode, info.caseFilingResult, info.caseFilingType, info.researchFindings, diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalUnderTakeReplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalUnderTakeReplyServiceImpl.java index f1aae3f..c80c9a9 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalUnderTakeReplyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalUnderTakeReplyServiceImpl.java @@ -336,7 +336,7 @@ public class ProposalUnderTakeReplyServiceImpl extends BaseServiceImpl i Cnd.where(WelfareProjectSubjectOption::getId, "in", toDeleteIds)); } - for (WelfareProjectSubjectOption option : project.getOptions()) { - option.setWelfareId(project.getId()); - dao().insertOrUpdate(option); + // 慰问金可不配置福利选项，编辑空选项项目时无需写入关联记录。 + if (project.getOptions() != null) { + for (WelfareProjectSubjectOption option : project.getOptions()) { + option.setWelfareId(project.getId()); + dao().insertOrUpdate(option); + } } // 更新首页活动 diff --git a/src/main/resources/views/platform/sys/data/user/pull.html b/src/main/resources/views/platform/sys/data/user/pull.html index 1880879..96250d2 100644 --- a/src/main/resources/views/platform/sys/data/user/pull.html +++ b/src/main/resources/views/platform/sys/data/user/pull.html @@ -62,7 +62,7 @@ layout("/layouts/platform.html"){ - 拉取信息中心数据 + 拉取本地中间表数据 删除本地数据源 @@ -124,7 +124,7 @@ layout("/layouts/platform.html"){ }, methods: { pull() { - this.$confirm("确定要拉取数据源吗？", "提示", { + this.$confirm("确定从本地中间表更新单位并拉取人员数据源吗？", "提示", { type: "warning", confirmButtonText: "确定", cancelButtonText: "取消" diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js index 3aa3926..f212cbc 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js @@ -12,7 +12,6 @@ const PROPOSAL_INFO = { {{ viewData.code }} - {{ viewData.caseFilingCode || '暂无' }} {{viewData.createUserName }} {{ viewData.createTime }} {{ viewData.sessionName || '暂无' }} @@ -215,7 +214,7 @@ const PROPOSAL_INFO = { + v-if="['opinion_unit_reply','unit_reply','two_unit_reply','opinion_master_reply','master_reply','slave_reply'].includes(task.taskName)" :span="3"> {{task.ext.underTakeName}} @@ -359,7 +358,7 @@ const PROPOSAL_INFO = { * @return 仅用于查看页面的展示数组；原始任务及每条答复内容均保存在 replyTasks 中 */ groupReplyTasks(tasks) { - const replyTaskNames = ["opinion_unit_reply", "unit_reply", "two_unit_reply", "master_reply", "slave_reply"] + const replyTaskNames = ["opinion_unit_reply", "unit_reply", "two_unit_reply", "opinion_master_reply", "master_reply", "slave_reply"] const replyTasks = (tasks || []).filter((task) => replyTaskNames.includes(task.taskName)) if (!replyTasks.length) { return tasks || [] @@ -384,8 +383,7 @@ const PROPOSAL_INFO = { /** * 获取提案任务所属的展示阶段。 - * 未单列的预审核、委员审议、确认承办单位和复核记录统一放在委员会立案阶段， - * 答复后的校领导审批通过 legacyStage 标识排在承办单位答复之后。 + * 按当前 WF 节点顺序展示两级主席审核、立案、答复、校领导审批和评价。 * * @param task 单条已办任务 * @return 数字类型的阶段顺序 @@ -397,8 +395,9 @@ const PROPOSAL_INFO = { if (taskName === "invite") return 15 if (taskName === "second") return 20 if (taskName === "delegation") return 30 - if (["opinion_unit_reply", "unit_reply", "two_unit_reply", "master_reply", "slave_reply"].includes(taskName)) return 50 - if (taskName === "schoolLeader" && legacyStage === "replyLeaderAudit") return 55 + if (taskName === "schoolUnionChairApproval") return 35 + if (["opinion_unit_reply", "unit_reply", "two_unit_reply", "opinion_master_reply", "master_reply", "slave_reply"].includes(taskName)) return 50 + if (taskName === "school_leader" || taskName === "schoolLeader" && legacyStage === "replyLeaderAudit") return 55 if (taskName === "feedback") return 60 return 40 }, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html index 74c8841..281f6ab 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/index.html @@ -27,12 +27,12 @@ layout("/layouts/platform.html"){ - - - + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js index 730400b..4f09af2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/config/unit/user.js @@ -1,6 +1,6 @@ const USER_COMPONENT = { template: ` - + - @@ -186,7 +185,6 @@ layout("/layouts/platform.html"){ }, tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name"}, {label: "提案人", prop: "createUserName"}, {label: "提案类别", prop: "typeName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html index 38a329d..c21cca1 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/collectProgress/index.html @@ -23,7 +23,6 @@ layout("/layouts/platform.html"){ - @@ -123,7 +122,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案人", prop: "createUserName"}, {label: "代表团", prop: "delegationName"}, 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 817711b..6b7c7ec 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 @@ -265,7 +265,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案人", prop: "createUserName"}, {label: "提案类别", prop: "typeName"}, @@ -308,10 +307,6 @@ layout("/layouts/platform.html"){ { label: '提案人', value: 'createUserName' - }, - { - label: '立案编号', - value: 'caseFilingCode' } ] } diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html index dcc8991..5ecbf2d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/yearReport/index.html @@ -23,7 +23,6 @@ layout("/layouts/platform.html"){ - @@ -70,7 +69,6 @@ layout("/layouts/platform.html"){ - 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 0ab56f1..1434594 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 @@ -21,7 +21,6 @@ layout("/layouts/platform.html"){ - @@ -55,7 +54,6 @@ layout("/layouts/platform.html"){ - @@ -113,11 +111,6 @@ layout("/layouts/platform.html"){ - - - - - diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html index dd3ed35..80bee31 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/delete/index.html @@ -19,7 +19,6 @@ layout("/layouts/platform.html"){ - @@ -49,7 +48,6 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html index 9489ee4..b7bf27c 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/expediting/index.html @@ -19,7 +19,6 @@ layout("/layouts/platform.html"){ - @@ -132,7 +131,6 @@ layout("/layouts/platform.html"){ tableColumns: [ {prop: 'code', label: '提案编号'}, - {prop: 'caseFilingCode', label: '立案编号'}, {prop: 'name', label: '提案名称'}, {prop: 'typeName', label: '提案类别'}, {prop: 'delegationName', label: '代表团'}, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html index e21d2b5..b8800f7 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html @@ -21,7 +21,6 @@ layout("/layouts/platform.html"){ - @@ -55,7 +54,6 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html index f0b2478..e702239 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/senior/type/index.html @@ -19,7 +19,6 @@ layout("/layouts/platform.html"){ - @@ -49,7 +48,6 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/caseCheck/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/caseCheck/index.html index 79294ff..087e9b2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/caseCheck/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/caseCheck/index.html @@ -148,7 +148,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案人", prop: "createUserName", width: "80px"}, {label: "提案类别", prop: "typeName"}, 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 02b09a1..8b5bac3 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 @@ -204,7 +204,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ { label: "提案编号", prop: "code" }, - { label: "立案编号", prop: "caseFilingCode" }, { label: "提案名称", prop: "name", width: "200px" }, { label: "提案类别", prop: "typeName" }, { label: "届次", prop: "sessionName" }, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html index 24da950..00d6770 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html @@ -116,7 +116,7 @@ layout("/layouts/platform.html"){ + :rules="[{required:pendingSubmitType === 1,message:'必填',trigger:['change','blur']}]"> {{item.label}} @@ -135,7 +135,7 @@ layout("/layouts/platform.html"){ task.ext && task.ext.tf_caseFilingResult) + if (!data) return this.$set(this.formData, "tf_caseFilingResult", data.ext.tf_caseFilingResult) this.$set(this.formData, "tf_caseFilingType", data.ext.tf_caseFilingType) this.$set(this.formData, "tf_masterUnitIds", this.normalizeUnitIds(data.ext.tf_masterUnitIds)) @@ -352,6 +353,7 @@ layout("/layouts/platform.html"){ openAudit(row) { this.$refs.guava.edit(() => { this.showApprovalForm = true + this.pendingSubmitType = 1 this.formData = { proposalId: row.id, processTaskId: row.taskId, @@ -365,6 +367,9 @@ layout("/layouts/platform.html"){ }, handleTaskAction(val) { + // 退回只需要审核意见；立案结果与承办单位仅在正式提交时必填。 + this.pendingSubmitType = val + this.$refs.formRef.clearValidate() this.$refs.formRef.validate(valid => { if (!valid) return this.$confirm("您确定要提交吗？", "提示", { @@ -405,7 +410,7 @@ layout("/layouts/platform.html"){ } const loading = createLoading('提交中') - this.$axios.post("/platform/proposal/committeeFilingUnit/executeTask", { + this.$axios.post("/platform/proposal/committeeFiling/executeTask", { data: JSON.stringify(params) }).then((res) => { if (res.code === 0) { @@ -444,7 +449,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "info" }).then(() => { - this.$axios.post("/platform/proposal/committeeFilingUnit/revokeTask", { + this.$axios.post("/platform/proposal/committeeFiling/revokeTask", { taskId: row.taskId, proposalId: row.id }).then((res) => { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html index bda3ffa..1156022 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/control/index.html @@ -16,7 +16,6 @@ layout("/layouts/platform.html"){ - @@ -93,7 +92,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "220px"}, {label: "提案人", prop: "createUserName", width: "90px"}, {label: "提案类别", prop: "typeName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html index dfa76b4..ec8e3b9 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/delegation/index.html @@ -107,7 +107,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案人", prop: "createUserName", width: "80px"}, {label: "提案类别", prop: "typeName"}, 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 7b7bac2..de1ed7b 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 @@ -122,7 +122,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案类别", prop: "typeName"}, {label: "是否并案", prop: "merge"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/preAudit/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/preAudit/index.html index 8806f74..056d8f4 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/preAudit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/preAudit/index.html @@ -112,7 +112,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案人", prop: "createUserName", width: "80px"}, {label: "提案类别", prop: "typeName"}, @@ -155,9 +154,9 @@ layout("/layouts/platform.html"){ openAudit(row) { this.$refs.guava.edit(() => { this.showApprovalForm = true - this.formData = { + this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName, + taskName: row.taskName || "校工会主席审核", taskKey: row.taskKey } this.$refs.proposalInfoRef.onOpen(row) diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html index 46aae20..0e30919 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html @@ -146,7 +146,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案类别", prop: "typeName"}, {label: "办理单位", prop: "undertakeUnits", width: "260px"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unSubmitQuery/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unSubmitQuery/index.html index 44cdb46..1000f71 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unSubmitQuery/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unSubmitQuery/index.html @@ -71,26 +71,7 @@ layout("/layouts/platform.html"){ @@ -118,14 +99,13 @@ layout("/layouts/platform.html"){ {label: "提交方式", prop: "mannerName"}, {label: "附议人数量", prop: "secondedNum"}, {label: "已附议", prop: "secondedAgreeNum"}, - {label: "团长审核", prop: "delegationAudit"}, + {label: "分工会主席审核", prop: "delegationAudit"}, ], pageForm: { approval: false, searchName: "proposalName", searchName2: "su.username", }, - showApprovalForm: false, sessionOptions: [] } }, @@ -133,7 +113,6 @@ layout("/layouts/platform.html"){ // 查看 openView(row) { this.$refs.guava.edit(() => { - this.showApprovalForm = false this.$refs.proposalInfoRef.onOpen(row) }) }, diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html index 6570083..3b68b5d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html @@ -291,7 +291,6 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "提案编号", prop: "code"}, - {label: "立案编号", prop: "caseFilingCode"}, {label: "提案名称", prop: "name", width: "200px"}, {label: "提案类别", prop: "typeName"}, {label: "立案结果", prop: "caseFilingResult"}, @@ -463,10 +462,10 @@ layout("/layouts/platform.html"){ // 加载候选人列表 loadCandidates(taskId) { - $.get("/flow/common/candidate", {taskId}).then((res) => { + this.$axios.post("/flow/common/candidate", {taskId}).then((res) => { if (res.code === 0) { - this.candidates = res.data.candidates - this.supportCandidate = res.data.support + this.$set(this, "candidates", res.data.candidates) + this.$set(this, "supportCandidate", res.data.support) } }) }, diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html index 99ddf41..259cef1 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html @@ -88,7 +88,7 @@ layout("/layouts/platform.html"){