 lijiarao
|
293149e85e
|
update 用户导出
|
2024-02-23 10:31:21 +08:00 |
|
|
yjz
|
7b053acc19
|
feat(用户管理): 上传手写章
|
2024-02-05 14:04:09 +08:00 |
|
|
lijiarao
|
e3f15c4a39
|
update LoginUser.java 增加是否管理员字段
|
2024-02-04 09:44:46 +08:00 |
|
|
梁琦涛
|
2f431fa991
|
fix:81603
|
2024-02-01 17:27:14 +08:00 |
|
 mzaxd
|
dd6865783c
|
feat: 企标制修订签章
|
2024-01-31 15:28:26 +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 |
|
|
mzaxd
|
c9e62d7968
|
feat: 企标制修订发消息
|
2024-01-29 09:04:30 +08:00 |
|
|
lijiarao
|
f3c7849ea1
|
fix 79632 【全局】系统中关于人员展示，有的地方用的中文括号，有的地方用的英文括号
|
2024-01-26 15:04:10 +08:00 |
|
|
lijiarao
|
1ffcdfdbf1
|
fix 80818 未符合项-导出 导出内容需更改
fix 80612 未符合项-实际整改完成时间没有回显数据
|
2024-01-26 12:10:29 +08:00 |
|
|
mzaxd
|
b28cf1b1e5
|
feat: 在线编辑保存10份
|
2024-01-24 09:22:43 +08:00 |
|
|
梁琦涛
|
74fb0733db
|
Merge remote-tracking branch 'origin/thirdStage' into thirdApiStage
|
2024-01-22 09:54:53 +08:00 |
|
|
梁琦涛
|
160c6266d3
|
添加srms接口
|
2024-01-19 17:15:07 +08:00 |
|
|
lijiarao
|
05e30d1ab4
|
update 法规合规评估流程
|
2024-01-19 15:34:42 +08:00 |
|
|
yjz
|
cb4ee1588d
|
fix(标准法规入库/变更流程): 翻译问题
|
2024-01-12 17:48:47 +08:00 |
|
|
mzaxd
|
7366808e9d
|
feat: 水印支持页边距控制
|
2024-01-11 15:46:25 +08:00 |
|
|
mzaxd
|
97edb9a09c
|
feat: 预览接口支持token校验用户是否有企标权限
|
2024-01-10 16:44:20 +08:00 |
|
|
mzaxd
|
8af1e69c3e
|
feat: 预览接口支持token校验用户是否有企标权限
|
2024-01-10 16:27:24 +08:00 |
|
|
mzaxd
|
7cb1f88a97
|
feat: 双水印工具类同步
|
2024-01-09 16:29:52 +08:00 |
|
|
mzaxd
|
17fabd9e8b
|
feat: 水印支持双行显示 配置项提取
|
2024-01-09 16:23:41 +08:00 |
|
|
yjz
|
3087e3b9c6
|
fix(资料中心): 80180
|
2024-01-08 17:53:41 +08:00 |
|
|
yjz
|
85e985bfa3
|
fix(企标稽查流程): 79478
|
2024-01-05 14:15:32 +08:00 |
|
|
mzaxd
|
91a0d50853
|
feat: 水印格式宽度调整
|
2024-01-02 17:48:41 +08:00 |
|
|
mzaxd
|
14cb86dba2
|
feat: 水印格式调整
|
2024-01-02 17:43:57 +08:00 |
|
|
mzaxd
|
fe4d15a894
|
feat: 加水印改为动态字号
|
2024-01-02 17:25:22 +08:00 |
|
|
mzaxd
|
253d5aa7b6
|
feat: 将水印的相关设置提出到配置文件
|
2024-01-02 15:00:51 +08:00 |
|
|
mzaxd
|
d4e6b778af
|
feat: 不带水印下载接口
|
2024-01-02 10:07:26 +08:00 |
|
|
mzaxd
|
b77af10c65
|
fix: PDF水印文字
|
2024-01-02 09:39:59 +08:00 |
|
|
mzaxd
|
20075cb3a8
|
feat: 文件预览接口加水印
|
2023-12-30 15:49:36 +08:00 |
|
|
yjz
|
b59c07a7ca
|
fix(企标稽查计划): 79625
|
2023-12-28 15:45:13 +08:00 |
|
|
yjz
|
1291666d42
|
fix(标准宣贯流程): 79571、草稿存储人员信息
|
2023-12-27 13:59:43 +08:00 |
|
|
lijiarao
|
e718461425
|
update 项目合规评估流程 推送数据到未符合项
|
2023-12-23 17:43:14 +08:00 |
|
|
yjz
|
9b1b4191e4
|
refactor(登录): 账号密码校验
|
2023-12-22 10:02:37 +08:00 |
|
|
yjz
|
93ac4c9a06
|
feat(用户管理、角色管理、iam): 查询过滤admin账号
|
2023-12-21 17:23:07 +08:00 |
|
|
yjz
|
04bfcfb721
|
fix(企标稽查计划): 79316
|
2023-12-15 16:16:38 +08:00 |
|
|
lijiarao
|
2a75ef6b9f
|
add 项目合规评估流程 各个节点的查询详情
update 项目合规评估流程 各部门主管级领导下发
|
2023-12-15 11:34:12 +08:00 |
|
|
yjz
|
833d0bfd21
|
fix: 流程完善
|
2023-12-12 21:12:36 +08:00 |
|
|
yjz
|
85bfe3e7d7
|
fix(部门): org_code问题修复
|
2023-12-11 18:35:47 +08:00 |
|
|
yjz
|
7a653ebc48
|
feat(用户): 姓名/工号 查询
|
2023-12-07 16:56:10 +08:00 |
|
|
mzaxd
|
cfdc446750
|
fix: 修复查找用户所在部门特殊情况BUG
|
2023-12-06 20:40:04 +08:00 |
|
|
yjz
|
b84c2282a4
|
ci: 去除无用项
|
2023-12-06 17:39:38 +08:00 |
|
|
lijiarao
|
86dc8cb459
|
Merge branch 'master' into secondStage
|
2023-12-06 15:29:36 +08:00 |
|
|
lijiarao
|
15c2189f07
|
rollback 登录校验
|
2023-12-06 15:28:47 +08:00 |
|
|
mzaxd
|
09c4f87e8d
|
feat: 企标更改流程部分字段翻译
|
2023-12-06 11:41:11 +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 |
|
|
yjz
|
7ac884f988
|
feat(标准宣贯流程): 基础模块
|
2023-11-30 11:36:05 +08:00 |
|
|
梁琦涛
|
86e0040303
|
文件下载加解密
|
2023-11-24 18:19:13 +08:00 |
|
|
yjz
|
8f96bf08fa
|
fix(企标稽查计划): 业务表翻译
|
2023-11-22 09:55:58 +08:00 |
|
|
liao
|
174ab3595b
|
fix 78619 我的消息-发布人查询条件失效
|
2023-11-21 17:50:46 +08:00 |
|
|
yjz
|
9f3830ab94
|
fix(iam): 完善对接
|
2023-11-21 14:54:56 +08:00 |
|
|
liao
|
2bf0e550aa
|
fix 78602 我的消息-标准预警，对应部门下的人没有收到消息
|
2023-11-21 11:29:31 +08:00 |
|