Skip to content

A
amos-boot-biz
Commit d01395b8 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register_to_0715' of…

Merge branch 'develop_tzs_register_to_0715' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register_to_0715
parents a2b9fe46 d698edbe
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ d01395b8
...@@ -2137,7 +2137,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2137,7 +2137,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程 // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())
|| jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName())) || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))
|| jgUseRegistration.getRegType().equals("1")) { || "1".equals(jgUseRegistration.getRegType())) {
// 基本信息 + 制造信息 // 基本信息 + 制造信息
Map<String, Object> detail = this.baseMapper.getDetail(record); Map<String, Object> detail = this.baseMapper.getDetail(record);
// 设计信息 // 设计信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment