|
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
import com.fdkankan.fusion.common.util.DateUtils;
|
|
import com.fdkankan.fusion.common.util.DateUtils;
|
|
import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
|
|
import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
|
|
@@ -28,7 +29,7 @@ import lombok.Setter;
|
|
*/
|
|
*/
|
|
@Getter
|
|
@Getter
|
|
@Setter
|
|
@Setter
|
|
-@TableName("t_case_inquest_criminal")
|
|
|
|
|
|
+@TableName(value = "t_case_inquest_criminal",autoResultMap = true)
|
|
public class CaseInquestCriminal implements Serializable {
|
|
public class CaseInquestCriminal implements Serializable {
|
|
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
private static final long serialVersionUID = 1L;
|
|
@@ -102,8 +103,8 @@ public class CaseInquestCriminal implements Serializable {
|
|
/**
|
|
/**
|
|
* 签名
|
|
* 签名
|
|
*/
|
|
*/
|
|
- @TableField("signature")
|
|
|
|
- private String signature;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonArrayTypeHandler.class)
|
|
|
|
+ private JSONArray signature;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 签名时间
|
|
* 签名时间
|
|
@@ -150,27 +151,29 @@ public class CaseInquestCriminal implements Serializable {
|
|
/**
|
|
/**
|
|
* 现场保护人
|
|
* 现场保护人
|
|
*/
|
|
*/
|
|
- @TableField("protector")
|
|
|
|
- private String protector;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonObjTypeHandler.class)
|
|
|
|
+ private JSONObject protector;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 现场保护措施
|
|
* 现场保护措施
|
|
*/
|
|
*/
|
|
- @TableField("protection_measures")
|
|
|
|
- private String protectionMeasures;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonArrayTypeHandler.class)
|
|
|
|
+ private JSONArray protectionMeasures;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 现场情况
|
|
* 现场情况
|
|
*/
|
|
*/
|
|
- @TableField("situation")
|
|
|
|
- private String situation;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonArrayTypeHandler.class)
|
|
|
|
+ private JSONArray situation;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 变动原因
|
|
* 变动原因
|
|
*/
|
|
*/
|
|
- @TableField("change_reason")
|
|
|
|
- private String changeReason;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonArrayTypeHandler.class)
|
|
|
|
+ private JSONArray changeReason;
|
|
|
|
|
|
|
|
+ @TableField("change_reason_other_value")
|
|
|
|
+ private String changeReasonOtherValue;
|
|
/**
|
|
/**
|
|
* 天气情况
|
|
* 天气情况
|
|
*/
|
|
*/
|
|
@@ -180,14 +183,14 @@ public class CaseInquestCriminal implements Serializable {
|
|
/**
|
|
/**
|
|
* 光线
|
|
* 光线
|
|
*/
|
|
*/
|
|
- @TableField("light")
|
|
|
|
- private String light;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonArrayTypeHandler.class)
|
|
|
|
+ private JSONArray light;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 勘验指挥人
|
|
* 勘验指挥人
|
|
*/
|
|
*/
|
|
- @TableField("inquest_commander")
|
|
|
|
- private String inquestCommander;
|
|
|
|
|
|
+ @TableField(typeHandler = JsonObjTypeHandler.class)
|
|
|
|
+ private JSONObject inquestCommander;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 勘验情况
|
|
* 勘验情况
|
|
@@ -247,5 +250,14 @@ public class CaseInquestCriminal implements Serializable {
|
|
@TableField("update_time")
|
|
@TableField("update_time")
|
|
private Date updateTime;
|
|
private Date updateTime;
|
|
|
|
|
|
|
|
+ @TableField(exist = false)
|
|
|
|
+ private List<Date> times;
|
|
|
|
+
|
|
|
|
+ public Date getStartTime() {
|
|
|
|
+ return times.get(0);
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ public Date getEndTime() {
|
|
|
|
+ return times.get(1);
|
|
|
|
+ }
|
|
}
|
|
}
|