Commit 76db761f authored by 韩桐桐's avatar 韩桐桐

fix(jg):各个流程添加“其他附件”字段

parent ddcd4cb8
......@@ -150,6 +150,9 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
private String transferToUserIds;
@ApiModelProperty(value = "其他附件")
private List<Map<String, Object>> otherAccessoriesList;
@ApiModelProperty(value = "其他附件")
private String otherAccessories;
@ApiModelProperty(value = "公司类型")
......
......@@ -95,7 +95,9 @@
jfi.PRODUCE_COUNTRY as produceCountry,
jfi.produce_unit_credit_code as produceUnitCreditCode,
jci.USC_UNIT_NAME as uscUnitName,
jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode
jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode,
jri.OTHER_ACCESSORIES_REG as otherAccessoriesReg,
jfi.OTHER_ACCESSORIES_FACT as otherAccessoriesFact
from idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
......@@ -171,7 +173,8 @@
APPRAISAL_UNIT as appraisalUnit,
APPRAISAL_DATE as appraisalDate,
DESIGN_DOC as designDoc,
DESIGN_STANDARD as designStandard
DESIGN_STANDARD as designStandard,
OTHER_ACCESSORIES_DES as otherAccessoriesDes
from idx_biz_jg_design_info
where RECORD = #{id}
</select>
......
......@@ -168,9 +168,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
changeInfo.put("newUseUnitCreditCode", notice.getNewUseUnitCreditCode() + "_" + notice.getNewUseUnitName());
}
changeInfo.put("changeCertificateList", notice.getChangeCertificate());
changeInfo.put("otherAccessoriesList", notice.getOtherAccessories());
String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
"productQualityYieldProve", "insUseMaintainExplain", "inspectReport", "otherAccessories",
"productQualityYieldProve", "insUseMaintainExplain", "inspectReport", "otherAccessoriesList",
"proxyStatementAttachment", "installContractAttachment", "changeCertificateList"};
// 设备信息
......@@ -622,8 +623,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (!ValidationUtil.isEmpty(model.getChangeCertificateList())) {
model.setChangeCertificate(JSON.toJSONString(model.getChangeCertificateList()));
}
// 处理其他附件
if (!ValidationUtil.isEmpty(model.getOtherAccessoriesList())) {
model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessoriesList()));
}
// 分割单位
String useUnitId = model.getUseUnitCreditCode();
if (!ObjectUtils.isEmpty(useUnitId)) {
......
......@@ -772,6 +772,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
jsonObject.put("carNumber",idxBizJgRegisterInfo.getCarNumber());
// 转化 其他附件 字段
if (!ObjectUtils.isEmpty(jsonObject.get("otherAccessoriesDes"))){
jsonObject.put("otherAccessoriesDes", JSON.parse(String.valueOf(jsonObject.get("otherAccessoriesDes"))));
}
if (!ObjectUtils.isEmpty(jsonObject.get("otherAccessoriesFact"))){
jsonObject.put("otherAccessoriesFact", JSON.parse(String.valueOf(jsonObject.get("otherAccessoriesFact"))));
}
if (!ObjectUtils.isEmpty(jsonObject.get("otherAccessoriesReg"))){
jsonObject.put("otherAccessoriesReg", JSON.parse(String.valueOf(jsonObject.get("otherAccessoriesReg"))));
}
return jsonObject;
}
// 基本信息 + 制造信息
......@@ -800,6 +810,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
detail.put("longitudeLatitude", JSON.parse(String.valueOf(detail.get("longitudeLatitude"))));
detail.put("otherAccessoriesDes", JSON.parse(String.valueOf(detail.get("otherAccessoriesDes"))));
detail.put("otherAccessoriesFact", JSON.parse(String.valueOf(detail.get("otherAccessoriesFact"))));
detail.put("otherAccessoriesReg", JSON.parse(String.valueOf(detail.get("otherAccessoriesReg"))));
detail.put("province", "610000");
return detail;
}
......
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