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

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java

@@ -180,9 +180,11 @@ public class InstallNoticeController extends BaseController {
 	@ApiOperation(httpMethod = "put", value = "根据sequenceNbr更新提交申请", notes = "根据sequenceNbr更新提交申请")
 	public ResponseModel<InstallNoticeDto> InstallNoticeSubmit(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		final InstallNoticeDto model = installNoticeServiceImpl.selectOneById(sequenceNbr);
+		Project project = projectServiceImpl.getById(model.getProjectId());
 		if (model.getNoticeStatus().equals("已保存")){
 			model.setNoticeStatus("已提交");
-			ResponseHelper.buildResponse(installNoticeServiceImpl.updateWithModel(model));
+			installNoticeServiceImpl.updateWithModel(model);
+			projectInitiationServiceImpl.execute(project.getInstanceId(),model,"1");
 		}
 		return ResponseHelper.buildResponse(model);
 	}
@@ -195,8 +197,8 @@ public class InstallNoticeController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@PostMapping (value = "/saveInstallNotice")
 	@ApiOperation(httpMethod = "Post", value = "新增安装告知申请", notes = "新增安装告知申请")
-	public ResponseModel<InstallNoticeDto> saveInstallNotice(@RequestBody JSONObject object,@RequestParam(required = false) String noticeStatus ) {
-		return  ResponseHelper.buildResponse(installNoticeServiceImpl.saveInstallNotice(object, 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,installId));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeServiceImpl.java

@@ -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.entity.InstallNotice;
 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.service.IInstallNoticeService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
@@ -49,6 +50,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
     OrgServiceImpl orgServiceImpl;
     @Autowired
     ProjectResourceServiceImpl projectResourceServiceImpl;
+    @Autowired
+    SuperviseRuleServiceImpl superviseRuleServiceImpl;
     /**
      * 分页查询
      */
@@ -106,11 +109,15 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
      *
      * @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();
-		final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("projectId"));
-        installNoticeDto.setProjectId(object.getLong("projectId"));
+		final ProjectDto projectDto = projectServiceImpl.queryBySeq(projectId);
+        installNoticeDto.setProjectId(projectId);
         installNoticeDto.setProjectName(projectDto.getName());
         installNoticeDto.setCompanyName(projectDto.getInstallationUnit());
         installNoticeDto.setNoticeStatus(noticeStatus);
@@ -128,7 +135,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
 
         InstallNotice installNotice = new InstallNotice();
         LambdaQueryWrapper<InstallNotice> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(InstallNotice :: getProjectId,object.getLong("projectId"));
+        wrapper.eq(InstallNotice :: getProjectId,projectId);
         List<InstallNotice> installNoticeList = this.list(wrapper);
         if(!ValidationUtil.isEmpty(installNoticeList)){
             installNotice = installNoticeList.iterator().next();
@@ -151,11 +158,16 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
      * @return
      */
     public JSONObject selectOneBySeq(Long sequenceNbr) {
-        final InstallNoticeDto installNoticeDto = selectOneById(sequenceNbr);
-//        final ProjectDto projectDto = projectServiceImpl.queryBySeq(installNoticeDto.getProjectId());
         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);
+        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("installRegion",projectDto.getInstallRegion());
         jsonObject.put("licenseNum",installNoticeDto.getLicenseNum());

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -336,7 +336,7 @@ public class ProblemInitiationServiceImpl {
         LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
         wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
         RectifyMsg rectifyMsg = new RectifyMsg();
-        rectifyMsg.setContent(smsRecordModel.getSmsContent());
+        rectifyMsg.setContent(content);
         rectifyMsg.setProblemId(sequenceNbr);
         rectifyMsg.setNoticeUnitId(Long.valueOf(noticeUnitId));
         rectifyMsg.setMsgReceiver(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());