Commit 0f0f47d1 authored by zhangsen's avatar zhangsen

安装告知 负责人名称显隐问题

parent 4471fa54
...@@ -26,7 +26,7 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot ...@@ -26,7 +26,7 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return 安装告知 * @return 安装告知
*/ */
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr); Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel);
/** /**
* 更新安装告知 * 更新安装告知
......
...@@ -120,7 +120,8 @@ public class JgInstallationNoticeController extends BaseController { ...@@ -120,7 +120,8 @@ public class JgInstallationNoticeController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个安装告知", notes = "根据sequenceNbr查询单个安装告知") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个安装告知", notes = "根据sequenceNbr查询单个安装告知")
public ResponseModel<Map<String, public ResponseModel<Map<String,
Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) { Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryBySequenceNbr(sequenceNbr)); String companyLevel = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryBySequenceNbr(sequenceNbr, companyLevel));
} }
......
...@@ -171,7 +171,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -171,7 +171,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
* @return 安装告知 * @return 安装告知
*/ */
@Override @Override
public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) { public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel) {
// 安装告知信息 // 安装告知信息
JgInstallationNotice notice = jgInstallationNoticeMapper.selectById(sequenceNbr); JgInstallationNotice notice = jgInstallationNoticeMapper.selectById(sequenceNbr);
if (Objects.isNull(notice)) { if (Objects.isNull(notice)) {
...@@ -220,9 +220,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -220,9 +220,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
equInfo.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport")))); equInfo.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
equInfo.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard")))); equInfo.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc")))); equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
BeanUtil.copyProperties(equInfo, detail); BeanUtil.copyProperties(equInfo, detail);
BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode"); BeanUtil.copyProperties(installationInfo, detail, "equList", "supervisoryCode", "factoryNum", "equRegisterCode");
detail.put("companyLevel", companyLevel);
return new HashMap<String, Map<String, Object>>() {{ return new HashMap<String, Map<String, Object>>() {{
this.put("installationInfo", detail); this.put("installationInfo", 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