diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java index daddaba5..fb49a43c 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java @@ -129,11 +129,19 @@ public class TmTask implements Serializable { private List leaseApplyDetails; + @ApiModelProperty(value="协议id") private Integer agreementId; - private Integer backPerson; + @ApiModelProperty(value="退料人") + private String backPerson; + @ApiModelProperty(value="退料人联系电话") private String phone; + @ApiModelProperty(value="退料申请时间") + private String backTime; + @ApiModelProperty(value="退料审核人") private String directAuditBy; + @ApiModelProperty(value="退料审核时间") private String directAuditTime; + @ApiModelProperty(value="退料审核备注") private String directAuditRemark; @ApiModelProperty(value="往来单位id") diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml index 15bd83be..d95d9f27 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml @@ -144,6 +144,9 @@ back_person, + + back_time, + phone, @@ -182,6 +185,9 @@ #{backPerson}, + + #{backTime}, + #{phone}, @@ -272,7 +278,7 @@ UPDATE tm_task tt LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id - SET tt.task_status = '38',bad.audit_num=bad.pre_num + SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW() WHERE bai.id = #{id}