FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,102 Commits 1 Branch 0 Tags
6c25d8958a5864d1699b30389a96fd78ec0c0185
Commit Graph
195 Commits
Author SHA1 Message Date
高嵩 52cb08f6a6 制定和修订类型 清除历史版本 2023-04-06 04:56:44 +08:00
高嵩 76fe9d8d61 合并分支 'dev_20230216' 到 'master' 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!40
 2023-04-06 04:48:04 +08:00
高嵩 680c77dd5b 制定和修订类型 清除历史版本 2023-04-06 04:11:11 +08:00
gaojiabao a7dafb3cf8 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-06 03:44:49 +08:00
gaojiabao d5d1884d38 问答中心 msg 没有值 2023-04-06 03:44:12 +08:00
SUNJIABIN 022e0c0755 优化提示音 2023-04-06 00:02:32 +08:00
gaojiabao c9708f03f5 在线编辑文件的路径 2023-04-04 23:33:19 +08:00
gaojiabao c038fae038 企业编号 最大值 加1 以及新增时，企标名称可以重复（编号和名称重复也是新增一条，不做覆盖） 2023-04-04 11:44:31 +08:00
高嵩 9eb62c3c65 Merge branch 'master' into 'dev_20230216' 
# Conflicts:
#   adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
 2023-04-04 09:35:34 +08:00
gaojiabao c52c720884 问答中心回答 2023-04-03 13:36:50 +08:00
gaojiabao 6d6edd5d43 问答中心回答 2023-04-03 11:19:04 +08:00
gaojiabao 733c7c14f5 问答中心回答 2023-03-31 15:40:28 +08:00
gaojiabao f47c1273da 首页 接收任务 按钮 点击则隐藏 2023-03-30 19:43:13 +08:00
高嵩 2ca755d253 合并分支 'dev_20230216' 到 'master' 
优化企标导入

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!28
 2023-03-28 18:23:07 +08:00
SUNJIABIN fdbd2a3336 优化企标导入 2023-03-28 18:18:41 +08:00
高嵩 98cc554faa Merge remote-tracking branch 'origin/dev_20230216' 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
 2023-03-26 16:53:41 +08:00
gaojiabao b4410694f1 OA强制删除 2023-03-23 13:54:18 +08:00
gaojiabao 23659c18a7 企标制修订计划管控 （接收任务） 2023-03-22 13:49:55 +08:00
SUNJIABIN 9f8adf60cd 企业入库对标准号和名称校验 2023-03-08 16:00:09 +08:00
gaojiabao 4d31e44da2 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-02-28 14:59:04 +08:00
gaojiabao 3adaeddbf1 归档 2023-02-28 10:44:12 +08:00
SUNJIABIN 98d454739e 对过内外入库流程和企业入库流程增加校验 2023-02-24 13:50:41 +08:00
gaojiabao 1d00e1c8c3 测试 提交 2023-02-22 16:09:40 +08:00
陈栋 05f28f97ae 合并分支 'dev_foton_DBQ' 到 'FOTON' 
Dev foton dbq

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!9
 2022-12-27 16:41:23 +08:00
dingbingqing 5f220ee1c2 修改/decodeDetail接口参数 2022-12-23 15:37:40 +08:00
dingbingqing 54c3f04e65 新增/decodeDetail接口 
标准解读流程汇总
 2022-12-23 09:13:24 +08:00
dingbingqing 163b59a05c 修改/queryTaskIndex接口中的查询功能2 2022-12-15 14:55:43 +08:00
dingbingqing bcb2fb738f 修改/queryTaskIndex接口中的查询功能 2022-12-15 09:55:07 +08:00
cuijiaming 1c2df15b00 新增汇总指定任务接口/queryTaskIndex 2022-12-14 13:34:44 +08:00
dingbingqing f95be0577b 新增接口lawss/activiti/get_list_by_instance 
流程实例汇总列表，已办流程中的汇总功能
 2022-12-13 09:28:48 +08:00
李雅玮 23d50e06d1 Merge branch 'FOTON' into 'develop_master' 
# Conflicts:
#   adc-da-main/src/main/resources/application.properties
 2022-12-07 16:38:07 +08:00
gaojiabao e715c57b7e 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 15:15:08 +08:00
gaojiabao c0839a370b 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 12:00:28 +08:00
CD e7faa9ad2a Merge branch 'develop_master' into FOTON 2022-12-01 20:39:03 +08:00
CD e06e37f203 Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-11-25 17:51:07 +08:00
CD 94fef5e08f bug273、bug274 2022-11-25 17:50:42 +08:00
liyawei 1372f306ea 生产环境配置文件恢复 2022-11-24 17:42:22 +08:00
liyawei 50ded28c72 开发环境配置文件更新 2022-11-24 14:48:32 +08:00
liyawei f805415536 174-接受任务回显 2022-11-22 15:07:48 +08:00
liyawei 4cd34c749b 174-OA待办修改 2022-11-21 17:39:02 +08:00
CD 82e9333ef6 222、223 bug 2022-11-08 14:30:48 +08:00
CD 53b2adbf50 log修改 2022-11-02 13:34:21 +08:00
liyawei 1037f112ee Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-25 12:43:59 +08:00
liyawei c2c50b4352 操作日志-部门显示修改 2022-10-25 12:43:20 +08:00
zyd 5a01009cf8 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-24 22:31:08 +08:00
liyawei 9e60b22671 修改企标复审入库流程：非修订时才修改文本状态 2022-10-24 20:19:09 +08:00
liyawei b20d14a562 修改企标复审入库流程：修订时才生成企标计划 2022-10-24 17:48:05 +08:00
zyd 991c299c10 fix: 修复BUG 2022-10-24 16:10:01 +08:00
CD 73945de1cf 适用车型为空会出现bug 2022-10-20 21:27:01 +08:00
CD fe37063ba4 日志 2022-10-20 14:13:27 +08:00