Commits · 22b32e40caae46f6740a391b98a84c55d46020dc · 项目统一框架 / amos-boot-biz

15 Dec, 2023 40 commits
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 22b32e40
  王果 authored Dec 15, 2023
  
  22b32e40
- 检验检测结果增加列表增加设备信息 · 15c1f96a
  王果 authored Dec 15, 2023
  
  15c1f96a
- 修改列表sql · 6e885790
  chenzhao authored Dec 15, 2023
  
  6e885790
- feat(检验报告)：1.接收接口; 2.驳回接口; 3.撤回接口; · 8ad742db
  yangyang authored Dec 15, 2023
  
  8ad742db
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · dfb10d8c
  yangyang authored Dec 15, 2023
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
```
  dfb10d8c
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 57fdd284
  liufan authored Dec 15, 2023
  
  57fdd284
- 优化：编辑设备时，会新增一条数据的问题 · f44ca374
  liufan authored Dec 15, 2023
  
  f44ca374
- Merge branch 'develop_tzs_register' of… · 8d0e6b26
  chenzhao authored Dec 15, 2023
```
Merge branch 'develop_tzs_register' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register
```
  8d0e6b26
- 修改报检新增 · a799f472
  chenzhao authored Dec 15, 2023
  
  a799f472
- 检验业务批量删除接口增加校验、不可删除已提交流程 · 88c99bbe
  caotao authored Dec 15, 2023
  
  88c99bbe
- feat(检验报告)：1.接收接口; 2.驳回接口; 3.撤回接口; · c9f2a116
  yangyang authored Dec 15, 2023
  
  c9f2a116
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 1c513e0d
  yangyang authored Dec 15, 2023
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
```
  1c513e0d
- Merge branch 'develop_tzs_register' of… · a4225611
  xixinzhao authored Dec 15, 2023
```
Merge branch 'develop_tzs_register' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register
```
  a4225611
- feat(检验报告)：1.接收接口; 2.驳回接口; 3.撤回接口; · 8aed6bf4
  yangyang authored Dec 15, 2023
  
  8aed6bf4
- feat(jyjc): 检验结果相关接口 · 727cb857
  xixinzhao authored Dec 15, 2023
  
  727cb857
- 优化：设备详情查询接口返回的属性名应为纯大写下划线分隔的格式以及附件对象应为json数组对象格式的问题 · 77aaeed3
  liufan authored Dec 15, 2023
  
  77aaeed3
- 增加批量删除约束条件 · 139a4db5
  chenzhao authored Dec 15, 2023
  
  139a4db5
- Merge branch 'develop_tzs_register' of… · d57bf1e2
  chenzhao authored Dec 15, 2023
```
Merge branch 'develop_tzs_register' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register
```
  d57bf1e2
- 增加报检列表批量删除 · bf844ece
  chenzhao authored Dec 15, 2023
  
  bf844ece
- 查询检验检测机构列表 · bffeebfa
  王果 authored Dec 15, 2023
  
  bffeebfa
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · b48b1928
  yangyang authored Dec 15, 2023
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml
#	amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
#	amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
#	amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java
```
  b48b1928
- feat(检验报告)：1.接收接口; 2.驳回接口; 3.撤回接口; · 04d0f544
  yangyang authored Dec 15, 2023
  
  04d0f544
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · fa324116
  LiuLin authored Dec 15, 2023
  
  fa324116
- fix(common):调整代码生成类，修改BaseEntity为tyboot · ad07a2b4
  LiuLin authored Dec 15, 2023
  
  ad07a2b4
- 检验业务批量删除接口 · 61bd5cfc
  caotao authored Dec 15, 2023
  
  61bd5cfc
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 2e47c117
  LiuLin authored Dec 15, 2023
  
  2e47c117
- fix(ymt):登记使用证生成 · fc56df65
  LiuLin authored Dec 15, 2023
  
  fc56df65
- 列表接口查询调整、流程枚举新增撤回状态 · 997a4b9d
  caotao authored Dec 15, 2023
  
  997a4b9d
- Merge branch 'develop_tzs_register' of… · c9c2b19c
  chenzhao authored Dec 15, 2023
```
Merge branch 'develop_tzs_register' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register
```
  c9c2b19c
- 增加流程节点 · 1a16af6c
  chenzhao authored Dec 15, 2023
  
  1a16af6c
- 检验检测结果增加列表和结果更新上传 · 81f3b88c
  王果 authored Dec 15, 2023
  
  81f3b88c
- feat(jyjc)：检验检测结果增加技术参数 · d6e15b9d
  xixinzhao authored Dec 15, 2023
  
  d6e15b9d
- 报检新增列表接口 · c97e070a
  chenzhao authored Dec 15, 2023
  
  c97e070a
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · cc2f44a5
  chenzhao authored Dec 15, 2023
  
  cc2f44a5
- 1.撤回接口调整。 · 7e1df1e3
  caotao authored Dec 15, 2023
```
2.新增根据公司人员获取接口。
3.调整根据申请时间过滤不生效问题。
```
  7e1df1e3
- fix(jg)：告知图片保存 · 766b7009
  xixinzhao authored Dec 15, 2023
  
  766b7009
- 1.版本升级 · 4d33fa54
  suhuiguang authored Dec 15, 2023
  
  4d33fa54
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 6ff62da9
  yangyang authored Dec 15, 2023
  
  6ff62da9
- fix(检验检测开通)：1.保存并提交的接口自动执行第一步流程；2.业务开通表新增工作流active_key字段 · 95fa46fa
  yangyang authored Dec 15, 2023
  
  95fa46fa
- feat(jyjc)：检验检测结果详情 · ae8ab99c
  xixinzhao authored Dec 15, 2023
  
  ae8ab99c