材料预付款和开工预付款的假电签URL在撤回后没有删除-修复

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;
@@ -1015,11 +1016,14 @@ public class TaskController extends BladeController {
                         /*删除业务复制数据taskVO*/
                         try {
                             jdbcTemplate.execute("DELETE FROM s_material_meter_form_task WHERE meter_period_id = '" + periodId + "' AND task_id = " + taskRepealDTO.getTaskId());
-                            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("删除业务复制数据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 (DataAccessException e) {
+                            throw new ServiceException("删除假电签地址失败");
+                        }
                     } else if (task.getMeterTaskType().equals(3)) {
                         /*==================== 开工预付款计量单 ====================*/
                         /*获取当前期数下的所有材料*/
@@ -1045,10 +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());
-                            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("删除业务复制数据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 (DataAccessException e) {
+                            throw new ServiceException("删除假电签地址失败");
+                        }
 
                     } else if (task.getMeterTaskType().equals(4)) {
                         for (String dataId : periodId.split(",")) {