移动-退料审核修改

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>  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")

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml

@@ -144,6 +144,9 @@
     <if test="backPerson != null and backPerson != ''">
       back_person,
     </if>
+    <if test="backTime != null and backTime != ''">
+      back_time,
+    </if>
     <if test="phone != null and phone != ''">
       phone,
     </if>
@@ -182,6 +185,9 @@
     <if test="backPerson != null and backPerson != ''">
       #{backPerson},
     </if>
+    <if test="backTime != null and backTime != ''">
+      #{backTime},
+    </if>
     <if test="phone != null and phone != ''">
       #{phone},
     </if>
@@ -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}
     </update>