优化安装告知申请保存功能

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

@@ -230,7 +230,7 @@ public class InstallNoticeController extends BaseController {
 		if (installNoticeDto.getNoticeStatus().equals("已保存")){
 			installNoticeDto.setNoticeStatus(noticeStatus);
 		}
-		installNoticeDto.setProjectId(object.getLong("name"));
+		installNoticeDto.setProjectId(object.getLong("projectId"));
 		installNoticeDto.setLicenseNum(object.getString("licenseNum"));
 		installNoticeDto.setLicenseCompany(object.getString("licenseCompany"));
 		final JSONArray licenseAttch = object.getJSONArray("licenseAttch");

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.NoticeStatusEnum;
 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;
@@ -14,6 +15,7 @@ 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.biz.framework.BusinessIdentify;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -107,8 +109,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
      public InstallNoticeDto saveInstallNotice(JSONObject object, String noticeStatus ) {
 
         InstallNoticeDto installNoticeDto = new InstallNoticeDto();
-		final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("name"));
-        installNoticeDto.setProjectId(object.getLong("name"));
+		final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("projectId"));
+        installNoticeDto.setProjectId(object.getLong("projectId"));
         installNoticeDto.setProjectName(projectDto.getName());
         installNoticeDto.setCompanyName(projectDto.getInstallationUnit());
         installNoticeDto.setNoticeStatus(noticeStatus);
@@ -123,8 +125,22 @@ 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);
+
+        InstallNotice installNotice = new InstallNotice();
+        LambdaQueryWrapper<InstallNotice> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InstallNotice :: getProjectId,object.getLong("projectId"));
+        List<InstallNotice> installNoticeList = this.list(wrapper);
+        if(!ValidationUtil.isEmpty(installNoticeList)){
+            installNotice = installNoticeList.iterator().next();
+            installNoticeDto.setSequenceNbr(installNotice.getSequenceNbr());
+        }
+
+        BeanUtils.copyProperties(installNoticeDto,installNotice);
+        this.saveOrUpdate(installNotice);
+
+        if(NoticeStatusEnum.已提交.getName().equals(noticeStatus)){
             projectInitiationServiceImpl.execute(projectDto.getInstanceId(),installNoticeDto,"1");
+        }
         return  installNoticeDto;
     }
 
@@ -145,6 +161,7 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
         jsonObject.put("licenseAttch",JSON.parseArray(installNoticeDto.getLicenseAttch()));
         jsonObject.put("contractAttch",JSON.parseArray(installNoticeDto.getContractAttch()));
         jsonObject.put("installPri",installNoticeDto.getInstallPri());
+        jsonObject.put("projectId",projectDto.getSequenceNbr());
         return jsonObject;
     }
 }
\ No newline at end of file