Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

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

@@ -611,7 +611,8 @@ public class InformationWriteQueryController extends BladeController {
 //    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> abolishOne(@RequestParam String primaryKeyId, @RequestParam String classify, @RequestParam String projectId, @RequestParam String contractId) {
         //查询填报状态
-        InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getContractId, contractId)
+        InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId)
+//                .eq(InformationQuery::getContractId, contractId)
                 .eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1).in(InformationQuery::getStatus, 1,2));
         primaryKeyId = primaryKeyId + "*";
         if (businessData != null) {
@@ -619,7 +620,8 @@ public class InformationWriteQueryController extends BladeController {
             return this.batchAbolish(businessData.getId().toString(), primaryKeyId, projectId, contractId, "撤回成功");
         } else {
             //试验
-            InformationQuery businessDataTrial = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getContractId, contractId)
+            InformationQuery businessDataTrial = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify)
+//                    .eq(InformationQuery::getContractId, contractId)
                     .eq(InformationQuery::getType, 2).in(InformationQuery::getStatus, 1,2));
             if (businessDataTrial != null) {
                 //使用批量废除接口
@@ -719,7 +721,8 @@ 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);
+        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:
@@ -736,7 +739,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) {
@@ -753,7 +756,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) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -4261,6 +4261,7 @@ public class ExcelTabController extends BladeController {
                         iq.setUpdateTime(new Date());
                         iq.setUpdateUser(b.getUserId());
                         informationQueryClient.update(iq);
+                        getPdfS(iq.getWbsId() + "", iq.getClassify() + "", iq.getContractId() + "");
                     }
                 }
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -804,7 +804,7 @@
                 </otherwise>
             </choose>
             SET
-                b.sort = c.sort,
+                b.sort = d.sort,
                 a.sort = (
                     CASE
                     WHEN a.is_use_sort IS NULL OR a.is_use_sort != 1 THEN d.sort

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -2156,8 +2156,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                     } catch (ParseException e) {
                                         throw new ServiceException("日期绑定错误");
                                     }
-                                    String StartDate = formatStr.format(Start_dataStr);
-                                    String endDate = formatStr.format(end_dataStr);
+                                    String StartDate = formatStr.format(Start_dataStr).trim().replace(" ","");
+                                    String endDate = formatStr.format(end_dataStr).trim().replace(" ","");
                                     if (StartDate.equals(endDate)) {
                                         myData = StartDate;
                                     } else {

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -186,6 +186,7 @@ public class FileUtils {
                 try {
                     //获取OSS文件输入流
                     reader = new PdfReader(Objects.requireNonNull(CommonUtil.getOSSInputStream(urlStr)));
+                    PdfReader.unethicalreading = true;
                     pageCount = reader.getNumberOfPages();
 
                     for (int i = 0; i < pageCount; ++i) {

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -85,6 +85,7 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springblade.websocket.feign.WebSocketClient;
 import org.springblade.websocket.vo.UserInfoVO;
+import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.SingleColumnRowMapper;
@@ -1018,7 +1019,11 @@ public class TaskController extends BladeController {
                         } catch (Exception e) {
                             throw new ServiceException("删除业务复制数据taskVO失败");
                         }
-
+                        try {
+                            jdbcTemplate.execute("UPDATE s_material_start_statement SET pre_pdf_url = null WHERE meter_period_id = " + periodId + " and is_deleted = 0 and type = 1");
+                        } catch (Exception e) {
+                            throw new ServiceException("删除假电签地址失败");
+                        }
                     } else if (task.getMeterTaskType().equals(3)) {
                         /*==================== 开工预付款计量单 ====================*/
                         /*获取当前期数下的所有材料*/
@@ -1044,9 +1049,15 @@ public class TaskController extends BladeController {
                         /*删除业务复制数据taskVO*/
                         try {
                             jdbcTemplate.execute("DELETE FROM s_start_pay_meter_form_task WHERE meter_period_id = '" + periodId + "' AND task_id = " + taskRepealDTO.getTaskId());
+
                         } catch (Exception e) {
                             throw new ServiceException("删除业务复制数据taskVO失败");
                         }
+                        try {
+                            jdbcTemplate.execute("UPDATE s_material_start_statement SET pre_pdf_url = null WHERE meter_period_id = " + periodId + " and is_deleted = 0 and type = 2");
+                        } catch (Exception e) {
+                            throw new ServiceException("删除假电签地址失败");
+                        }
 
                     } else if (task.getMeterTaskType().equals(4)) {
                         for (String dataId : periodId.split(",")) {