From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java |  293 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 130 insertions(+), 163 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
index 75b779c..d2c5385 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
@@ -44,194 +44,161 @@
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 主键
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty("主键id")
-	@TableId(value = "id", type = IdType.ASSIGN_ID)
+	/** 主键id */
+	@ApiModelProperty(value = "主键ID", example = "")
+	@TableId(value = "id", type = IdType.AUTO)
 	private Long id;
-	/**
-	 * 任务id
-	 */
-	@ApiModelProperty(value = "任务id")
+
+	/** 任务id */
+	@ApiModelProperty(value = "任务id", example = "")
+	@TableField("task_id")
 	private Long taskId;
-	/**
-	 * 场所ID
-	 */
-	@ApiModelProperty(value = "场所ID")
+
+	/** 场所ID */
+	@ApiModelProperty(value = "场所ID", example = "")
+	@TableField("place_id")
 	private Long placeId;
-//	/**
-//	 * 房屋ID
-//	 */
-//	@ApiModelProperty(value = "房屋ID")
-//	private String houseId;
-//	/**
-//	 * 社区ID
-//	 */
-//	@ApiModelProperty(value = "社区ID")
-//	private String districtId;
-	/**
-	 * 发生时间
-	 */
-	@ApiModelProperty(value = "发生时间")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@TableField(fill = FieldFill.INSERT)
-	private Date happenTime;
-	/**
-	 * 用户ID
-	 */
-	@ApiModelProperty(value = "用户ID")
-	private Long userId;
-	/**
-	 * 用户姓名
-	 */
-	@ApiModelProperty(value = "用户姓名")
-	private String owner;
-	/**
-	 * 用户手机号
-	 */
-	@ApiModelProperty(value = "用户手机号")
-	private String phoneNumber;
-	/**
-	 * 身份证图片URLS
-	 */
-	@ApiModelProperty(value = "身份证图片URLS")
-	private String imageUrls;
-	/**
-	 * 场所名称
-	 */
-	@ApiModelProperty(value = "场所名称")
+
+	/** 场所名称 */
+	@ApiModelProperty(value = "场所名称", example = "")
+	@TableField("district_name")
 	private String districtName;
