 wsmandGitee
|
770b125023
|
!57 fix(system): 用户部门查询改用LinkedHashMap保持插入顺序
Merge pull request !57 from wsm/fix/return_peoplo_by_order
|
2026-06-29 08:13:55 +00:00 |
|
|
wsmandGitee
|
a73db8b58c
|
!56 fix(bpm): 修复variablesMap在lambda中非effectively final的编译错误
Merge pull request !56 from wsm/feature/dept_filter
|
2026-06-29 07:58:14 +00:00 |
|
|
wsm
|
c061d09935
|
!55 feat(dqinspecttask): 分页查询VO及Mapper XML补充completedStage字段
* feat(dqinspecttask): 分页查询VO及Mapper XML补充completedStage字段
* feat(dqinspecttask): 新增completedStage字段及流程结束阶段递增监听器
|
2026-06-26 07:57:32 +00:00 |
|
|
new_new_new
|
a7915177a0
|
!53 refactor(excel): 提取Excel工具包为独立模块jeecg-module-tools，支持跨项目复用
* refactor(excel): 提取Excel工具包为独立模块jeecg-module-tools，支持跨项目复用
* fix(excel): 校验错误详情返回前端，ColumnMeta重构为Record，避免字典错后重复报NotBlank
* Merge remote-tracking branch 'origin/master'
* chore: 添加easyexcel依赖
|
2026-06-24 03:36:58 +00:00 |
|
|
new_new_new
|
9aec8dbbbe
|
!52 feat(excel): 新增EasyExcel分批导入，支持字典校验和Hibernate Validator
* feat(excel): 新增EasyExcel分批导入，支持字典校验和Hibernate Validator
* feat(excel): 新增EasyExcel导出工具类，基于@Excel注解解析并支持模板表头下载
* chore: 添加easyexcel依赖
|
2026-06-23 10:36:56 +00:00 |
|
|
new_new_newandGitee
|
ad84b989a7
|
!51 refactor(supervision): 优化Excel导出字段,隐藏内部字段并补充字典翻译
Merge pull request !51 from new_new_new/feature/20260622
|
2026-06-22 07:03:52 +00:00 |
|
|
new_new_newandGitee
|
58d82dd2ba
|
!49 refactor(flow): 统一管理部门ID和角色ID至 OrgConfig
Merge pull request !49 from new_new_new/feature/20260618
|
2026-06-22 06:35:31 +00:00 |
|
|
new_new_newandGitee
|
80c958d474
|
!48 feat(system): 用户选择列表按sortno升序排序
Merge pull request !48 from new_new_new/feature/select_user_with_sort
|
2026-06-22 02:38:18 +00:00 |
|
|
new_new_new
|
b9eb8cd99f
|
!47 refactor(flow): 统一管理部门ID和角色ID至 OrgConfig
* refactor(flow): 统一管理部门ID和角色ID至 OrgConfig
|
2026-06-18 02:19:26 +00:00 |
|
|
new_new_newandGitee
|
2f0bd10971
|
!45 fix(system): 选人组件查询增加 ORDER BY 排序
Merge pull request !45 from new_new_new/fix/order_by
|
2026-06-17 02:34:38 +00:00 |
|
|
new_new_newandGitee
|
f5f9e32d66
|
!44 fix(system): 修复选人组件 GROUP BY 不兼容问题
Merge pull request !44 from new_new_new/fix/select_group_by
|
2026-06-16 03:19:44 +00:00 |
|
|
new_new_newandGitee
|
6e23e6b7b0
|
!41 test(inspectcloseout): 新增销号模块单元测试
Merge pull request !41 from new_new_new/test/inspect_close
|
2026-06-12 01:09:15 +00:00 |
|
|
new_new_new
|
3ce0c520cd
|
!40 feat(inspectcloseout): 新增党群部门流程表达式方法
* feat(inspectcloseout): 新增党群部门流程表达式方法
|
2026-06-11 07:50:37 +00:00 |
|
|
new_new_new
|
59bd76a250
|
!39 Merge branch 'master' into feature/20260610
* Merge branch 'master' into feature/20260610
* fix(dqinspecttask): updateMain 子表数据仅在显式传入时才变更
* chore(system): 删除 xiSpeakFlow Bean 调试打印语句
* test(inspectimprove): 新增 inspectimprove 流程模块单元测试
|
2026-06-10 08:30:47 +00:00 |
|
|
new_new_new
|
15191eef4b
|
!38 feat(inspectimprove): 新增获取党群领导流程表达式方法
* feat(inspectimprove): 新增获取党群领导流程表达式方法
* feat(inspectimprove): 新增领导审批判断及审批用户流程表达式方法
|
2026-06-09 09:22:34 +00:00 |
|
|
new_new_new
|
16c0342dcd
|
!36 feat(inspectcloseout): 新增 getJWSJUser 纪委书记用户查询方法，完善空值与多用户校验
* feat(inspectcloseout): 新增 getJWSJUser 纪委书记用户查询方法，完善空值与多用户校验
* feat(inspectcloseout): 新增 InspectCloseoutConstant 常量文件，补全 InspectClose…
* fix(inspectimprove): 修复 getMeasureResLeader 方法体为正确返回措施责任领导，新增 AfterMea…
* fix(dqinspecttask): DqInspectProgress 逻辑删除字段 delFlag 添加默认值 0
|
2026-06-09 00:25:44 +00:00 |
|
|
new_new_newandGitee
|
fc69f25260
|
!34 Merge branch 'master' into dev
Merge pull request !34 from new_new_new/dev
|
2026-06-05 09:25:46 +00:00 |
|
|
new_new_new
|
21aa457996
|
!33 fix(supervision): 实际完成时间日期格式由日期时间改为仅日期
* fix(supervision): 实际完成时间日期格式由日期时间改为仅日期
* refactor(flow): 分管所领导字段重命名为 chargeLeaderId 并在分页VO中补充字典映射
* fix(flow): 统一所有流程表达式日志格式并重构 getSDWSJ 增加唯一性校验
* fix(flow): 统一流程表达式日志前缀并补充 businessKey 便于排查
* feat(flow): 新增分管所领导字段及流程变量读取方法
* refactor(flow): 监听器组件名添加 Inspect 前缀统一命名
* refactor(flow): 提取 LeaderApproveHelper 消除领导审批监听器重复代码
* refactor(flow): 将部门领导审批监听器调整为党群领导，新增 DQ_DEPT_LEADER_KEY 常量
* feat(flow): 新增部门领导审批通过后写入流程变量监听器
|
2026-06-05 09:19:44 +00:00 |
|
|
new_new_new
|
335890b699
|
!32 fix(flow): 修复配置前缀错误导致 props 为 null 及流程变量获取失败
* fix(flow): 修复配置前缀错误导致 props 为 null 及流程变量获取失败
* fix(flow): 修复 inspectImproveProps 字段初始化 NPE 问题
* feat(flow): 新增巡视整改流程党群领导审批表达式方法
* feat(dqinspecttask): 新增工作进展反馈子表独立Controller接口
|
2026-06-04 12:25:18 +00:00 |
|
|
new_new_new
|
0bc279957f
|
!31 feat(flow): 新增巡视整改和巡视整改销号流程模块
* feat(flow): 新增巡视整改和巡视整改销号流程模块
* feat(flow): 新增巡视整改和巡视整改销号流程 YAML 配置
* chore: 添加 localDocs 到 gitignore 并移除已跟踪的 docs 文件
|
2026-06-03 09:22:12 +00:00 |
|
|
new_new_new
|
198a657f17
|
!30 feat(xispeak): 撤回流程时同步删除抄送记录
* feat(xispeak): 撤回流程时同步删除抄送记录
* feat(tasktask): 周期性任务改为按年月日匹配当天需发起的任务
|
2026-06-02 09:04:38 +00:00 |
|
|
new_new_new
|
fe677b5181
|
!29 feat(xispeak): 为领导userId字段添加字典配置，Excel导出时显示真实姓名
* feat(xispeak): 为领导userId字段添加字典配置，Excel导出时显示真实姓名
|
2026-06-01 08:49:41 +00:00 |
|
|
new_new_newandGitee
|
4373cb75a9
|
!28 feat(xispeak): 部门审批信息改为持久化到业务表单JSON，不再依赖流程引擎变量
Merge pull request !28 from new_new_new/feature/20260527
|
2026-05-27 12:30:20 +00:00 |
|
|
new_new_newandGitee
|
d01725bf7b
|
!27 chore: add .claude directory to gitignore
Merge pull request !27 from new_new_new/fix/gitignore
|
2026-05-26 10:53:41 +00:00 |
|
|
new_new_newandGitee
|
a8e8a322e7
|
!26 巡视整改台账表单
Merge pull request !26 from new_new_new/inspection
|
2026-05-26 07:53:49 +00:00 |
|
|
new_new_newandGitee
|
12ae3b7c14
|
!25 feat(xispeak): 删除流程时同步逻辑删除关联的审批意见表记录
Merge pull request !25 from new_new_new/feature/20260525
|
2026-05-26 06:22:40 +00:00 |
|
|
new_new_newandGitee
|
2b532c721f
|
!24 Merge branch 'master' into feature/20260519
Merge pull request !24 from new_new_new/feature/20260519
|
2026-05-22 08:53:41 +00:00 |
|
|
new_new_newandGitee
|
4c1c4ec50c
|
!22 wsm-xispeak-收集后反馈流程
Merge pull request !22 from new_new_new/feature/20260515
|
2026-05-15 08:42:51 +00:00 |
|
|
new_new_newandGitee
|
e2e3b913d8
|
!21 wsm-修改xispeak督办计划流程
Merge pull request !21 from new_new_new/feature/wsm-xispeak-second-process
|
2026-05-13 13:10:39 +00:00 |
|
|
new_new_newandGitee
|
9d8bb8c676
|
!20 wsm-修改xispeak督办计划流程
Merge pull request !20 from new_new_new/feature/xispeak-first-process
|
2026-05-12 07:35:46 +00:00 |
|
|
new_new_newandGitee
|
0f36e71ca3
|
!19 wsm-添加适配会签任务内再次会签的变量获取方法
Merge pull request !19 from new_new_new/feature/different-level-get-veriable
|
2026-05-07 02:38:25 +00:00 |
|
|
new_new_newandGitee
|
82281a5467
|
Merge branch 'master' of gitee.com:sz_30/supervison-java into feature/different-level-get-veriable
Signed-off-by: new_new_new <8454518+new-twice@user.noreply.gitee.com>
|
2026-05-07 02:38:09 +00:00 |
|
|
new_new_newandGitee
|
d53bdebe5a
|
!18 加载配置文件
Merge pull request !18 from new_new_new/feature/20260506-xispeak
|
2026-05-06 08:50:12 +00:00 |
|
|
new_new_newandGitee
|
cedc98ee4b
|
!17 修改监听器，对于子流程内的会签向上两级寻找执行实例id
Merge pull request !17 from new_new_new/feature/20260506-xispeak
|
2026-05-06 08:39:37 +00:00 |
|
|
new_new_newandGitee
|
aae6a3739f
|
!16 在依赖裁决中明确flow模块的版本号
Merge pull request !16 from new_new_new/feature/20260506-branch
|
2026-05-06 01:14:32 +00:00 |
|
|
new_new_newandGitee
|
1764cddbfe
|
!15 修改test
Merge pull request !15 from new_new_new/feature/20260506-branch
|
2026-05-06 00:57:12 +00:00 |
|
|
new_new_newandGitee
|
bc4ae2f1c4
|
!13 根据输入的userId，返回排序后的所有二级部门
Merge pull request !13 from new_new_new/feature/return_level1_dept
|
2026-04-24 08:54:04 +00:00 |
|
|
new_new_newandGitee
|
ba1bc80550
|
!12 实现根据输入的jsonData，deptId，以及roleId查询uesrNameList
Merge pull request !12 from new_new_new/feature/query-list-by-deptId-roleId
|
2026-04-23 15:44:39 +00:00 |
|
|
new_new_newandGitee
|
c32c240296
|
!11 通过businessId查询tasktask中间表数据
Merge pull request !11 from new_new_new/feature/query_by_bussinessId
|
2026-04-22 03:00:18 +00:00 |
|
|
new_new_newandGitee
|
9c08bf019f
|
!10 测试周期性发起接口，恢复jsonData定义，对周期性任务发起前做非空校验
Merge pull request !10 from new_new_new/feature/quartz-task-job
|
2026-04-22 02:43:14 +00:00 |
|
|
new_new_newandGitee
|
f08330aca3
|
!9 定时遍历task_task中间表实现定期发起满足条件的流程
Merge pull request !9 from new_new_new/feature/quartz-task-job
|
2026-04-21 11:35:22 +00:00 |
|
|
new_new_newandGitee
|
a5b4b70647
|
!8 修改接口，立即发起流程时先写表再发起
Merge pull request !8 from new_new_new/feature/20260421-start-flow
|
2026-04-21 01:34:35 +00:00 |
|
|
new_new_newandGitee
|
4662a47fbc
|
!7 修改后端对json数据的接收方式，使用JacksonTypeHandler来做读取写入时的自动处理
Merge pull request !7 from new_new_new/feature/task_json_object
|
2026-04-20 08:26:51 +00:00 |
|
|
new_new_newandGitee
|
4ff4980b00
|
!6 修改向定时任务写的接口，枚举类实现策略模式，接口层服务层实现业务分离。
Merge pull request !6 from new_new_new/feature/middle-table-api
|
2026-04-20 02:29:30 +00:00 |
|
|
new_new_newandGitee
|
1122d7c694
|
!4 修改POM文件，修改配置文件的变量名版本统一配置，解决引入的bom被父pom覆盖的问题
Merge pull request !4 from new_new_new/fix/maven-improve
|
2026-04-13 11:03:17 +00:00 |
|
|
new_new_newandGitee
|
affd4d4adb
|
!3 修改POM文件，实现父pom统一做版本裁决，去除掉子pom里耦合的具体版本信息，并且部分版本变量放在父pom里做管理
Merge pull request !3 from new_new_new/feature/maven-pom-improve
|
2026-04-13 09:01:04 +00:00 |
|
|
new_new_newandGitee
|
0f4d1f528f
|
!2 修改POM文件
Merge pull request !2 from new_new_new/feature/pom-update
|
2026-04-10 08:48:40 +00:00 |
|
|
new_new_newandGitee
|
113c5bf895
|
!1 将开源版本的修改打补丁应用到商业版
Merge pull request !1 from new_new_new/wsm-init-commit
|
2026-04-10 06:22:33 +00:00 |
|
|
new_new_newandGitee
|
3426b578e0
|
Merge branch 'master' of gitee.com:sz_30/supervison-java into wsm-init-commit
Signed-off-by: new_new_new <8454518+new-twice@user.noreply.gitee.com>
|
2026-04-10 06:21:47 +00:00 |
|