Commit c7a9d260 authored by 刘林's avatar 刘林

fix(jg):移装变更登记添加其他附件

parent 98ab5977
......@@ -160,5 +160,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
@ApiModelProperty(value = " 转办后执行人的Id逗号分割")
private String transferToUserIds;
@ApiModelProperty (value = "其他附件")
private String otherAccessories;
}
......@@ -261,4 +261,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
*/
@TableField("transfer_type")
private String transferType;
/**
* 其他附件
*/
@TableField(value = "other_accessories")
private String otherAccessories;
}
......@@ -325,6 +325,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//设备移装详细地址
oldTransfer.setFullAddress(fullAddress);
oldTransfer.setTransferType((String) tableData.get("transferType"));
if (!ObjectUtils.isEmpty(tableData.get("otherAccessories"))) {
oldTransfer.setOtherAccessories(JSONObject.toJSONString(tableData.get("otherAccessories")));
}
//保存【移装变更登记】基本信息
if (!ValidationUtil.isEmpty(oldTransfer)) {
......@@ -648,6 +651,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
resultDataMap.put("receiveCompanyCode", transfer.getReceiveCompanyCode() + "_" + transfer.getReceiveOrgName());
resultDataMap.put("registrationList", newRegistrationList);
}
if (!ObjectUtils.isEmpty(resultDataMap.get("otherAccessories"))) {
resultDataMap.put("otherAccessories", JSONObject.parse(resultDataMap.get("otherAccessories").toString()));
}
String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
if (StringUtil.isNotEmpty(transferSafetyManager)) {
String[] transferSafetyManagerList = transferSafetyManager.split("_");
......
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