Merge remote-tracking branch 'origin/master' into master

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

@@ -3024,10 +3024,12 @@ public class TaskController extends BladeController {
     }
 
     private TaskController displace(Task task, TaskApproveDTO dto) {
+        List<Long> fileIds = new ArrayList<>();
         if (task.getMeterTaskType().equals(1)) {
             List<MiddleMeterApplyTask> middleMeterApplyTasks = middleMeterApplyServiceTask.getBaseMapper().selectList(Wrappers.<MiddleMeterApplyTask>lambdaQuery()
                     .eq(MiddleMeterApplyTask::getContractPeriodId, task.getFormDataId())
                     .eq(MiddleMeterApplyTask::getTaskId, dto.getTaskId()));
+            fileIds = middleMeterApplyTasks.stream().map(l->l.getId()).collect(Collectors.toList());
             List<InventoryFormApplyTask> inventoryFormApplyTasks = inventoryFormApplyServiceTask.getBaseMapper().selectList(Wrappers.<InventoryFormApplyTask>lambdaQuery()
                     .eq(InventoryFormApplyTask::getTaskId, dto.getTaskId())
                     .eq(InventoryFormApplyTask::getContractPeriodId, task.getFormDataId()));
@@ -3057,6 +3059,7 @@ public class TaskController extends BladeController {
             List<MaterialMeterFormTask> materialMeterFormTasks = materialMeterFormServiceTask.getBaseMapper().selectList(Wrappers.<MaterialMeterFormTask>lambdaQuery()
                     .eq(MaterialMeterFormTask::getMeterPeriodId, task.getFormDataId())
                     .eq(MaterialMeterFormTask::getTaskId, dto.getTaskId()));
+            fileIds = materialMeterFormTasks.stream().map(l->l.getId()).collect(Collectors.toList());
             jdbcTemplate.execute("DELETE FROM s_material_meter_form WHERE meter_period_id = " + task.getFormDataId());
 
             List<MaterialMeterForm> materialMeterForms = BeanUtil.copyProperties(materialMeterFormTasks, MaterialMeterForm.class);
@@ -3074,6 +3077,7 @@ public class TaskController extends BladeController {
             List<StartPayMeterFormTask> startPayMeterFormTasks = startPayMeterFormServiceTask.getBaseMapper().selectList(Wrappers.<StartPayMeterFormTask>lambdaQuery()
                     .eq(StartPayMeterFormTask::getMeterPeriodId, task.getFormDataId())
                     .eq(StartPayMeterFormTask::getTaskId, dto.getTaskId()));
+            fileIds = startPayMeterFormTasks.stream().map(l->l.getId()).collect(Collectors.toList());
             jdbcTemplate.execute("DELETE FROM s_start_pay_meter_form WHERE meter_period_id = " + task.getFormDataId());
 
             List<StartPayMeterForm> startPayMeterForms = BeanUtil.copyProperties(startPayMeterFormTasks, StartPayMeterForm.class);
@@ -3119,6 +3123,18 @@ public class TaskController extends BladeController {
                 }
             }
         }
+        /*统一修改所有的附件到真实数据*/
+        if (fileIds.size() > 0){
+            List<AttachmentFormTask> attachmentFormTasks = attachmentFormServiceTask.list(
+                    new LambdaQueryWrapper<AttachmentFormTask>()
+                            .in(AttachmentFormTask::getMasterId,fileIds));
+            //删除原始数据
+            attachmentFormService.deleteByMasterIds2(fileIds);
+            //保存审批之后的数据
+            List<AttachmentForm> attachmentForms = BeanUtil.copyProperties(attachmentFormTasks, AttachmentForm.class);
+            attachmentFormService.saveBatch(attachmentForms);
+        }
+
         return this;
     }
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/AttachmentFormMapper.java

@@ -20,6 +20,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.meter.entity.AttachmentForm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -34,4 +35,6 @@ public interface AttachmentFormMapper extends BaseMapper<AttachmentForm> {
     void deleteByMasterId(@Param("masterId") Long masterId);
 
     void deleteByMasterIds(@Param("ids") Set<Long> ids);
+
+    void deleteByMasterIds2(@Param("ids") List<Long> ids);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/AttachmentFormMapper.xml

@@ -30,6 +30,13 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteByMasterIds2">
+        DELETE FROM s_attachment_form
+        where master_id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 
 </mapper>

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IAttachmentFormService.java

@@ -19,6 +19,7 @@ package org.springblade.meter.service;
 import org.springblade.meter.entity.AttachmentForm;
 import org.springblade.core.mp.base.BaseService;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -33,4 +34,7 @@ public interface IAttachmentFormService extends BaseService<AttachmentForm> {
     void deleteByMasterId(Long masterId);
     //删除中间计量申请下的变更附件
     void deleteByMasterIds(Set<Long> ids);
+
+    //批量删除根据masterId
+    void deleteByMasterIds2(List<Long> ids);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/AttachmentFormServiceImpl.java

@@ -22,6 +22,7 @@ import org.springblade.meter.service.IAttachmentFormService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -43,4 +44,9 @@ public class AttachmentFormServiceImpl extends BaseServiceImpl<AttachmentFormMap
     public void deleteByMasterIds(Set<Long> ids) {
         baseMapper.deleteByMasterIds(ids);
     }
+
+    @Override
+    public void deleteByMasterIds2(List<Long> ids) {
+        baseMapper.deleteByMasterIds2(ids);
+    }
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/AttachmentFormServiceTaskImpl.java

@@ -6,8 +6,11 @@ import org.springblade.meter.mapper.AttachmentFormTaskMapper;
 import org.springblade.meter.service.IAttachmentFormServiceTask;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 public class AttachmentFormServiceTaskImpl extends BaseServiceImpl<AttachmentFormTaskMapper, AttachmentFormTask> implements IAttachmentFormServiceTask {
 
+
 }