Merge remote-tracking branch 'origin/developer' into developer

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.NoticeStatusEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProcessTypeEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
@@ -266,6 +267,19 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
                 .eq(ProcessRelation::getDefCode, ProcessTypeEnum.项目立项.getType());
         ProcessRelation processRelation = processRelationService.getOne(relationsWrapper);
         installNoticeDto.setInstanceId(org.springframework.util.ObjectUtils.isEmpty(processRelation) ? null : processRelation.getInstanceId());
+        if (ObjectUtils.isNotEmpty(processRelation)) {
+            LambdaQueryWrapper<ProjectInitiation> logLambda = new LambdaQueryWrapper<>();
+            logLambda.eq(ProjectInitiation::getTaskName, ProjectInitiationEnum.接受告知.getName());
+            logLambda.eq(ProjectInitiation::getInstanceId, org.springframework.util.ObjectUtils.isEmpty(processRelation) ? null : processRelation.getInstanceId());
+            logLambda.orderByDesc(ProjectInitiation::getRecDate);
+            logLambda.last("limit 1");
+            ProjectInitiation logObject = projectInitiationServiceImpl.getOne(logLambda);
+            if (ObjectUtils.isNotEmpty(logObject)) {
+                String context = logObject.getContext();
+                JSONObject jsonObject = JSONObject.parseObject(context);
+                installNoticeDto.setAuditOpinion(jsonObject.getString("auditOpinion"));
+            }
+        }
         return installNoticeDto;
     }
 }
\ No newline at end of file