Commit 8ad1a315 authored by zhangyingbin's avatar zhangyingbin

修改 告知申请新增、详情、更新接口

parent e692cf8a
...@@ -180,9 +180,11 @@ public class InstallNoticeController extends BaseController { ...@@ -180,9 +180,11 @@ public class InstallNoticeController extends BaseController {
@ApiOperation(httpMethod = "put", value = "根据sequenceNbr更新提交申请", notes = "根据sequenceNbr更新提交申请") @ApiOperation(httpMethod = "put", value = "根据sequenceNbr更新提交申请", notes = "根据sequenceNbr更新提交申请")
public ResponseModel<InstallNoticeDto> InstallNoticeSubmit(@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<InstallNoticeDto> InstallNoticeSubmit(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
final InstallNoticeDto model = installNoticeServiceImpl.selectOneById(sequenceNbr); final InstallNoticeDto model = installNoticeServiceImpl.selectOneById(sequenceNbr);
Project project = projectServiceImpl.getById(model.getProjectId());
if (model.getNoticeStatus().equals("已保存")){ if (model.getNoticeStatus().equals("已保存")){
model.setNoticeStatus("已提交"); model.setNoticeStatus("已提交");
ResponseHelper.buildResponse(installNoticeServiceImpl.updateWithModel(model)); installNoticeServiceImpl.updateWithModel(model);
projectInitiationServiceImpl.execute(project.getInstanceId(),model,"1");
} }
return ResponseHelper.buildResponse(model); return ResponseHelper.buildResponse(model);
} }
...@@ -195,8 +197,8 @@ public class InstallNoticeController extends BaseController { ...@@ -195,8 +197,8 @@ public class InstallNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PostMapping (value = "/saveInstallNotice") @PostMapping (value = "/saveInstallNotice")
@ApiOperation(httpMethod = "Post", value = "新增安装告知申请", notes = "新增安装告知申请") @ApiOperation(httpMethod = "Post", value = "新增安装告知申请", notes = "新增安装告知申请")
public ResponseModel<InstallNoticeDto> saveInstallNotice(@RequestBody JSONObject object,@RequestParam(required = false) String noticeStatus ) { public ResponseModel<InstallNoticeDto> saveInstallNotice(@RequestBody JSONObject object,@RequestParam(required = false) String noticeStatus,@RequestParam(required = false)String installId) {
return ResponseHelper.buildResponse(installNoticeServiceImpl.saveInstallNotice(object, noticeStatus)); return ResponseHelper.buildResponse(installNoticeServiceImpl.saveInstallNotice(object, noticeStatus,installId));
} }
/** /**
......
...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto; ...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto;
import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto; import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice; import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project; import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
import com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMapper; import com.yeejoin.amos.boot.module.ugp.api.mapper.InstallNoticeMapper;
import com.yeejoin.amos.boot.module.ugp.api.service.IInstallNoticeService; import com.yeejoin.amos.boot.module.ugp.api.service.IInstallNoticeService;
import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto; import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
...@@ -49,6 +50,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -49,6 +50,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
OrgServiceImpl orgServiceImpl; OrgServiceImpl orgServiceImpl;
@Autowired @Autowired
ProjectResourceServiceImpl projectResourceServiceImpl; ProjectResourceServiceImpl projectResourceServiceImpl;
@Autowired
SuperviseRuleServiceImpl superviseRuleServiceImpl;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -106,11 +109,15 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -106,11 +109,15 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
* *
* @return * @return
*/ */
public InstallNoticeDto saveInstallNotice(JSONObject object, String noticeStatus ) { public InstallNoticeDto saveInstallNotice(JSONObject object, String noticeStatus,String installId ) {
Long projectId = object.getLong("projectId");
if(!ValidationUtil.isEmpty(installId)){
projectId = this.getById(installId).getProjectId();
}
InstallNoticeDto installNoticeDto = new InstallNoticeDto(); InstallNoticeDto installNoticeDto = new InstallNoticeDto();
final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("projectId")); final ProjectDto projectDto = projectServiceImpl.queryBySeq(projectId);
installNoticeDto.setProjectId(object.getLong("projectId")); installNoticeDto.setProjectId(projectId);
installNoticeDto.setProjectName(projectDto.getName()); installNoticeDto.setProjectName(projectDto.getName());
installNoticeDto.setCompanyName(projectDto.getInstallationUnit()); installNoticeDto.setCompanyName(projectDto.getInstallationUnit());
installNoticeDto.setNoticeStatus(noticeStatus); installNoticeDto.setNoticeStatus(noticeStatus);
...@@ -128,7 +135,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -128,7 +135,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
InstallNotice installNotice = new InstallNotice(); InstallNotice installNotice = new InstallNotice();
LambdaQueryWrapper<InstallNotice> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<InstallNotice> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(InstallNotice :: getProjectId,object.getLong("projectId")); wrapper.eq(InstallNotice :: getProjectId,projectId);
List<InstallNotice> installNoticeList = this.list(wrapper); List<InstallNotice> installNoticeList = this.list(wrapper);
if(!ValidationUtil.isEmpty(installNoticeList)){ if(!ValidationUtil.isEmpty(installNoticeList)){
installNotice = installNoticeList.iterator().next(); installNotice = installNoticeList.iterator().next();
...@@ -151,11 +158,16 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta ...@@ -151,11 +158,16 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
* @return * @return
*/ */
public JSONObject selectOneBySeq(Long sequenceNbr) { public JSONObject selectOneBySeq(Long sequenceNbr) {
final InstallNoticeDto installNoticeDto = selectOneById(sequenceNbr);
// final ProjectDto projectDto = projectServiceImpl.queryBySeq(installNoticeDto.getProjectId());
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
Map map = projectServiceImpl.getMap(new LambdaQueryWrapper<Project>().eq(Project::getSequenceNbr,installNoticeDto.getProjectId())); final InstallNoticeDto installNoticeDto = selectOneById(sequenceNbr);
final ProjectDto projectDto = projectServiceImpl.queryBySeq(installNoticeDto.getProjectId());
SuperviseRule superviseRule = superviseRuleServiceImpl.getOne(new LambdaQueryWrapper<SuperviseRule>().eq(SuperviseRule::getAdminRegionCode,projectDto.getInstallRegionCode()));
Map map = new org.apache.commons.beanutils.BeanMap(projectDto);
jsonObject.putAll(map); jsonObject.putAll(map);
if(!ValidationUtil.isEmpty(superviseRule)){
jsonObject.put("inspectionUnit",orgServiceImpl.getdetialInfo(String.valueOf(superviseRule.getInspectionUnitId())).get("name"));
jsonObject.put("superviseDept",orgServiceImpl.getdetialInfo(String.valueOf(superviseRule.getSuperviseDeptId())).get("name"));
}
// jsonObject.put("name",projectDto.getName()); // jsonObject.put("name",projectDto.getName());
// jsonObject.put("installRegion",projectDto.getInstallRegion()); // jsonObject.put("installRegion",projectDto.getInstallRegion());
jsonObject.put("licenseNum",installNoticeDto.getLicenseNum()); jsonObject.put("licenseNum",installNoticeDto.getLicenseNum());
......
...@@ -336,7 +336,7 @@ public class ProblemInitiationServiceImpl { ...@@ -336,7 +336,7 @@ public class ProblemInitiationServiceImpl {
LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr()); wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
RectifyMsg rectifyMsg = new RectifyMsg(); RectifyMsg rectifyMsg = new RectifyMsg();
rectifyMsg.setContent(smsRecordModel.getSmsContent()); rectifyMsg.setContent(content);
rectifyMsg.setProblemId(sequenceNbr); rectifyMsg.setProblemId(sequenceNbr);
rectifyMsg.setNoticeUnitId(Long.valueOf(noticeUnitId)); rectifyMsg.setNoticeUnitId(Long.valueOf(noticeUnitId));
rectifyMsg.setMsgReceiver(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr()); rectifyMsg.setMsgReceiver(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());
......
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