Commit Graph

183 Commits

Author SHA1 Message Date
moyongzhen
6e487a60c3 左连接查询加isdeleted==false 2024-03-01 18:34:05 +08:00
柳文翔
8ac687a9be 修改字段类型 2024-03-01 18:09:00 +08:00
柳文翔
d6ea92bd20 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 18:00:18 +08:00
柳文翔
a8b0892ab6 完成 轨迹推送配置内容编辑 接口 2024-03-01 18:00:15 +08:00
moyongzhen
e6ae2ca464 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 17:53:27 +08:00
moyongzhen
d8065bb9d1 轨迹标记添加选中 2024-03-01 17:53:15 +08:00
38f69d0dc5 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 17:50:25 +08:00
545efbeaf3 临时提交 2024-03-01 17:49:20 +08:00
柳文翔
3505a4dbcc 完成 轨迹推送配置编辑 接口 2024-03-01 17:07:11 +08:00
moyongzhen
e3a8a94e1e 轨迹标记也添加选中 2024-03-01 16:38:41 +08:00
moyongzhen
8bf416104a Merge branch 'S01-轨迹中台' into dev 2024-03-01 15:46:35 +08:00
moyongzhen
2c28dafdb6 bug解决 2024-03-01 15:46:07 +08:00
moyongzhen
b0bdc7111b 查询 ?可空 2024-03-01 15:45:39 +08:00
moyongzhen
ef6320b990 Merge branch 'S01-轨迹中台' into dev 2024-03-01 15:41:16 +08:00
moyongzhen
205526e370 轨迹模版,轨迹状态查询添加选中的id 2024-03-01 15:40:33 +08:00
liuwenxiang
5effee08e4 Merge pull request 'S01-轨迹中台' (#4) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/4
2024-03-01 15:27:47 +08:00
3921f00e4b Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 15:07:54 +08:00
ef8ee7acb6 适配vs 2024-03-01 15:07:40 +08:00
moyongzhen
766e243ca0 轨迹订单明细 2024-03-01 14:26:52 +08:00
cf76f52ecc Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 14:22:07 +08:00
60c2b221ea 添加轨迹发生事件 2024-03-01 14:21:54 +08:00
liuwenxiang
d29d468bc6 Merge pull request 'S01-轨迹中台' (#3) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/3
2024-03-01 14:11:23 +08:00
柳文翔
a54f071769 完成 轨迹推送配置内容详情 接口 2024-03-01 14:10:37 +08:00
moyongzhen
64963d2f42 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 11:54:29 +08:00
moyongzhen
6580831a4a 轨迹明细使用订单id查询 2024-03-01 11:54:22 +08:00
2a4a550fa8 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 11:53:42 +08:00
ee05cc8cff 临时提交 2024-03-01 11:53:29 +08:00
liuwenxiang
fd969dd725 Merge pull request 'S01-轨迹中台' (#2) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/2
2024-03-01 11:51:11 +08:00
柳文翔
21f2c215d7 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 11:50:43 +08:00
柳文翔
8161c8bca2 修改关键字字段类型 2024-03-01 11:50:41 +08:00
moyongzhen
adae3501fa 解决冲突 2024-03-01 10:38:39 +08:00
moyongzhen
2ea78adbb7 轨迹订单查询 2024-03-01 10:36:25 +08:00
7f14abe027 清理工程文件 2024-03-01 10:27:55 +08:00
945463dc91 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 10:15:03 +08:00
a2e458e57f 抽象应用契约层 2024-03-01 10:14:49 +08:00
柳文翔
adc30d39c7 完成 轨迹推送配置详情 接口 2024-03-01 10:12:14 +08:00
95d91559e8 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 09:49:34 +08:00
0763cbf263 重组项目依赖 2024-03-01 09:48:49 +08:00
柳文翔
62711af125 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-01 09:44:43 +08:00
柳文翔
3578e82bed 完成 轨迹推送配置内容列表 接口 2024-03-01 09:44:41 +08:00
4c7a94bfff Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-01 09:39:50 +08:00
3260a70fe6 调整目录 2024-03-01 09:39:35 +08:00
liuwenxiang
7636c6a100 Merge pull request '完成 轨迹推送配置列表 接口' (#1) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/1
2024-03-01 09:26:38 +08:00
柳文翔
c3886b1d8b 完成 轨迹推送配置列表 接口 2024-03-01 09:26:11 +08:00
moyongzhen
7a58d3d963 Merge branch 'S01-轨迹中台' into dev 2024-03-01 09:11:56 +08:00
moyongzhen
2998d69ed9 轨迹标记编辑输入参数,字符串类型加上 ? 可空 2024-03-01 09:11:27 +08:00
moyongzhen
159ac8b029 获取分页的轨迹订单 2024-02-29 21:09:25 +08:00
2e125f8662 解决冲突 2024-02-29 20:12:03 +08:00
moyongzhen
543ad77141 Merge branch 'S01-轨迹中台' into dev 2024-02-29 19:46:43 +08:00
moyongzhen
2603cd1ac4 编辑时,字符串类型的必须加?可空 2024-02-29 19:45:13 +08:00
moyongzhen
2825c7f720 Merge branch 'S01-轨迹中台' into dev 2024-02-29 19:08:00 +08:00
moyongzhen
b139734d57 修复新增编辑时,获取不到用户id的问题 2024-02-29 19:06:34 +08:00
moyongzhen
dc066efed9 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-29 18:33:50 +08:00
moyongzhen
57749fc32e 添加授权拦截 2024-02-29 18:33:43 +08:00
柳文翔
5ddfaf5ec3 完成 轨迹拉取配置内容修改 接口 2024-02-29 17:46:14 +08:00
柳文翔
dba6172aab 还原语法 2024-02-29 17:24:58 +08:00
柳文翔
6ce5b5f7bb Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-29 17:22:20 +08:00
柳文翔
812546bfa3 完成 轨迹拉取配置编辑 接口 2024-02-29 17:22:13 +08:00
moyongzhen
a0cc1d824d Merge branch 'S01-轨迹中台' into dev 2024-02-29 17:18:47 +08:00
moyongzhen
95dee9ec69 轨迹内容子系统名称联表名称 2024-02-29 17:18:10 +08:00
moyongzhen
1a3793bc09 Merge branch 'S01-轨迹中台' into dev 2024-02-29 16:38:05 +08:00
moyongzhen
500b4be531 轨迹订单,keywords参数默认传 "" 空字符 2024-02-29 16:35:18 +08:00
moyongzhen
df67c27936 添加轨迹订单明细查询和轨迹订单列表查询 2024-02-29 15:43:06 +08:00
moyongzhen
2d8e89cce7 升级语言预览 2024-02-29 14:38:45 +08:00
moyongzhen
c48e51c40b 轨迹标记 2024-02-29 14:36:38 +08:00
moyongzhen
3d035023e3 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-29 11:49:23 +08:00
moyongzhen
a4504f4d67 轨迹标记功能补充 2024-02-29 11:49:14 +08:00
594411bfc3 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-02-29 11:31:42 +08:00
dingenwen
75295f6173 Merge branch 'S01-轨迹中台' into dev 2024-02-29 11:31:38 +08:00
5bbf7d1824 add 订单增删改、轨迹模板查询 2024-02-29 11:31:19 +08:00
dingenwen
403c9af492 处理异常 2024-02-29 11:30:25 +08:00
yunwei
93b694b5b7 更新 src/SJZY.Track.Api/appsettings.json 2024-02-29 11:29:07 +08:00
yunwei
d37722dfb2 更新 src/SJZY.Track.Api/appsettings.json 2024-02-29 11:26:06 +08:00
柳文翔
90e59e27ea 完成 轨迹拉取配置内容详情 接口 2024-02-29 09:55:44 +08:00
柳文翔
249a77851b 完成 轨迹拉取配置详情 接口 2024-02-29 09:44:36 +08:00
柳文翔
eddd529718 完成 轨迹拉取配置内容列表 接口 2024-02-29 09:20:18 +08:00
moyongzhen
1e9d4fdd6f 1 2024-02-29 09:18:48 +08:00
moyongzhen
df037021ba 轨迹标记服务 2024-02-29 09:18:24 +08:00
moyongzhen
82cee1ed13 状态校验 2024-02-28 21:19:10 +08:00
moyongzhen
8791f12423 轨迹状态 2024-02-28 21:07:37 +08:00
moyongzhen
6596a26def 映射内容 2024-02-28 20:04:29 +08:00
moyongzhen
95f92b3865 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-28 20:00:02 +08:00
moyongzhen
2a07b472be 轨迹内容功能 2024-02-28 19:59:55 +08:00
柳文翔
07418e4810 完成 轨迹拉取配置列表 接口 2024-02-28 19:00:38 +08:00
moyongzhen
6f78f868f1 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-28 17:19:16 +08:00
moyongzhen
25bed79bf6 调整分页获取轨迹模版接口 2024-02-28 17:19:09 +08:00
6b3961a6fd Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-02-28 16:58:24 +08:00
72a1063523 change 订单聚合变更 2024-02-28 16:58:10 +08:00
moyongzhen
1b55ad2965 轨迹模版编辑调整 2024-02-28 16:46:02 +08:00
moyongzhen
87cc34b6b0 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-02-28 16:22:01 +08:00
moyongzhen
3f7a978ec6 轨迹模版调整 2024-02-28 16:21:53 +08:00
14933065e4 change 拆分订单关联服务 2024-02-28 16:20:16 +08:00
ee80cb1353 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-02-28 16:15:47 +08:00
4c4cdd6326 add 关联订单接口 2024-02-28 16:15:32 +08:00
moyongzhen
047e9b4885 轨迹内容功能 2024-02-28 15:48:48 +08:00
moyongzhen
bee28546b4 轨迹内容编辑 2024-02-28 14:38:33 +08:00
moyongzhen
ca2792180a 添加轨迹内容服务 2024-02-28 14:28:19 +08:00
moyongzhen
db4e0c6587 dto添加属性 2024-02-28 14:10:38 +08:00
05637db671 解决冲突 2024-02-28 11:49:18 +08:00
95ff38efd3 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs
#	src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
#	src/SJZY.Track.Repository/TrackStatusRepository.cs
2024-02-28 11:46:36 +08:00