From 870947b430f0158b13f6f5a7ff332d46d22db760 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 27 Mar 2024 13:53:00 +0800
Subject: [PATCH] 矛盾纠纷新增当事人性别字段
---
src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java | 48 +++++++++++++++---------
src/main/java/org/springblade/modules/disputeRecord/service/impl/DisputeRecordServiceImpl.java | 18 +++++++++
src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java | 12 ++++++
src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java | 34 +++++++++++------
src/main/java/org/springblade/modules/disputeRecord/mapper/DisputeRecordMapper.xml | 2 +
5 files changed, 84 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java b/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
index 682b41c..cef0656 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/entity/DisputeRecordEntity.java
@@ -48,34 +48,44 @@
@TableField(value = "event_time")
private Date eventTime;
/**
- * 纠纷方1姓名
+ * 当事人1姓名
*/
- @ApiModelProperty(value = "纠纷方1姓名")
+ @ApiModelProperty(value = "当事人1姓名")
private String nameOne;
/**
- * 纠纷方1电话
+ * 当事人1性别
*/
- @ApiModelProperty(value = "纠纷方1电话")
+ @ApiModelProperty(value = "当事人1性别")
+ private Integer genderOne;
+ /**
+ * 当事人1电话
+ */
+ @ApiModelProperty(value = "当事人1电话")
private String phoneOne;
/**
- * 纠纷方1身份证号码
+ * 当事人1身份证号码
*/
- @ApiModelProperty(value = "纠纷方1身份证号码")
+ @ApiModelProperty(value = "当事人1身份证号码")
private String idCardOne;
/**
- * 纠纷方2姓名
+ * 当事人2姓名
*/
- @ApiModelProperty(value = "纠纷方2姓名")
+ @ApiModelProperty(value = "当事人2姓名")
private String nameTwo;
/**
- * 纠纷方2电话
+ * 当事人2性别
*/
- @ApiModelProperty(value = "纠纷方2电话")
+ @ApiModelProperty(value = "当事人2性别")
+ private Integer genderTwo;
+ /**
+ * 当事人2电话
+ */
+ @ApiModelProperty(value = "当事人2电话")
private String phoneTwo;
/**
- * 纠纷方2身份证号码
+ * 当事人2身份证号码
*/
- @ApiModelProperty(value = "纠纷方2身份证号码")
+ @ApiModelProperty(value = "当事人2身份证号码")
private String idCardTwo;
/**
* 纠纷类型 业务字典：disputeType
diff --git a/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java b/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java
index dd93b64..bdb35b0 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/excel/DisputeRecordExcel.java
@@ -52,40 +52,52 @@
private String eventTime;
/**
- * 纠纷方1姓名
+ * 当事人1姓名
*/
- @ApiModelProperty(value = "纠纷方1姓名")
- @ExcelProperty( "纠纷方1姓名")
+ @ApiModelProperty(value = "当事人1姓名")
+ @ExcelProperty( "当事人1姓名")
private String nameOne;
/**
- * 纠纷方1电话
+ * 当事人1性别
*/
- @ApiModelProperty(value = "纠纷方1电话")
- @ExcelProperty( "纠纷方1电话")
+ @ApiModelProperty(value = "当事人1性别")
+ @ExcelProperty( "当事人1性别（男/女）")
+ private String genderOne;
+ /**
+ * 当事人1电话
+ */
+ @ApiModelProperty(value = "当事人1电话")
+ @ExcelProperty( "当事人1电话")
private String phoneOne;
/**
- * 纠纷方1身份证号码
+ * 当事人1身份证号码
*/
- @ApiModelProperty(value = "纠纷方1身份证号码")
- @ExcelProperty( "纠纷方1身份证号码")
+ @ApiModelProperty(value = "当事人1身份证号码")
+ @ExcelProperty( "当事人1身份证号码")
private String idCardOne;
/**
- * 纠纷方2姓名
+ * 当事人2姓名
*/
- @ApiModelProperty(value = "纠纷方2姓名")
- @ExcelProperty( "纠纷方2姓名")
+ @ApiModelProperty(value = "当事人2姓名")
+ @ExcelProperty( "当事人2姓名")
private String nameTwo;
/**
- * 纠纷方2电话
+ * 当事人2性别
*/
- @ApiModelProperty(value = "纠纷方2电话")
- @ExcelProperty( "纠纷方2电话")
+ @ApiModelProperty(value = "当事人2性别")
+ @ExcelProperty( "当事人2性别（男/女）")
+ private String genderTwo;
+ /**
+ * 当事人2电话
+ */
+ @ApiModelProperty(value = "当事人2电话")
+ @ExcelProperty( "当事人2电话")
private String phoneTwo;
/**
- * 纠纷方2身份证号码
+ * 当事人2身份证号码
*/
- @ApiModelProperty(value = "纠纷方2身份证号码")
- @ExcelProperty( "纠纷方2身份证号码")
+ @ApiModelProperty(value = "当事人2身份证号码")
+ @ExcelProperty( "当事人2身份证号码")
private String idCardTwo;
/**
diff --git a/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java b/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java
index 227a016..1455a29 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/excel/ExportDisputeRecordExcel.java
@@ -53,6 +53,12 @@
@ExcelProperty( "纠纷方1姓名")
private String nameOne;
/**
+ * 当事人1性别
+ */
+ @ApiModelProperty(value = "当事人1性别")
+ @ExcelProperty( "当事人1性别（男/女）")
+ private String genderOne;
+ /**
* 纠纷方1电话
*/
@ApiModelProperty(value = "纠纷方1电话")
@@ -71,6 +77,12 @@
@ExcelProperty( "纠纷方2姓名")
private String nameTwo;
/**
+ * 当事人2性别
+ */
+ @ApiModelProperty(value = "当事人2性别")
+ @ExcelProperty( "当事人2性别（男/女）")
+ private String genderTwo;
+ /**
* 纠纷方2电话
*/
@ApiModelProperty(value = "纠纷方2电话")
diff --git a/src/main/java/org/springblade/modules/disputeRecord/mapper/DisputeRecordMapper.xml b/src/main/java/org/springblade/modules/disputeRecord/mapper/DisputeRecordMapper.xml
index 01d16cb..98b72b5 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/mapper/DisputeRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/disputeRecord/mapper/DisputeRecordMapper.xml
@@ -227,9 +227,11 @@
jdr.address,
jdr.event_time,
jdr.name_one,
+ jdr.gender_one,
jdr.phone_one,
jdr.id_card_one,
jdr.name_two,
+ jdr.gender_two,
jdr.phone_two,
jdr.id_card_two,
jdr.dispute_type,
diff --git a/src/main/java/org/springblade/modules/disputeRecord/service/impl/DisputeRecordServiceImpl.java b/src/main/java/org/springblade/modules/disputeRecord/service/impl/DisputeRecordServiceImpl.java
index c33ccca..fcca3c8 100644
--- a/src/main/java/org/springblade/modules/disputeRecord/service/impl/DisputeRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/disputeRecord/service/impl/DisputeRecordServiceImpl.java
@@ -105,6 +105,24 @@
disputeRecordEntity.setInjuryFlag(0);
}
}
+ // 当事人1性别 1：男 2：女
+ if (!Strings.isBlank(disputeRecordExcel.getGenderOne())) {
+ if (disputeRecordExcel.getGenderOne().contains("男")){
+ disputeRecordEntity.setGenderOne(1);
+ }
+ if (disputeRecordExcel.getGenderOne().contains("女")){
+ disputeRecordEntity.setGenderOne(2);
+ }
+ }
+ // 当事人2性别 1：男 2：女
+ if (!Strings.isBlank(disputeRecordExcel.getGenderTwo())) {
+ if (disputeRecordExcel.getGenderTwo().contains("男")){
+ disputeRecordEntity.setGenderTwo(1);
+ }
+ if (disputeRecordExcel.getGenderTwo().contains("女")){
+ disputeRecordEntity.setGenderTwo(2);
+ }
+ }
// 处理结果 1：已化解 2：未化解 3：移送e呼即办
if (!Strings.isBlank(disputeRecordExcel.getHandleResult())) {
if (disputeRecordExcel.getHandleResult().equals("已化解")) {
--
Gitblit v1.9.3