Commit 5f56751d authored by zhangyingbin's avatar zhangyingbin

修改接口 根据id查询告知详细信息

parent a5d9669e
...@@ -152,16 +152,18 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -152,16 +152,18 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
*/ */
public JSONObject selectOneBySeq(Long sequenceNbr) { public JSONObject selectOneBySeq(Long sequenceNbr) {
final InstallNoticeDto installNoticeDto = selectOneById(sequenceNbr); final InstallNoticeDto installNoticeDto = selectOneById(sequenceNbr);
final ProjectDto projectDto = projectServiceImpl.queryBySeq(installNoticeDto.getProjectId()); // final ProjectDto projectDto = projectServiceImpl.queryBySeq(installNoticeDto.getProjectId());
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("name",projectDto.getName()); Map map = projectServiceImpl.getMap(new LambdaQueryWrapper<Project>().eq(Project::getSequenceNbr,installNoticeDto.getProjectId()));
jsonObject.put("installRegion",projectDto.getInstallRegion()); jsonObject.putAll(map);
// jsonObject.put("name",projectDto.getName());
// jsonObject.put("installRegion",projectDto.getInstallRegion());
jsonObject.put("licenseNum",installNoticeDto.getLicenseNum()); jsonObject.put("licenseNum",installNoticeDto.getLicenseNum());
jsonObject.put("licenseCompany",installNoticeDto.getLicenseCompany()); jsonObject.put("licenseCompany",installNoticeDto.getLicenseCompany());
jsonObject.put("licenseAttch",JSON.parseArray(installNoticeDto.getLicenseAttch())); jsonObject.put("licenseAttch",JSON.parseArray(installNoticeDto.getLicenseAttch()));
jsonObject.put("contractAttch",JSON.parseArray(installNoticeDto.getContractAttch())); jsonObject.put("contractAttch",JSON.parseArray(installNoticeDto.getContractAttch()));
jsonObject.put("installPri",installNoticeDto.getInstallPri()); jsonObject.put("installPri",installNoticeDto.getInstallPri());
jsonObject.put("projectId",projectDto.getSequenceNbr()); jsonObject.put("projectId",map.get("sequenceNbr"));
return jsonObject; return jsonObject;
} }
} }
\ No newline at end of file
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