chenr 4 сар өмнө
parent
commit
b76ade920a

+ 12 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/LogSaveAgainDto.java

@@ -0,0 +1,12 @@
+package org.springblade.business.dto;
+
+import lombok.Data;
+
+@Data
+public class LogSaveAgainDto {
+    private String logIds;
+    private String logPkeyId;
+    private String nodePrimaryKeyId;
+    private String contractId;
+
+}

+ 7 - 0
blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -2040,6 +2040,13 @@ public class TaskController extends BladeController {
         return R.success("任务已经成功提交重签,请耐心等待!");
     }
 
+    @PostMapping("/logSaveAgain")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "日志-未上报-重刷")
+    public R<Object>logSaveAgain(@RequestBody LogSaveAgainDto dto) throws Exception {
+        taskService.logSaveAgain(dto);
+        return R.success("操作成功");
+    }
     /**
      * 任务超时提示信息
      */

+ 3 - 0
blade-service/blade-business/src/main/java/org/springblade/business/service/ITaskService.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.service;
 
+import org.springblade.business.dto.LogSaveAgainDto;
 import org.springblade.business.dto.ReSigningEntrustDto;
 import org.springblade.business.dto.TrialResignDto;
 import org.springblade.business.dto.reSigningEVisaStatus;
@@ -133,4 +134,6 @@ public interface ITaskService extends BaseService<Task> {
     void reSigningEntrust(List<ReSigningEntrustDto> dtos, String header, HttpServletRequest request);
 
     R reSigningEVisaStatus0(List<reSigningEVisaStatus> dtos, String header) throws Exception;
+
+    void logSaveAgain(LogSaveAgainDto dto) throws Exception;
 }

+ 16 - 5
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -13,10 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.feign.ArchiveAutoClient;
-import org.springblade.business.dto.ReSigningEntrustDto;
-import org.springblade.business.dto.TrialResignDto;
-import org.springblade.business.dto.TrialSelfInspectionRecordDTO;
-import org.springblade.business.dto.reSigningEVisaStatus;
+import org.springblade.business.dto.*;
 import org.springblade.business.entity.*;
 import org.springblade.business.mapper.TaskMapper;
 import org.springblade.business.mapper.TrialSelfInspectionRecordMapper;
@@ -1910,7 +1907,21 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         }
          return R.success("操作成功");
         }
-        @Override
+
+    @Override
+    public void logSaveAgain(LogSaveAgainDto dto) throws Exception {
+        List<ContractLog> contractLogList = jdbcTemplate.query("select * from u_contract_log where id in (" + dto.getLogIds() + ")", new BeanPropertyRowMapper<>(ContractLog.class));
+        if(contractLogList.size()>0){
+            for (ContractLog contractLog : contractLogList) {
+                contractLogService.update(new LambdaUpdateWrapper<ContractLog>().eq(ContractLog::getId, contractLog.getId())
+                    .set(ContractLog::getEVisaPdfUrl, null)
+                    .set(ContractLog::getPdfUrl, null));
+                excelTabClient.getTheContractLogBusinessData(dto.getLogPkeyId(), dto.getNodePrimaryKeyId(), contractLog.getRecordTime(), dto.getContractId(), contractLog.getCreateUser());
+            }
+        }
+    }
+
+    @Override
         public void reSigningEVisa(String classify, String taskIds, String contractId, String projectId, Integer type, String header , HttpServletRequest request) {
         //查询任务信息
         List<Task> taskList = jdbcTemplate.query("select * from u_task where id in(" + taskIds + ")", new BeanPropertyRowMapper<>(Task.class));