Commit 803ae4f5 authored by 刘林's avatar 刘林

fix(JG):改造告知Bug修改

parent 51d88801
...@@ -1007,7 +1007,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1007,7 +1007,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* *
* @param sequenceNbr * @param sequenceNbr
*/ */
public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) { public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response, String printType) {
Map<String, Object> exportParamsMap = new HashMap<>(); Map<String, Object> exportParamsMap = new HashMap<>();
//查询移装变更详情 //查询移装变更详情
JgChangeRegistrationTransfer transfer = this.getById(sequenceNbr); JgChangeRegistrationTransfer transfer = this.getById(sequenceNbr);
...@@ -1138,8 +1138,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1138,8 +1138,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
} }
exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum()); exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
} }
if ("0".equals(printType)) {
//调用生成使用登记证 //调用生成使用登记证
iCommonService.generateCertificateReport(exportParamsMap, response); commonService.generateCertificateReport(exportParamsMap, response);
}else{
commonService.generatePdfPrint(exportParamsMap, response);
}
} }
......
...@@ -137,6 +137,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -137,6 +137,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId); equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
equipMap.put("useUnitCreditCodeUse", equipMap.getOrDefault("useUnitCreditCode", "")); equipMap.put("useUnitCreditCodeUse", equipMap.getOrDefault("useUnitCreditCode", ""));
equipMap.put("useUnitNameUse", equipMap.getOrDefault("useUnitName", "")); equipMap.put("useUnitNameUse", equipMap.getOrDefault("useUnitName", ""));
equipMap.put("equRegisterCode", equipMap.getOrDefault("equCode", ""));
for (String s : fields) { for (String s : fields) {
if (installationInfo.containsKey(s)) { if (installationInfo.containsKey(s)) {
installationInfo.put(s, JSON.parseArray(installationInfo.get(s).toString())); installationInfo.put(s, JSON.parseArray(installationInfo.get(s).toString()));
......
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