Merge remote-tracking branch 'origin/master'

linwe

2024-05-24 ba57740f33eacb8a1d514093633e8179e6100815

 src/main/java/org/springblade/modules/disputeRecord/controller/DisputeRecordController.java

@@ -10,9 +10,11 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.disputeRecord.excel.DisputeRecordExcel;
@@ -41,6 +43,7 @@
public class DisputeRecordController {

   private final IDisputeRecordService disputeRecordService;
   private final BladeLogger bladeLogger;

   /**
    * 矛盾纠纷记录表 详情
@@ -144,11 +147,11 @@
    */
   @PostMapping("import-disputeRecord")
   @ApiOperationSupport(order = 10)
   @ApiOperation(value = "导入矛盾纠纷记录表", notes = "传入excel")
   @ApiOperation(value = "批量导入矛盾纠纷记录", notes = "传入excel")
   public R importDisputeRecord(MultipartFile file, Integer isCovered) {
      DisputeRecordImporter disputeRecordImporter = new DisputeRecordImporter(disputeRecordService, 1 == 1);
      ExcelUtil.save(file, disputeRecordImporter, DisputeRecordExcel.class);
      return R.success("操作成功");
      bladeLogger.info("批量导入矛盾纠纷记录", JsonUtil.toJson(isCovered));
      String result = disputeRecordService.importDisputeRecord(ExcelUtil.read(file, DisputeRecordExcel.class),isCovered==1);
      return R.data(200, result, null);
   }

   /**