 lvleigang
|
64d815ab49
|
Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-14 16:59:55 +08:00 |
 hecan
|
8611822520
|
新增显示类型字段
|
2024-09-14 16:12:48 +08:00 |
|
hecan
|
6a1fd93a41
|
Merge remote-tracking branch 'origin/grpU8' into grpU8
# Conflicts:
# service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
|
2024-09-14 16:10:41 +08:00 |
|
hecan
|
4028fef8cd
|
通用数据新增和更新树列表
|
2024-09-14 16:10:05 +08:00 |
|
lvleigang
|
ceee0b4b77
|
Merge branches 'dev' and 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-14 16:07:26 +08:00 |
username
|
55d5d4399d
|
消息日志、消息模版、预警设置、消息单次/定时推送
|
2024-09-14 15:50:13 +08:00 |
|
lvleigang
|
97a4f62a8d
|
修改主数据规则查询
|
2024-09-13 09:48:32 +08:00 |
|
lvleigang
|
3c4e5b9a81
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-11 14:11:52 +08:00 |
|
lvleigang
|
504c9e54c0
|
修改主数据保存信息
|
2024-09-11 14:07:03 +08:00 |
|
lvleigang
|
54867aee2c
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-11 14:05:20 +08:00 |
|
lvleigang
|
17518aa2d4
|
修改主数据保存信息
|
2024-09-11 14:04:44 +08:00 |
|
lvleigang
|
fb7e535f83
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-10 08:57:27 +08:00 |
yuqh
|
916a133c0c
|
OA无流程表单公用删除接口
|
2024-09-10 08:45:52 +08:00 |
|
lvleigang
|
3ef384e8e0
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
Conflicts:
buildpackage/src/main/resources/application-llg.yml
|
2024-09-10 08:38:01 +08:00 |
|
lvleigang
|
d6bdd3605f
|
u8c封装接口,测试修改
|
2024-09-09 17:32:47 +08:00 |
|
lvleigang
|
c78e10f059
|
esb添加消息推送方法
|
2024-09-09 14:20:48 +08:00 |
|
lvleigang
|
7af6143514
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-09 11:57:03 +08:00 |
|
username
|
927f8c5a7b
|
推送消息日志记录
|
2024-09-07 16:30:36 +08:00 |
|
username
|
c2ad1e3ea3
|
预警配置，预警接口，定时插件推送消息，消息模版配置，推送消息日志
|
2024-09-07 16:13:21 +08:00 |
|
username
|
24ab9a9dc1
|
Revert "预警配置，预警接口，定时插件推送消息，消息模版配置，推送消息日志"
This reverts commit 37b66cee8b.
|
2024-09-07 16:07:53 +08:00 |
|
username
|
37b66cee8b
|
预警配置，预警接口，定时插件推送消息，消息模版配置，推送消息日志
|
2024-09-07 16:02:27 +08:00 |
|
username
|
07d8962046
|
预警配置，定时插件推送消息，消息模版配置，推送消息日志
|
2024-09-07 14:12:25 +08:00 |
|
lvleigang
|
02e84aac28
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-07 11:47:59 +08:00 |
|
lvleigang
|
4391df3e02
|
u8c封装接口
|
2024-09-06 11:15:55 +08:00 |
|
lvleigang
|
9b514c36e9
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-06 10:09:29 +08:00 |
 xiang2lin
|
1f2d0584e2
|
钉钉接口
2024年9月5日16:00:12
xel
|
2024-09-05 16:00:23 +08:00 |
|
lvleigang
|
95a705c739
|
Merge branches 'dev' and 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-09-04 16:17:05 +08:00 |
|
lvleigang
|
5e7975ec5e
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-04 16:16:42 +08:00 |
|
lvleigang
|
a3da542b56
|
u8c封装接口
|
2024-09-04 16:16:35 +08:00 |
|
hecan
|
540cde8ca1
|
调整部门。职员，指标，如果根据编码查询存在则不保存也不更新，返回该编码已存在
|
2024-09-04 16:14:07 +08:00 |
|
xiang2lin
|
798dfbd3f1
|
增加mdm_up_id
通用接口保存树形结构数据时要用这个字段绑定上下级关系
2024年9月4日14:19:30
|
2024-09-04 14:19:36 +08:00 |
|
xiang2lin
|
38d1b88bd1
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-09-04 14:13:40 +08:00 |
|
hecan
|
96cb15eeff
|
显示类型为组织树时候，展示和新增组织树
|
2024-09-03 09:10:43 +08:00 |
|
xiang2lin
|
f5b69825dc
|
@Value注解配置修改
2024年8月26日10:10:06
|
2024-09-02 15:54:23 +08:00 |
|
hecan
|
2f4cbe3fa8
|
Merge remote-tracking branch 'origin/grpU8' into grpU8
|
2024-08-30 10:13:29 +08:00 |
|
hecan
|
8ed181f7ff
|
调整商学院凭证查询，不查询指标表中的id和金额，改为查询凭证内容中的指标id和金额
|
2024-08-30 10:12:30 +08:00 |
|
lvleigang
|
ab8b907ebe
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-08-29 15:14:17 +08:00 |
|
lvleigang
|
f9ba6ac3dd
|
凭证查询配置
|
2024-08-29 15:13:42 +08:00 |
|
username
|
2651fecbe9
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dev
|
2024-08-29 15:08:18 +08:00 |
|
username
|
a1b601a41d
|
首页异常日志预警，异常日志重新推送功能
|
2024-08-29 15:08:08 +08:00 |
|
lvleigang
|
00ff2d08a4
|
Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-08-29 10:42:11 +08:00 |
|
hecan
|
c501b0418e
|
科目信息DTO
|
2024-08-29 10:32:26 +08:00 |
|
lvleigang
|
7c193eee2f
|
Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
Conflicts:
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/ISenderGlPzmlDao.java
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/dao/impl/SenderGlPzmlDaoImpl.java
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.java
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/ISenderGlPzmlService.java
service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java
|
2024-08-29 10:23:08 +08:00 |
|
lvleigang
|
9d5e0b5d88
|
Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8
|
2024-08-29 10:19:11 +08:00 |
|
lvleigang
|
f6ee41cfe5
|
凭证查询配置
|
2024-08-29 10:19:01 +08:00 |
|
hecan
|
b967a9b661
|
项目指标保存新增指标id和指标代码
|
2024-08-29 09:25:36 +08:00 |
|
hecan
|
9e54b38c9a
|
返回return
|
2024-08-28 18:26:53 +08:00 |
|
hecan
|
4d99f0f66a
|
项目指标增删改
|
2024-08-28 18:23:36 +08:00 |
|
hecan
|
ef85056b11
|
先查询是否存在，存在则更新
|
2024-08-28 14:06:50 +08:00 |
|
hecan
|
3d10ed9f1f
|
功能科目
|
2024-08-28 14:00:41 +08:00 |