-	/**
-	 * 事件类型 1:打金店 2:二手手机 3:二手车
-	 */
-	@ApiModelProperty(value = "事件类型")
+
+	/** 发生时间 */
+	@ApiModelProperty(value = "发生时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("happen_time")
+	private Date happenTime;
+
+	/** 用户ID */
+	@ApiModelProperty(value = "用户ID", example = "")
+	@TableField("user_id")
+	private Long userId;
+
+	/** 用户姓名 */
+	@ApiModelProperty(value = "用户姓名", example = "")
+	@TableField("owner")
+	private String owner;
+
+	/** 用户手机号 */
+	@ApiModelProperty(value = "用户手机号", example = "")
+	@TableField("phone_number")
+	private String phoneNumber;
+
+	/** 身份证图片URLS */
+	@ApiModelProperty(value = "身份证图片URLS", example = "")
+	@TableField("image_urls")
+	private String imageUrls;
+
+	/** 位置 */
+	@ApiModelProperty(value = "位置", example = "")
+	@TableField("localtion")
+	private String localtion;
+
+	/** 事件类型 1.二手交易 */
+	@ApiModelProperty(value = "事件类型 1.二手交易", example = "")
+	@TableField("event_type")
 	private String eventType;
 
-	/**
-	 * 确认人ID
-	 */
-	@ApiModelProperty(value = "确认人ID")
-	private Long confirmUserId;
-	/**
-	 * 确认时间
-	 */
-	@ApiModelProperty(value = "确认时间")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date confirmTime;
-
-	/**
-	 * 确认意见
-	 */
-	@ApiModelProperty(value = "确认意见")
-	private String confirmNotion;
-
-	/**
-	 * 确认标记 1:待审核  2:审核通过  3:审核不通过  4:待上报(场所负责人完善,由系统下发的任务)
-	 */
-	@ApiModelProperty(value = "确认标记 1:待审核  2:审核通过  3:审核不通过  4:待上报(场所负责人完善,由系统下发的任务)")
+	/** 确认标记 1:待审核  2:审核通过  3:审核不通过 4:待接收 */
+	@ApiModelProperty(value = "确认标记 1:待审核  2:审核通过  3:审核不通过 4:待接收", example = "")
+	@TableField("confirm_flag")
 	private String confirmFlag;
 
-	/**
-	 * 位置
-	 */
-	@ApiModelProperty(value = "位置")
-	private String localtion;
-//
-//	/**
-//	 * 房屋名称
-//	 */
-//	@ApiModelProperty(value = "房屋名称")
-//	private String houseName;
-//	/**
-//	 * 任务名称
-//	 */
-//	@ApiModelProperty(value = "任务名称")
-//	private String taskName;
-	/**
-	 * 对象电话
-	 */
-	@ApiModelProperty(value = "对象电话")
+	/** 确认人ID */
+	@ApiModelProperty(value = "确认人ID", example = "")
+	@TableField("confirm_user_id")
+	private Long confirmUserId;
+
+	/** 确认时间 */
+	@ApiModelProperty(value = "确认时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("confirm_time")
+	private Date confirmTime;
+
+	/** 确认意见 */
+	@ApiModelProperty(value = "确认意见", example = "")
+	@TableField("confirm_notion")
+	private String confirmNotion;
+
+	/** 对象电话 */
+	@ApiModelProperty(value = "对象电话", example = "")
+	@TableField("transaction_object_tel")
 	private String transactionObjectTel;
-	/**
-	 * 交易金额
-	 */
-	@ApiModelProperty(value = "交易金额")
-	private Double transactionMoney;
-	/**
-	 * 物品数量
-	 */
-	@ApiModelProperty(value = "物品数量")
+
+	/** 交易金额 */
+	@ApiModelProperty(value = "交易金额", example = "")
+	@TableField("transaction_money")
+	private Float transactionMoney;
+
+	/** 物品数量 */
+	@ApiModelProperty(value = "物品数量", example = "")
+	@TableField("goods_nums")
 	private Integer goodsNums;
-	/**
-	 * 物品照片URLS
-	 */
-	@ApiModelProperty(value = "物品照片URLS")
+
+	/** 物品照片URLS */
+	@ApiModelProperty(value = "物品照片URLS", example = "")
+	@TableField("goods_image_urls")
 	private String goodsImageUrls;
-	/**
-	 * 交易对象
-	 */
-	@ApiModelProperty(value = "交易对象")
+
+	/** 交易对象/物品名称 */
+	@ApiModelProperty(value = "交易对象/物品名称", example = "")
+	@TableField("transaction_object")
 	private String transactionObject;
-	/**
-	 * 交易过程
-	 */
-	@ApiModelProperty(value = "交易过程")
+
+	/** 交易过程 */
+	@ApiModelProperty(value = "交易过程", example = "")
+	@TableField("transaction_process")
 	private String transactionProcess;
-	/**
-	 * 标签名称
-	 */
-	@ApiModelProperty(value = "标签名称")
+
+	/** 标签名称 */
+	@ApiModelProperty(value = "标签名称", example = "")
+	@TableField("label_name")
 	private String labelName;
 
-	/**
-	 * 来源: 1:主动上报  2:系统自动下发
-	 */
-	@ApiModelProperty(value = "来源: 1:主动上报  2:系统自动下发")
+	/** 1:主动上报  2:系统自动下发 */
+	@ApiModelProperty(value = "1:主动上报  2:系统自动下发", example = "")
+	@TableField("source")
 	private Integer source;
 
-	@TableField(fill = FieldFill.INSERT)
-	@ApiModelProperty(value = "创建时间")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	/** 创建时间 */
+	@ApiModelProperty(value = "创建时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField(value = "create_time",fill = FieldFill.INSERT)
 	private Date createTime;
 
-	/**
-	 * 创建人
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty("创建人")
-	@TableField(fill = FieldFill.INSERT)
-	private String createUser;
+	/** 创建人 */
+	@ApiModelProperty(value = "创建人", example = "")
+	@TableField("create_user")
+	private Long createUser;
 
-
-	/**
-	 * 更新人
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty("更新人")
-	@TableField(fill = FieldFill.UPDATE)
-	private String updateUser;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.UPDATE)
-	@ApiModelProperty(value = "更新时间")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	/** 更新时间 */
+	@ApiModelProperty(value = "更新时间", example = "")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@TableField("update_time")
 	private Date updateTime;
 
+	/** 更新人 */
+	@ApiModelProperty(value = "更新人", example = "")
+	@TableField("update_user")
+	private Long updateUser;
 
-	/**
-	 * 是否已删除 0:否  1:是
-	 */
-	@ApiModelProperty("是否已删除")
+	/** 0否 1是 */
+	@ApiModelProperty(value = "0否 1是", example = "")
+	@TableField("is_deleted")
+	@TableLogic
 	private Integer isDeleted;
 
+	/** 身份证号 */
+	@ApiModelProperty(value = "身份证号", example = "")
+	@TableField("id_card")
+	private String idCard;
+
+	/** 收据、发票 */
+	@ApiModelProperty(value = "收据、发票", example = "")
+	@TableField("receipt_urls")
+	private String receiptUrls;
+
 
 
 }

--
Gitblit v1.9.3