Skip to content

A
amos-boot-biz
Commit 03d9ae5c authored by 王果's avatar 王果
Browse files
Options

bug修改：21260

parent ab457eb6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
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 @ 03d9ae5c
...@@ -2135,8 +2135,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2135,8 +2135,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/ */
private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) { private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
// 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程 // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
|| jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName())) || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
|| "1".equals(jgUseRegistration.getRegType())) { || "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