Commit 35fae41c authored by zhangsen's avatar zhangsen

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

parent 0f0f47d1
......@@ -19,7 +19,7 @@ import java.util.Map;
*/
public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel);
JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op);
......
......@@ -134,7 +134,8 @@ public class JgTransferNoticeController extends BaseController {
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个移装造告知", notes = "根据sequenceNbr查询单个移装造告知")
public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
return ResponseHelper.buildResponse(jgTransferNoticeService.queryBySequenceNbr(sequenceNbr));
String companyLevel = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
return ResponseHelper.buildResponse(jgTransferNoticeService.queryBySequenceNbr(sequenceNbr, companyLevel));
}
......
......@@ -111,7 +111,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
* @return 移装告知
*/
@Override
public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel) {
// 移装告知信息
JgTransferNotice notice = jgTransferNoticeMapper.selectById(sequenceNbr);
if (Objects.isNull(notice)) {
......@@ -159,6 +159,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
equInfo.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
BeanUtil.copyProperties(equInfo, detail);
BeanUtil.copyProperties(transferNotice, detail, "equList", "supervisoryCode");
detail.put("companyLevel", companyLevel);
return new HashMap<String, Map<String, Object>>() {{
this.put("transferNoticeInfo", 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