修改告知通知短信存储逻辑

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

@@ -195,8 +195,7 @@ public class InstallNoticeController extends BaseController {
 	@PostMapping (value = "/saveInstallNotice")
 	@ApiOperation(httpMethod = "Post", value = "新增安装告知申请", notes = "新增安装告知申请")
 	public ResponseModel<InstallNoticeDto> saveInstallNotice(@RequestBody JSONObject object,@RequestParam(required = false) String noticeStatus ) {
-		InstallNoticeDto installNoticeDto = installNoticeServiceImpl.saveInstallNotice(object, noticeStatus);
-		return  ResponseHelper.buildResponse(installNoticeServiceImpl.createWithModel(installNoticeDto));
+		return  ResponseHelper.buildResponse(installNoticeServiceImpl.saveInstallNotice(object, noticeStatus));
 	}
 
 	/**

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

@@ -116,6 +116,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
         installNoticeDto.setLicenseAttch(JSON.toJSONString(licenseAttch));
         installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch));
         installNoticeDto.setOrganizationCode(orgServiceImpl.getOrgUsr().getBizOrgCode());
+        installNoticeDto = this.createWithModel(installNoticeDto);
 		projectInitiationServiceImpl.execute(projectDto.getInstanceId(),installNoticeDto,"1");
         return  installNoticeDto;
     }

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

@@ -161,7 +161,7 @@ public class ProblemInitiationServiceImpl {
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
             String noticeUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId();
-            sendMessage(sequenceNbr,noticeUnitId,smsParams,smsCode,supervisionRoleId);
+            sendMessage(sequenceNbr,noticeUnitId,smsParams,smsCode,supervisionRoleId,object);
         }else if(SMSEnum.项目立项驳回短信.getCode().equals(smsCode)) {
             //设置短信发送的基本参数
             HashMap<String, String> smsParams = new HashMap();
@@ -172,10 +172,10 @@ public class ProblemInitiationServiceImpl {
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
             String supervisionUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId();
-            sendMessage(sequenceNbr,supervisionUnitId,smsParams,smsCode,supervisionRoleId);
+            sendMessage(sequenceNbr,supervisionUnitId,smsParams,smsCode,supervisionRoleId,object);
             //给安装发短信
             String installationUnitId = orgUsrServiceImpl.getById(projectServiceImpl.getById(object.getLong("projectId")).getInstallationUnitId()).getAmosOrgId();
-            sendMessage(sequenceNbr,installationUnitId,smsParams,smsCode,installationRoleId);
+            sendMessage(sequenceNbr,installationUnitId,smsParams,smsCode,installationRoleId,object);
         }
 
     }
@@ -189,7 +189,7 @@ public class ProblemInitiationServiceImpl {
      * @param smsCode 短信模板
      * @param roleId 角色id
      */
-    public void sendMessage(Long sequenceNbr,String noticeUnitId,HashMap<String, String> smsParams,String smsCode,String roleId){
+    public void sendMessage(Long sequenceNbr,String noticeUnitId,HashMap<String, String> smsParams,String smsCode,String roleId,JSONObject object){
         //向noticeUnitId的部门发送短信
         List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByRoleId(roleId,null).getResult();
         List<AgencyUserModel> companyUserModelList = Privilege.agencyUserClient.queryByCompanyId(Long.valueOf(noticeUnitId),null,null,null).getResult();
@@ -211,7 +211,7 @@ public class ProblemInitiationServiceImpl {
                     continue;
                 }
                 if(SMSEnum.项目安装告知申请.getCode().equals(smsCode) || SMSEnum.项目立项驳回短信.getCode().equals(smsCode)){
-                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
+                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object);
                 }else {
                     saveProblemSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
                 }
@@ -220,12 +220,12 @@ public class ProblemInitiationServiceImpl {
         }
     }
 
-    public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel){
+    public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel,JSONObject object){
         LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
         wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
         InstallNoticeMsg installNoticeMsg = new InstallNoticeMsg();
         installNoticeMsg.setContent(smsRecordModel.getSmsContent());
-        installNoticeMsg.setInstallNoticeId(smsRecordModel.getSequenceNbr());
+        installNoticeMsg.setInstallNoticeId(object.getLong("sequenceNbr"));
         installNoticeMsg.setTargetUnitId(Long.valueOf(noticeUnitId));
         installNoticeMsg.setTargetPersonId(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());
         installNoticeMsg.setSendTime(smsRecordModel.getSendTime());