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 |
|
yjz
|
aaaa8e571d
|
feat(流程): 完善
|
2023-12-01 09:31:52 +08:00 |
|
yjz
|
e0e04f46b2
|
feat(流程): 完善
|
2023-11-30 20:09:56 +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 |
|
liao
|
8deefed5ab
|
update 法规变更流程结束发消息
|
2023-11-30 15:25:53 +08:00 |
|
mzaxd
|
6de448aedb
|
feat: 老法规企标授权部门对应关系导入
|
2023-11-30 15:00:43 +08:00 |
|
mzaxd
|
6f841b59b5
|
feat: 新老部门对应关系导入
|
2023-11-30 14:39:25 +08:00 |
|
lijiarao
|
45637aca81
|
update importModelFile
|
2023-11-30 13:37:35 +08:00 |
|
yjz
|
7ac884f988
|
feat(标准宣贯流程): 基础模块
|
2023-11-30 11:36:05 +08:00 |
|
梁琦涛
|
f6958adc1e
|
添加高级检索接口
|
2023-11-30 11:11:36 +08:00 |
|
梁琦涛
|
d1d33b2bba
|
添加高级检索接口
|
2023-11-30 11:10:27 +08:00 |
|
mzaxd
|
222a03d6ed
|
feat: 企标个人权限导入
|
2023-11-30 10:21:05 +08:00 |
|
mzaxd
|
05ce07cc37
|
feat: 企标0级权限导入
|
2023-11-30 09:40:34 +08:00 |
|
yjz
|
41a9e1ea61
|
feat(权限申请流程): 基础模块
|
2023-11-30 09:22:28 +08:00 |
|
mzaxd
|
c7d4419378
|
fix: 后端丢失class
|
2023-11-30 09:04:48 +08:00 |
|
mzaxd
|
e6d3b0155c
|
fix: 后端丢失class
|
2023-11-30 09:03:32 +08:00 |
|
mzaxd
|
823e167cd0
|
fix: 企标列表权限和批量删除权限不对应问题
|
2023-11-30 08:58:36 +08:00 |
|
liao
|
4cbf399b15
|
update 法规采购流程
|
2023-11-29 20:34:37 +08:00 |
|
lijiarao
|
e558e91ecc
|
add 获取高级查询条件
|
2023-11-29 20:18:45 +08:00 |
|
yjz
|
4e9899f583
|
fix(企标稽查整改): 接口路径
|
2023-11-29 17:12:31 +08:00 |
|
yjz
|
6b3b9f76cb
|
feat(企标稽查整改): 基础模块
|
2023-11-29 17:02:42 +08:00 |
|
lijiarao
|
52aa418c10
|
update 车型项目库 调取标准bug
|
2023-11-29 16:21:45 +08:00 |
|
lijiarao
|
1da4e14d2a
|
update 项目库 处理标准id和来源
|
2023-11-29 16:21:15 +08:00 |
|
liao
|
70f10d122a
|
update 法规采购流程
|
2023-11-29 16:01:47 +08:00 |
|
liao
|
13fdda0706
|
update 标准预警
|
2023-11-29 15:31:49 +08:00 |
|
mzaxd
|
93a2b92a1e
|
fix: 修复企标列表缺少发布日期时的空指针
|
2023-11-29 13:54:17 +08:00 |
|
mzaxd
|
c0a6cb8e3a
|
feat: 老法规导入解除发布日期实施日期必填限制
|
2023-11-29 13:39:10 +08:00 |
|
lijiarao
|
e7b94a6f5c
|
update 项目库-未符合项 增加标准id和来源
|
2023-11-29 11:40:31 +08:00 |
|
mzaxd
|
999ef3d5c4
|
feat: 老法规导入禁止发布日期为空的数据导入
|
2023-11-29 11:36:15 +08:00 |
|
liao
|
4d47ae0034
|
update 法规征求意见流程
|
2023-11-29 11:21:46 +08:00 |
|
liao
|
32b924e9f4
|
update 法规征求意见流程
|
2023-11-29 10:46:53 +08:00 |
|
liao
|
6977fb6380
|
update 法规征求意见流程
|
2023-11-29 10:43:04 +08:00 |
|
mzaxd
|
21f2331f62
|
feat: 复审流程增加判断是否显示第一个节点的新接口
|
2023-11-29 10:34:44 +08:00 |
|
mzaxd
|
6a0aac55a3
|
feat: 老法规导入序列号支持英文字母
|
2023-11-28 20:42:47 +08:00 |
|
liao
|
f08c479a85
|
update 标准征求意见流程
|
2023-11-28 20:25:34 +08:00 |
|
lijiarao
|
922774d705
|
update 项目库-未符合项
|
2023-11-28 19:49:15 +08:00 |
|
mzaxd
|
04a48888f3
|
feat: 废止 变更 启用流程驳回问题
|
2023-11-28 19:06:25 +08:00 |
|
mzaxd
|
86576fbbbc
|
ci: 注释掉老法规导入文件对应关系问题
|
2023-11-28 19:04:46 +08:00 |
|
mzaxd
|
ecfbb646b3
|
feat: 封存驳回问题
|
2023-11-28 18:40:32 +08:00 |
|
mzaxd
|
df47bb51ad
|
feat: 注释掉ES同步逻辑 老法规改为覆盖导入
|
2023-11-28 18:21:15 +08:00 |
|
lijiarao
|
19cc74ae4c
|
update 项目库-未符合项
|
2023-11-28 18:06:28 +08:00 |
|
liao
|
0cbfaa8d2b
|
update 标准征求意见流程
|
2023-11-28 18:03:10 +08:00 |
|
lijiarao
|
85c048f08a
|
update 流程中心
|
2023-11-28 17:48:03 +08:00 |
|
lijiarao
|
cbc2b80fba
|
update 修改全局监听器
|
2023-11-28 17:37:28 +08:00 |
|
liao
|
651f7e89fb
|
update 标准征求意见流程-字典翻译
|
2023-11-28 16:36:56 +08:00 |
|
mzaxd
|
4834a3890e
|
fix: 人员审批记录不翻译BUG
|
2023-11-28 16:22:41 +08:00 |
|