Commit c7cf9683 authored by 刘林's avatar 刘林

fix:(jg) 工作台设备移装摘要信息中,对设备类型未转义

parent 330e121b
...@@ -161,12 +161,6 @@ public class JgEquipTransfer extends BaseEntity { ...@@ -161,12 +161,6 @@ public class JgEquipTransfer extends BaseEntity {
private String supervisoryCode; private String supervisoryCode;
/** /**
* 设备种类
*/
@TableField(exist = false)
private String equList;
/**
* 设备类别 * 设备类别
*/ */
@TableField(exist = false) @TableField(exist = false)
...@@ -222,4 +216,16 @@ public class JgEquipTransfer extends BaseEntity { ...@@ -222,4 +216,16 @@ public class JgEquipTransfer extends BaseEntity {
@TableField(value = "transfer_to_user_ids") @TableField(value = "transfer_to_user_ids")
private String transferToUserIds; private String transferToUserIds;
/**
* 设备种类
*/
@TableField(value = "equ_list")
private String equList;
/**
* 设备种类Code
*/
@TableField(value = "equ_list_code")
private String equListCode;
} }
...@@ -140,6 +140,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, ...@@ -140,6 +140,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i); JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE"))); transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
transfer.setEquList(Objects.toString(obj.get("EQU_LIST"), "")); transfer.setEquList(Objects.toString(obj.get("EQU_LIST"), ""));
transfer.setEquListCode(Objects.toString(obj.get("EQU_LIST_CODE"), ""));
transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"), "")); transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"), ""));
transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"), "")); transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"), ""));
transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"), "")); transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"), ""));
......
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