 梁琦涛
|
ed12ca7cfb
|
fix:79078
|
2023-12-07 18:42:11 +08:00 |
|
|
梁琦涛
|
9bb0033e45
|
fix:79132
|
2023-12-07 16:16:32 +08:00 |
|
|
梁琦涛
|
7dba44f8fb
|
Merge remote-tracking branch 'origin/secondStage' into secondStage
|
2023-12-07 15:55:34 +08:00 |
|
|
梁琦涛
|
5967d6249f
|
fix:79093
|
2023-12-07 15:55:23 +08:00 |
|
 mzaxd
|
dfaca91b88
|
fix: 修复企标更改流程最后一个节点报错
|
2023-12-07 14:38:27 +08:00 |
|
|
mzaxd
|
48569cd955
|
fix: 修复企标列表缺少发布日期时的空指针
|
2023-12-07 11:35:58 +08:00 |
|
|
mzaxd
|
b4e604d22b
|
feat: 老法规覆盖导入只覆盖导入的字段
|
2023-12-07 11:00:10 +08:00 |
|
|
mzaxd
|
520b28eeab
|
feat: UAT变更 标准状态为起草、征求意见、报批等状态时发布日期、实施日期不应是必填项（国标外表导入）
|
2023-12-07 10:46:15 +08:00 |
|
|
mzaxd
|
2a157a6cb0
|
fix: 78690
企业标准-详情-更新记录，提示没有权限
|
2023-12-07 09:01:00 +08:00 |
|
|
梁琦涛
|
741ee2de97
|
fix:79049
|
2023-12-06 19:39:51 +08:00 |
|
|
梁琦涛
|
46328dbc39
|
fix:79065
|
2023-12-06 18:26:43 +08:00 |
|
|
梁琦涛
|
01d8930583
|
fix:79077
|
2023-12-06 16:26:59 +08:00 |
|
|
梁琦涛
|
1f56315094
|
fix:79096
|
2023-12-06 15:59:44 +08:00 |
|
|
lijiarao
|
86dc8cb459
|
Merge branch 'master' into secondStage
|
2023-12-06 15:29:36 +08:00 |
|
|
mzaxd
|
13285719f6
|
feat: 老法规企标个人权限导入采用工号匹配避免特殊名称
|
2023-12-06 09:23:24 +08:00 |
|
|
mzaxd
|
642e78eb1f
|
feat: 老法规国标准入性推荐性体系关联导入
|
2023-12-05 20:10:11 +08:00 |
|
|
yjz
|
3b601869b1
|
fix(征求意见): 完善
|
2023-12-05 17:37:00 +08:00 |
|
|
yjz
|
5d82906ae8
|
fix(征求意见): 权限
|
2023-12-05 16:16:23 +08:00 |
|
|
yjz
|
e916899779
|
fix(征求意见): 详情完善
|
2023-12-05 15:00:39 +08:00 |
|
|
yjz
|
73b8de934a
|
fix(征求意见): 详情完善
|
2023-12-05 14:46:02 +08:00 |
|
|
mzaxd
|
3e6b549e06
|
feat: 老法规外标体系关联导入
|
2023-12-05 14:35:45 +08:00 |
|
|
mzaxd
|
a92e9d1869
|
feat: 老法规企标体系关联导入
|
2023-12-05 14:35:45 +08:00 |
|
|
mzaxd
|
706757f14b
|
style: 老法规数据导入代码整理
|
2023-12-05 14:35:45 +08:00 |
|
|
mzaxd
|
2962cf7ca7
|
feat: 老法规企标导入兼容特殊数据
|
2023-12-04 20:46:13 +08:00 |
|
|
mzaxd
|
057775d634
|
feat: 企标授权部门导入
|
2023-12-04 20:36:36 +08:00 |
|
|
梁琦涛
|
e7695e480d
|
标题检索变更
|
2023-12-04 20:02:14 +08:00 |
|
|
梁琦涛
|
f9bcb2b6d5
|
标题检索变更
|
2023-12-04 19:47:17 +08:00 |
|
|
梁琦涛
|
0bff140b40
|
标题检索变更
|
2023-12-04 19:15:11 +08:00 |
|
|
梁琦涛
|
736f3f37b6
|
标题检索变更
|
2023-12-04 19:00:16 +08:00 |
|
|
梁琦涛
|
f859a51cf4
|
标题检索变更
|
2023-12-04 18:25:19 +08:00 |
|
|
mzaxd
|
3ff10de496
|
feat: 企标更改流程列表接收数据
|
2023-12-04 17:10:52 +08:00 |
|
|
yjz
|
4f1297519c
|
fix(自定义对比): 78582
|
2023-12-04 15:53:50 +08:00 |
|
|
yjz
|
bfb39ee2fc
|
fix(自定义对比): 78408
|
2023-12-04 15:22:48 +08:00 |
|
|
梁琦涛
|
792f9d12d2
|
标题检索变更
|
2023-12-04 15:20:06 +08:00 |
|
|
mzaxd
|
1d2b568cdc
|
feat: 企标部门权限导入
|
2023-12-04 15:02:28 +08:00 |
|
|
mzaxd
|
d14e911b0c
|
feat: 老部门新部门对应关系导入
|
2023-12-04 15:02:28 +08:00 |
|
|
mzaxd
|
6b8415e1c4
|
feat: 老法规文件导入逻辑
|
2023-12-04 15:02:28 +08:00 |
|
|
mzaxd
|
7358a7fcdc
|
feat: 老法规国标导入逻辑
|
2023-12-04 15:02:28 +08:00 |
|
|
mzaxd
|
9cc05f3d5b
|
feat: 老法规外标导入逻辑
|
2023-12-04 15:02:28 +08:00 |
|
|
yjz
|
1b074eb4a7
|
feat(征求意见): 完善
|
2023-12-04 14:46:49 +08:00 |
|
|
yjz
|
088de14b95
|
feat(征求意见): 导出
|
2023-12-04 14:30:32 +08:00 |
|
|
yjz
|
9d9159ad09
|
feat(征求意见): 基础功能
|
2023-12-04 11:29:53 +08:00 |
|
|
yjz
|
c604880a74
|
fix(流程): 完善
|
2023-12-04 09:04:29 +08:00 |
|
|
lijiarao
|
62840118c8
|
update 体系树新增编辑改为同一子集下不能重名
|
2023-12-01 14:40:24 +08:00 |
|
|
yjz
|
01ef005ef9
|
feat(会后管理流程): 基础模块
|
2023-11-30 18:31:18 +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 |
|
|
mzaxd
|
6de448aedb
|
feat: 老法规企标授权部门对应关系导入
|
2023-11-30 15:00:43 +08:00 |
|
|
mzaxd
|
6f841b59b5
|
feat: 新老部门对应关系导入
|
2023-11-30 14:39:25 +08:00 |
|
|
yjz
|
7ac884f988
|
feat(标准宣贯流程): 基础模块
|
2023-11-30 11:36:05 +08:00 |
|
|
梁琦涛
|
f6958adc1e
|
添加高级检索接口
|
2023-11-30 11:11:36 +08:00 |
|