From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/disputeRecord/controller/DisputeRecordController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/disputeRecord/controller/DisputeRecordController.java b/src/main/java/org/springblade/modules/disputeRecord/controller/DisputeRecordController.java
index 44cd84f..b97ba65 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/controller/DisputeRecordController.java
+++ b/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);
}
/**
@@ -176,9 +179,11 @@
disputeRecordExcel.setLat("28.154412451");
disputeRecordExcel.setEventTime("2024-01-01 12:00:00");
disputeRecordExcel.setNameOne("张三");
+ disputeRecordExcel.setGenderOne("男");
disputeRecordExcel.setPhoneOne("131****1234");
disputeRecordExcel.setIdCardOne("360728*********0000");
disputeRecordExcel.setNameTwo("李四");
+ disputeRecordExcel.setGenderTwo("女");
disputeRecordExcel.setPhoneTwo("132****1234");
disputeRecordExcel.setIdCardTwo("360728*********0001");
disputeRecordExcel.setDisputeType("2");
@@ -195,4 +200,13 @@
}
+ /**
+ * e呼即办数据临时转换到矛盾纠纷
+ */
+ @GetMapping("/eCallToDis")
+ @ApiOperationSupport(order = 13)
+ public void eCallToDis() {
+ disputeRecordService.eCallToDis();
+ }
+
}
--
Gitblit v1.9.3