6 Commity acaacc8c78 ... bc9486f049

Autor SHA1 Wiadomość Data
  zhuwei bc9486f049 Merge remote-tracking branch 'origin/zhuwei' into zhuwei 1 dzień temu
  zhuwei 8d2d5af7f8 前端显示 角色名称 1 dzień temu
  zhuwei efb1a2255c 20250808-星期五发版切换分支保存的数据 1 dzień temu
  zhuwei 311afc83b4 20250808-星期五发版切换分支保存的数据 4 dni temu
  LHB 9730e93a30 Merge branch 'refs/heads/feature-lihb-20250731' into test-merge 1 dzień temu
  LHB a72eb66d66 试验-接入成渝第三方接口开发 1 dzień temu

+ 12 - 3
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -2047,7 +2047,10 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
                         BladeFile bladeFile = this.newIOSSClient.uploadFile(informationQuery.getId() + ".pdf", listPdf);
                         if (bladeFile != null) {
                             //修改当前节点的pdfTrialURL地址
-                            if (informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getPdfTrialUrl, bladeFile.getLink()).eq(InformationQuery::getId, informationQuery.getId()))) {
+                            if (informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate()
+                                    .set(InformationQuery::getPdfTrialUrl, bladeFile.getLink())
+                                    .ne(InformationQuery::getStatus, 3)
+                                    .eq(InformationQuery::getId, informationQuery.getId()))) {
                                 for (String recordId : Func.toStrList(dto.getIds())) {
                                     baseMapper.deleteSeletedStatusByNodeId(dto.getNodeId(), dto.getType(), recordId); //先删除对应记录
                                     baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId); //新增该类型选中的记录信息
@@ -2105,7 +2108,10 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
                         BladeFile bladeFile = this.newIOSSClient.uploadFile(informationQuery.getId() + ".pdf", listPdf);
                         if (bladeFile != null) {
                             //修改当前节点最新的pdfTrialURL地址
-                            if (informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getPdfTrialUrl, bladeFile.getLink()).eq(InformationQuery::getId, informationQuery.getId()))) {
+                            if (informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate()
+                                    .set(InformationQuery::getPdfTrialUrl, bladeFile.getLink())
+                                    .ne(InformationQuery::getStatus, 3)
+                                    .eq(InformationQuery::getId, informationQuery.getId()))) {
                                 for (String recordId : recordIds) {
                                     baseMapper.deleteSeletedStatusByNodeId(dto.getNodeId(), dto.getType(), recordId); //先删除对应记录
                                     baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId); //新增该类型选中的记录信息
@@ -2118,7 +2124,10 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             } else {
                 //修改pdfTrialUrl=null
                 if (informationQuery != null) {
-                    informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getPdfTrialUrl, null).eq(InformationQuery::getId, informationQuery.getId()));
+                    informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate()
+                            .set(InformationQuery::getPdfTrialUrl, null)
+                            .ne(InformationQuery::getStatus, 3)
+                            .eq(InformationQuery::getId, informationQuery.getId()));
                 }
             }
             //删除该类型的所有记录信息