Merge branch 'dev' into dev

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -610,9 +610,16 @@ public class InformationWriteQueryController extends BladeController {
     @ApiOperation(value = "单个废除")
 //    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> abolishOne(@RequestParam String primaryKeyId, @RequestParam String classify, @RequestParam String projectId, @RequestParam String contractId) {
+        WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+        if (obj == null) {
+            return R.fail("未找到节点数据");
+        }
+        if (!contractId.equals(obj.getContractId())) {
+            contractId = obj.getContractId();
+        }
         //查询填报状态
         InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId)
-//                .eq(InformationQuery::getContractId, contractId)
+                .eq(InformationQuery::getContractId, contractId)
                 .eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1).in(InformationQuery::getStatus, 1,2));
         primaryKeyId = primaryKeyId + "*";
         if (businessData != null) {
@@ -621,7 +628,7 @@ public class InformationWriteQueryController extends BladeController {
         } else {
             //试验
             InformationQuery businessDataTrial = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify)
-//                    .eq(InformationQuery::getContractId, contractId)
+                    .eq(InformationQuery::getContractId, contractId)
                     .eq(InformationQuery::getType, 2).in(InformationQuery::getStatus, 1,2));
             if (businessDataTrial != null) {
                 //使用批量废除接口
@@ -659,7 +666,11 @@ public class InformationWriteQueryController extends BladeController {
         //记录状态
         String status = "1";
         //查询填报状态，type=1资料填报
-        InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1).last("order by id desc limit 1"));
+        WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+        if (obj == null) {
+            return R.data(status);
+        }
+        InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getContractId, obj.getContractId()).eq(InformationQuery::getType, 1).last("order by id desc limit 1"));
         if (businessData != null) {
             switch (businessData.getStatus()) {
                 case 0:
@@ -676,7 +687,7 @@ public class InformationWriteQueryController extends BladeController {
                     //如果不匹配，默认为未填报
                     status = "1";
                     //查询表格
-                    WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+//                    WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
                     if (ObjectUtils.isNotEmpty(obj)) {
                         List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
                         if (tableList != null && tableList.size() > 0) {
@@ -693,7 +704,7 @@ public class InformationWriteQueryController extends BladeController {
             }
         } else {
             //查询表格
-            WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+//            WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
             if (ObjectUtils.isNotEmpty(obj)) {
                 List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
                 if (tableList != null && tableList.size() > 0) {
@@ -722,6 +733,9 @@ public class InformationWriteQueryController extends BladeController {
         String status = "1";
         //查询填报状态，type=1资料填报
         WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+        if (obj == null) {
+            return R.data(status);
+        }
         InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getContractId, obj.getContractId()).eq(InformationQuery::getType, 1).last("order by id desc limit 1"));
         if (businessData != null) {
             switch (businessData.getStatus()) {
@@ -784,9 +798,14 @@ public class InformationWriteQueryController extends BladeController {
     public R<String> queryNodeStatusSj(@RequestParam String primaryKeyId, @RequestParam String classify, String id) {
         //记录状态
         String status = "1";
+        WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+        if (obj == null) {
+            return R.data(status);
+        }
         //查询填报状态，type=3首件
         InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery()
                 .eq(InformationQuery::getId, id)
+                .eq(InformationQuery::getContractId, obj.getContractId())
                 .eq(InformationQuery::getType, 3).last("order by id desc limit 1")
         );
         if (businessData != null) {
@@ -805,7 +824,7 @@ public class InformationWriteQueryController extends BladeController {
                     //如果不匹配，默认为未填报
                     status = "1";
                     //查询表格
-                    WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+//                    WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
                     if (ObjectUtils.isNotEmpty(obj)) {
                         List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
                         if (tableList != null && tableList.size() > 0) {
@@ -822,7 +841,7 @@ public class InformationWriteQueryController extends BladeController {
             }
         } else {
             //查询表格
-            WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
+//            WbsTreeContract obj = this.wbsTreeContractClient.getContractNodeByPrimaryKeyId(primaryKeyId);
             if (ObjectUtils.isNotEmpty(obj)) {
                 List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(obj, "queryTable", classify);
                 if (tableList != null && tableList.size() > 0) {
@@ -852,7 +871,7 @@ public class InformationWriteQueryController extends BladeController {
         String status = "1";
         //查询填报状态，type=2试验
         InformationQuery businessData = this.informationQueryService.getBaseMapper().selectList(Wrappers.<InformationQuery>lambdaQuery()
-                .eq(InformationQuery::getWbsId, id).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 2)).stream().findAny().orElse(null);
+                .eq(InformationQuery::getWbsId, id).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 2).last("order by id desc limit 1")).stream().findAny().orElse(null);
         if (businessData != null) {
             switch (businessData.getStatus()) {
                 case 0:
@@ -1179,11 +1198,11 @@ public R<String> batchDownloadFileToZip(String ids, HttpServletResponse response
                         //更改状态为未上报
                         wrapper.set(InformationQuery::getStatus, 3);
                         //将电签的pdf路径置空
-                        wrapper.set(InformationQuery::getEVisaPdfUrl, null);
+//                        wrapper.set(InformationQuery::getEVisaPdfUrl, null);
                         //将上报批次置空
-                        wrapper.set(InformationQuery::getReportNumber, null);
+//                        wrapper.set(InformationQuery::getReportNumber, null);
                         //置空审批人
-                        wrapper.set(InformationQuery::getAuditUserIdAndName, null);
+//                        wrapper.set(InformationQuery::getAuditUserIdAndName, null);
 
                         this.informationQueryService.update(wrapper.in(InformationQuery::getId, Arrays.asList(task.getFormDataId().split(","))));
                     }
@@ -3766,7 +3785,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
 @ApiOperationSupport(order = 1)
 @ApiOperation(value = "获取底层节点文件题名")
 public R<String> getDICengNodeName(@RequestParam Long pKeyId,@RequestParam Long contractId,@RequestParam Integer classify){
-    InformationQuery informationQuery = informationQueryService.getBaseMapper().selectOne(new LambdaQueryWrapper<>(InformationQuery.class).eq(InformationQuery::getWbsId, pKeyId).eq(InformationQuery::getContractId, contractId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1));
+    InformationQuery informationQuery = informationQueryService.getBaseMapper().selectOne(new LambdaQueryWrapper<>(InformationQuery.class).eq(InformationQuery::getWbsId, pKeyId).eq(InformationQuery::getContractId, contractId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1).last("order by id desc limit 1"));
     if(informationQuery!=null){
         return R.data(informationQuery.getName());
     }