Commit Graph

233 Commits

Author SHA1 Message Date
mashuanghui 3e13344198 修复查询重复菜单问题 2024-08-14 15:25:35 +08:00
likewei a5931aa966 Merge remote-tracking branch 'origin/master' 2024-08-14 10:22:51 +08:00
likewei 42c12bf2ac 修改bug 2024-08-14 10:22:41 +08:00
renzexin 94fcdc0830 fix 任务列表-任务名称搜索不生效 2024-08-14 09:09:38 +08:00
Chujinwang 44abed9927 任务列表保存失败 2024-08-09 09:53:52 +08:00
Chujinwang 822650135c 权限标识 2024-08-06 09:35:11 +08:00
ant d1d6874178 Merge remote-tracking branch 'origin/master' 2024-08-01 10:34:39 +08:00
Chujinwang 1c7e3d2fc6 审核规则修改 2024-08-01 09:10:02 +08:00
ant 4901af59a8 1. 模版管理
2. 上传文件 异常
3. 分期 token 无效
2024-07-31 16:13:01 +08:00
ant 39873804a3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
2024-07-31 15:20:00 +08:00
Chujinwang ba8285c918 bug修复 2024-07-31 15:16:29 +08:00
ant 9d638fb7a5 1. 江苏工行数据同步 2024-07-30 20:09:30 +08:00
ant 6ac373d254 Merge remote-tracking branch 'origin/master' 2024-07-30 09:06:21 +08:00
Chujinwang 6803f3cb0d 审核规则 2024-07-30 09:04:29 +08:00
ant 33f1b52a3b Merge remote-tracking branch 'origin/master' 2024-07-29 18:17:55 +08:00
ant bc685775f6 1. 字典修改bug 2024-07-29 18:17:47 +08:00
Chujinwang 085f766c8f 审核规则 2024-07-29 17:22:39 +08:00
ant 7137904683 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/mapper/WrkInfoMapper.java
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
#	chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoMapper.xml
2024-07-29 16:43:36 +08:00
ant e320ce60b3 1. 修改后台任务相关 2024-07-29 16:42:05 +08:00
Chujinwang f8dc29bc1d 人工数据 2024-07-29 15:52:41 +08:00
ant a8e997e260 1. 工单数据相关
2. 江苏工行代码创建
2024-07-29 15:17:10 +08:00
ant 3110b37f5d Merge remote-tracking branch 'origin/master' 2024-07-29 11:18:59 +08:00
ant ab9146e0f0 1. 去除version 字段修改导致 修改失败
2. 项目数据导出
3. oss 无法序列化问题
2024-07-29 11:18:49 +08:00
Chujinwang a995005fe7 财务数据 2024-07-29 10:54:31 +08:00
ant 3f82ff3ff1 1. 打开 ins的rocket 2024-07-29 10:00:36 +08:00
Chujinwang 3d53e2fed4 队列问题 2024-07-27 11:42:56 +08:00
Chujinwang c5fc5dfff2 派单记录 2024-07-27 11:26:21 +08:00
ant 024a53d3c2 1. 项目数据
2. 更改系统日志使用 rocket 队列
2024-07-26 18:33:47 +08:00
ant 1835bf6f1e 1. 商户, 终端, 工单 添加任务id 2024-07-26 17:44:12 +08:00
ant 080a1272e3 1. 撤回 2024-07-26 15:55:12 +08:00
ant f3ad7c0862 1. 巡检联调 2024-07-26 14:55:48 +08:00
ant 3f1ed12b6a 1. 商户数据, 商户终端, 商户巡检单 2024-07-26 11:16:20 +08:00
Chujinwang 88ca3fad78 Merge remote-tracking branch 'origin/master' 2024-07-26 11:00:09 +08:00
Chujinwang cde6b6b40f 审核规则 2024-07-26 10:59:52 +08:00
ant cc7b6199b9 1. 调整 dataScope 2024-07-26 10:47:02 +08:00
ant 6a7663dce6 1. 调整bug 2024-07-24 18:46:54 +08:00
ant 99192f2b5c 1.派单记录 2024-07-24 14:41:29 +08:00
ant bef28bb083 1. 江苏工行相关代码 2024-07-24 11:03:43 +08:00
ant ef662ba7cc 1. 审核 相关 2024-07-23 15:15:12 +08:00
Chujinwang e966326dbc 修改和报错问题 2024-07-22 09:26:37 +08:00
ant e41669ed0a 1. 江苏工行相关代码 2024-07-19 18:28:59 +08:00
ant 6259550e1d 1. 版本号修改bug 2024-07-19 17:58:42 +08:00
ant 241047f5e9 Merge remote-tracking branch 'origin/master' 2024-07-19 17:49:02 +08:00
ant e467e83519 1. 派单进度 2024-07-19 17:48:47 +08:00
Chujinwang b4c09a46d4 派单任务 2024-07-19 15:58:00 +08:00
Chujinwang 5f84334ae3 派单任务加商户编号筛选 2024-07-19 15:19:54 +08:00
Chujinwang 07c74e14d8 派单任务 2024-07-19 15:17:06 +08:00
ant 4f43975e73 1. 江苏工行 2024-07-19 15:10:24 +08:00
Chujinwang 4e4d8d9de6 派单导出 2024-07-19 11:06:08 +08:00
Chujinwang 4b2eac7261 工单撤回 2024-07-19 09:22:05 +08:00
Chujinwang 37199ffff4 工单撤回 2024-07-18 16:45:20 +08:00
ant 1b309739e4 1. 删除状态值 2024-07-18 16:29:19 +08:00
Chujinwang f24d94b25d 添加deptId字段 2024-07-18 09:59:15 +08:00
ant 35c1d84675 1. 终端 删除接口 2024-07-18 09:27:44 +08:00
Chujinwang ade898b1eb 提交商户导入 2024-07-17 12:24:00 +08:00
Chujinwang 5d2d44b268 修改导入商户逻辑为直接导入 2024-07-16 15:42:58 +08:00
Chujinwang a7bd8a00bd 修改商户导入接口异步 2024-07-15 09:03:00 +08:00
Chujinwang cece6186cf 工单审核补提实体 2024-07-13 14:52:30 +08:00
Chujinwang 197e8b1de7 工单审核 2024-07-13 14:41:15 +08:00
Chujinwang 28f1cf7777 修改请求方式问题 2024-07-12 18:18:17 +08:00
ant fb6d459076 1. 审核相关 2024-07-12 16:28:29 +08:00
ant 20e2946b93 1. 修改 权限关键词, 2024-07-12 15:23:34 +08:00
ant eb1e3bc2ba 1. 小程序 查询工单列表 2024-07-12 15:19:47 +08:00
ant 267dd281ea 1. 待初审,待复审, 归档 以及全部 2024-07-12 15:05:42 +08:00
ant 8805b6838c 1. 接口联调 2024-07-12 11:06:31 +08:00
ant 909a4aee09 1. 接口联调 2024-07-12 10:39:50 +08:00
ant 8b5a81f30a 1. 去除循环依赖bug
2. 修改接口幂等性注解
2024-07-11 17:17:48 +08:00
ant 0332ca6efb 1. 去除无用类
2. 修改注释
2024-07-11 17:03:04 +08:00
zhaowenyuan d8e52ade54 1. 派单记录 2024-07-11 16:49:48 +08:00
zhaowenyuan c42bf49c05 1. 工单审核 2024-07-04 17:07:24 +08:00
zhaowenyuan 3d52fdacdc 1. 项目审核相关 2024-07-04 17:05:16 +08:00
zhaowenyuan 044d8e49e9 1. 待审核合同列表 2024-07-04 16:55:02 +08:00
zhaowenyuan 736cabee9a 1. 添加工单进度 2024-07-04 10:46:49 +08:00
zhaowenyuan e919621d2e Merge remote-tracking branch 'origin/master' 2024-07-04 10:36:06 +08:00
zhaowenyuan 321132766b 1. 派单记录 2024-07-04 10:36:00 +08:00
Chujinwang 401699ba00 修改导入为两个预读取和导入两个功能 2024-07-04 09:08:23 +08:00
zhaowenyuan 129c2f4b01 1. 电子巡检单 2024-07-03 18:33:36 +08:00
zhaowenyuan c182da5a1b 1. 模板迁移 2024-07-03 18:29:59 +08:00
Chujinwang bf67b50a63 导入商户 2024-07-03 16:05:09 +08:00
zhaowenyuan 97b6fd0e3a 1. 模板迁移 2024-07-03 10:13:16 +08:00
zhaowenyuan c1ef3de59b 1. 模板迁移 2024-07-03 10:10:10 +08:00
zhaowenyuan 6cb7e01abf 1. 商户终端导入 2024-07-03 09:59:58 +08:00
zhaowenyuan a8ec519bbe 1. 下载导入模板 2024-07-02 15:46:54 +08:00
zhaowenyuan 553a0d9b4f 1. 改了n多 2024-07-02 11:36:43 +08:00
zhaowenyuan 83db6b9046 1. 改了n多 2024-07-02 11:31:47 +08:00
zhaowenyuan 41039810d6 pom 2024-07-01 11:46:19 +08:00
zhaowenyuan 00a0ec2a2a 1. oss 相关 上传 is 2024-07-01 10:56:05 +08:00
zhaowenyuan 4c6c63ac62 1. 表对应id 2024-07-01 10:32:27 +08:00
zhaowenyuan 6d58e43fa6 1. 工单相关 2024-07-01 10:30:12 +08:00
zhaowenyuan 1a844ffa44 1. 修改 oss删除 2024-07-01 09:26:19 +08:00
Chujinwang ccb787514f 终端商户池派单 2024-06-29 18:05:56 +08:00
zhaowenyuan d528e0fe89 1. 添加 远程获取 文件数据 2024-06-29 11:41:38 +08:00
zhaowenyuan 3c28d43fe4 1. 文件下载无法打开bug 2024-06-29 10:38:55 +08:00
zhaowenyuan 4bd86c2e0e 1. file 删除时, 同步删除 fileSource 2024-06-28 18:29:29 +08:00
zhaowenyuan e66dc52858 1. 巡检单信息 2024-06-28 18:17:28 +08:00
zhaowenyuan 05dbe74b1c 1. 派单 2024-06-28 17:25:43 +08:00
zhaowenyuan 1d73036a74 1. 工单相关 2024-06-28 17:19:44 +08:00
Chujinwang f54159e492 终端商户池 2024-06-28 17:15:21 +08:00
zhaowenyuan e4c6ec92c8 Merge remote-tracking branch 'origin/master' 2024-06-28 09:43:50 +08:00
zhaowenyuan 7fd574d4ad 1. 调整condition , 注入方式进行where 条件编写 2024-06-28 09:43:44 +08:00