feat(): 添加处罚反馈中的被处罚人信息字段
parent
fbe0d77f45
commit
e607c022ba
|
|
@ -46,6 +46,12 @@ public class HiddenPenaltyFeedbackCO extends ClientObject {
|
||||||
@ApiModelProperty(value = "处罚业务主键ID")
|
@ApiModelProperty(value = "处罚业务主键ID")
|
||||||
private String hiddenPenaltyId;
|
private String hiddenPenaltyId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "被处罚人ID")
|
||||||
|
private Long penalizedUserId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "被处罚人名称")
|
||||||
|
private String penalizedUserName;
|
||||||
|
|
||||||
@ApiModelProperty(value = "处罚说明")
|
@ApiModelProperty(value = "处罚说明")
|
||||||
private String penaltyDesc;
|
private String penaltyDesc;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,14 @@ public class HiddenPenaltyFeedbackDO extends BaseDO {
|
||||||
@ApiModelProperty(value = "处罚业务主键ID")
|
@ApiModelProperty(value = "处罚业务主键ID")
|
||||||
private String hiddenPenaltyId;
|
private String hiddenPenaltyId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "被处罚人ID")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Long penalizedUserId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "被处罚人名称")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String penalizedUserName;
|
||||||
|
|
||||||
@ApiModelProperty(value = "罚款认缴单(图片URL)")
|
@ApiModelProperty(value = "罚款认缴单(图片URL)")
|
||||||
private String finePaymentReceipt;
|
private String finePaymentReceipt;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -187,6 +187,7 @@
|
||||||
hpf.update_time AS update_time,
|
hpf.update_time AS update_time,
|
||||||
kp.project_name AS project_name,
|
kp.project_name AS project_name,
|
||||||
xci.corp_name AS xgf_corpinfo_name,
|
xci.corp_name AS xgf_corpinfo_name,
|
||||||
|
pu.name AS penalized_user_name,
|
||||||
u.name AS feedback_user_name,
|
u.name AS feedback_user_name,
|
||||||
h.id AS hidden_table_id,
|
h.id AS hidden_table_id,
|
||||||
h.hidden_id AS hidden_id,
|
h.hidden_id AS hidden_id,
|
||||||
|
|
@ -201,6 +202,7 @@
|
||||||
LEFT JOIN ai_alarm aa ON h.foreign_key = aa.ai_alarm_id AND h.source = 1
|
LEFT JOIN ai_alarm aa ON h.foreign_key = aa.ai_alarm_id AND h.source = 1
|
||||||
LEFT JOIN key_project kp2 ON kp2.key_project_id = aa.key_project_id
|
LEFT JOIN key_project kp2 ON kp2.key_project_id = aa.key_project_id
|
||||||
LEFT JOIN corp_info xci ON xci.id = IFNULL(kp.xgf_corpinfo_id, kp2.xgf_corpinfo_id)
|
LEFT JOIN corp_info xci ON xci.id = IFNULL(kp.xgf_corpinfo_id, kp2.xgf_corpinfo_id)
|
||||||
|
LEFT JOIN user pu ON pu.id = hp.penalized_user_id AND pu.delete_enum = 'FALSE'
|
||||||
LEFT JOIN hidden_penalty_feedback hpf ON hpf.hidden_penalty_id = hp.hidden_penalty_id
|
LEFT JOIN hidden_penalty_feedback hpf ON hpf.hidden_penalty_id = hp.hidden_penalty_id
|
||||||
AND hpf.delete_enum = 'FALSE'
|
AND hpf.delete_enum = 'FALSE'
|
||||||
AND hpf.id = (
|
AND hpf.id = (
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue