Commit Graph
171 Commits
Author SHA1 Message Date
梁琦涛 dc1a67df74 文件加解密修改 2024-02-28 18:24:02 +08:00
lijiarao f91350951e add oa单点登录 2024-02-26 17:44:53 +08:00
mzaxd efe8cd99b9 feat: 零部件树同步接口 同步完成后自动设置firstNode字段 2024-02-26 15:55:46 +08:00
lijiarao 732f5c934b update 更改统一待办的推送的url 2024-02-26 15:02:21 +08:00
yjz 0d2229329a feat(asms): 定时同步问题修复 2024-02-26 10:56:09 +08:00
lijiarao 32f44760ce IAM 返回值 returnCode 改为 resultCode
作者 Xia Zekun <xiazekun@sinotruk.com>,2024/2/21 16:08
2024-02-22 16:01:52 +08:00
lijiarao deb2454008 update 推送统一待办 2024-02-22 11:50:17 +08:00
梁琦涛 1b512868c8 分类树标准法规回写添加定时任务 2024-02-21 16:08:39 +08:00
mzaxd 86d47c17ef fix: 企标计划xls导出接口解密报错 2024-02-21 15:03:36 +08:00
yjz d46d05449b fix(asms): 标准拆分目录同步问题修复 2024-02-20 14:07:45 +08:00
梁琦涛 b5590fe6b3 设计导航-产品设计条款查询修改 2024-02-05 15:40:49 +08:00
mzaxd 8e67fcb075 feat: 文件加解密放开onlyOffice相关一切接口 2024-02-05 14:41:55 +08:00
yjz 593899f068 fix(asms): 拆分同步问题 2024-02-04 11:53:35 +08:00
yjz c456271451 fix(asms): 78478、78475 2024-02-02 16:22:54 +08:00
梁琦涛 b8f44c05d7 零部件分类树同步接口修改 2024-02-02 15:59:20 +08:00
梁琦涛 1d1d6bb0eb 统一待办集成修改 2024-02-02 15:42:20 +08:00
mzaxd 0c19f54f5f fix: 79828 车型项目库详情-调取的数据,在产车实施日期、新车型实施日期没有正常回显 2024-02-02 15:22:03 +08:00
梁琦涛 2bf17b67b5 统一待办集成 2024-02-02 14:50:16 +08:00
梁琦涛 b24305aeb9 Merge remote-tracking branch 'origin/fourthStage' into fourthStage 2024-02-01 16:20:27 +08:00
梁琦涛 50c01fb122 零部件分类树同步接口修改参数 2024-02-01 16:20:17 +08:00
mzaxd 6064b6ba01 fix: 81309 法规合规评估流程-添加标准,新车型实施日期和在产车实施日期回显数据重复了 2024-02-01 16:05:55 +08:00
梁琦涛 7e9eb84f16 零部件分类树同步接口去掉token验证 2024-02-01 15:47:30 +08:00
梁琦涛 0fc7ac867a 修改srms接口返回参数 2024-01-31 16:26:24 +08:00
yjz d3ebbb02cc Merge branch 'thirdApiStage' into fourthStage 2024-01-31 14:19:02 +08:00
梁琦涛 5331eb5ef6 添加token打印日志 2024-01-31 10:57:52 +08:00
梁琦涛 6795b4d0da 分类树标准法规回写接口 2024-01-30 18:00:38 +08:00
梁琦涛 83654343ca 添加零部件分类树同步接口 2024-01-30 15:21:16 +08:00
yjz 4dbf59538c Merge branch 'thirdApiStage' into fourthStage
# Conflicts:
#	laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java
2024-01-30 11:18:56 +08:00
yjz 7fb995fc3a fix(ASMS): 分标委同步问题修复 2024-01-30 09:03:59 +08:00
梁琦涛 05d00a906a srms接口修改 2024-01-29 19:23:33 +08:00
梁琦涛 23240f3f49 srms接口添加日志记录 2024-01-29 17:39:50 +08:00
yjz 5e9b42a48d fix(任务转交): 81351 2024-01-29 16:03:13 +08:00
梁琦涛 ffe778306d srms接口修改 2024-01-29 09:52:27 +08:00
梁琦涛 fba591ea38 修改对接接口 2024-01-25 17:51:53 +08:00
梁琦涛 ce698cb30d 修改对接接口 2024-01-25 17:40:25 +08:00
梁琦涛 5daef6739d 修改对接接口 2024-01-25 17:24:28 +08:00
梁琦涛 13e90fa9ff 接口 app_key、secret动态获取 2024-01-25 15:59:00 +08:00
梁琦涛 1189670ffd 修改srms接口 2024-01-24 14:33:13 +08:00
梁琦涛 019cd9bf86 添加srms接口 2024-01-22 14:11:59 +08:00
梁琦涛 4387eed5a2 添加srms接口 2024-01-19 18:50:50 +08:00
梁琦涛 bf6d7fe86a 添加srms接口 2024-01-19 17:15:38 +08:00
梁琦涛 160c6266d3 添加srms接口 2024-01-19 17:15:07 +08:00
yjz 0da2cb2484 fix(asms): 同步问题调整 2023-12-29 13:52:51 +08:00
yjz 93ac4c9a06 feat(用户管理、角色管理、iam): 查询过滤admin账号 2023-12-21 17:23:07 +08:00
yjz 85bfe3e7d7 fix(部门): org_code问题修复 2023-12-11 18:35:47 +08:00
梁琦涛 5967d6249f fix:79093 2023-12-07 15:55:23 +08:00
梁琦涛 fc78c3c01f Merge remote-tracking branch 'origin/master' into secondStage
# Conflicts:
#	laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java
#	laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
#	laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java
#	laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml
#	laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
2023-11-30 17:46:16 +08:00
liao 13fdda0706 update 标准预警 2023-11-29 15:31:49 +08:00
liao 6a796e036a update asms同步es数据库 2023-11-29 09:08:39 +08:00
yjz bc1d75993d fix(iam): 创建用户默认角色动态配置
(cherry picked from commit a26b046d36)
2023-11-28 17:33:50 +08:00