 mzaxd
|
b88ace30fd
|
feat: 体系树支持根据字段nodeOrder排序，如果字段为null则视为0
|
2023-12-22 10:05:06 +08:00 |
|
|
mzaxd
|
18f2c90ad1
|
fix: 企标临时授权记录授权到期日期筛选报错
|
2023-12-14 10:26:13 +08:00 |
|
|
mzaxd
|
4753509c70
|
feat: 企标临时授权记录人员改为模糊搜索
|
2023-12-14 09:40:14 +08:00 |
|
|
mzaxd
|
e7911d05bc
|
feat: 临时授权记录增加接口权限
|
2023-12-12 19:43:48 +08:00 |
|
|
mzaxd
|
9bafedb6e7
|
feat: 临时授权记录-新增授权日期字段 翻译部分字段
|
2023-12-12 18:57:02 +08:00 |
|
|
mzaxd
|
cdf48e19b3
|
feat: 临时授权记录-解除授权
|
2023-12-12 18:44:22 +08:00 |
|
|
mzaxd
|
b38e805ffa
|
feat: 临时授权记录
|
2023-12-12 18:12:57 +08:00 |
|
|
mzaxd
|
5901b45d3a
|
fix: 修复企标编号跳转详情页报错问题
|
2023-12-12 18:02:40 +08:00 |
|
 梁琦涛
|
4f001132d3
|
fix:79159
|
2023-12-12 12:39:52 +08:00 |
|
|
mzaxd
|
2a157a6cb0
|
fix: 78690
企业标准-详情-更新记录，提示没有权限
|
2023-12-07 09:01:00 +08:00 |
|
|
梁琦涛
|
46328dbc39
|
fix:79065
|
2023-12-06 18:26:43 +08:00 |
|
|
lijiarao
|
86dc8cb459
|
Merge branch 'master' into secondStage
|
2023-12-06 15:29:36 +08:00 |
|
|
mzaxd
|
642e78eb1f
|
feat: 老法规国标准入性推荐性体系关联导入
|
2023-12-05 20:10:11 +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 |
|
|
mzaxd
|
3ff10de496
|
feat: 企标更改流程列表接收数据
|
2023-12-04 17:10:52 +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 |
|
|
lijiarao
|
62840118c8
|
update 体系树新增编辑改为同一子集下不能重名
|
2023-12-01 14:40:24 +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 |
|
|
梁琦涛
|
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 |
|
|
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 |
|
|
lijiarao
|
e558e91ecc
|
add 获取高级查询条件
|
2023-11-29 20:18:45 +08:00 |
|
|
mzaxd
|
c0a6cb8e3a
|
feat: 老法规导入解除发布日期实施日期必填限制
|
2023-11-29 13:39:10 +08:00 |
|
|
mzaxd
|
999ef3d5c4
|
feat: 老法规导入禁止发布日期为空的数据导入
|
2023-11-29 11:36:15 +08:00 |
|
|
mzaxd
|
86576fbbbc
|
ci: 注释掉老法规导入文件对应关系问题
|
2023-11-28 19:04:46 +08:00 |
|
|
mzaxd
|
df47bb51ad
|
feat: 注释掉ES同步逻辑 老法规改为覆盖导入
|
2023-11-28 18:21:15 +08:00 |
|
|
mzaxd
|
dfbd8d6aa5
|
fix: 老法规导入BUG修正
企标使用新版正则表达式
修复重复文件数据的BUG
|
2023-11-28 11:57:20 +08:00 |
|
|
mzaxd
|
4f00fe02a7
|
ci: 立项变更字段与页面同步
|
2023-11-28 11:37:16 +08:00 |
|
|
liao
|
750874995c
|
add 国标、外标、企标、动态消息，新增、编辑、删除时更新es数据库
|
2023-11-27 11:18:08 +08:00 |
|
|
mzaxd
|
56aaa477d7
|
ci: 删除无用实体类
|
2023-11-27 10:13:36 +08:00 |
|
|
liao
|
6246f3697a
|
fix 78578 【水平越权】动态消息--部分接口没处理水平越权
|
2023-11-27 10:04:43 +08:00 |
|
|
mzaxd
|
af72562af1
|
ci: 删除无用实体类
|
2023-11-24 15:57:11 +08:00 |
|
|
mzaxd
|
32385e5e8d
|
feat: 企标新增的时候保存顺序号
|
2023-11-21 15:32:32 +08:00 |
|
|
mzaxd
|
5976ec50ae
|
ci: 所有接口swagger注释
|
2023-11-20 16:36:02 +08:00 |
|
|
liao
|
967756b285
|
add 动态消息Swagger注释
|
2023-11-20 16:13:37 +08:00 |
|
|
liao
|
64627605dd
|
update 国内、海外Swagger注释
|
2023-11-20 16:09:35 +08:00 |
|
|
liao
|
5e65eaf179
|
add 国内、海外Swagger注释
|
2023-11-20 16:04:59 +08:00 |
|
|
liao
|
4655da0fa8
|
add 注解
|
2023-11-20 15:44:32 +08:00 |
|