Ver código fonte

feat: 结算包结算列表-结算相关时间修改

李学松 2 anos atrás
pai
commit
e46b97dbd4

+ 3 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -1188,6 +1188,9 @@ public class WmTaskController {
 					WmScorePackageSettleNote settleNote = settleNoteMap.get(wmTask.getId());
 					if (settleNote != null) {
 						wmTask.setSettleStatus(settleNote.getSettleNoteStatus());
+						wmTask.setSubToGigTime(settleNote.getSubToGigTime());
+						wmTask.setNotifyDate(settleNote.getNotifyTime());
+						wmTask.setSubTime(settleNote.getSubTime());
 					} else {
 						wmTask.setSettleStatus(Integer.valueOf(SettleStatusEnum.SETTLE_STATUS_NOTSETTLE.getVal()));
 					}

+ 18 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmTask.java

@@ -267,4 +267,22 @@ public class WmTask extends Model<WmTask> {
 	 */
 	@TableField(exist = false)
 	private Integer settleStatus;
+
+	/**
+	 * 提交时间
+	 */
+	@TableField(exist = false)
+	private LocalDateTime subTime;
+
+	/**
+	 * 提交到零工时间
+	 */
+	@TableField(exist = false)
+	private LocalDateTime subToGigTime;
+
+	/**
+	 * 结算时间
+	 */
+	@TableField(exist = false)
+	private LocalDateTime notifyDate;
 }

+ 5 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/output/WmTaskSettleNoteOutput.java

@@ -135,6 +135,11 @@ public class WmTaskSettleNoteOutput {
 	 */
 	private LocalDateTime subTime;
 
+	/**
+	 * 提交到零工平台的时间
+	 */
+	private LocalDateTime subToGigTime;
+
 	/**
 	 * 回调时间
 	 */

+ 2 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageSettleNoteMapper.xml

@@ -110,6 +110,7 @@
 		e.actual_amount,
 		e.settle_note_status,
 		e.sub_time,
+		e.sub_to_gig_time,
 		e.notify_time
 		FROM wm_task t
 		LEFT JOIN wm_task_content c on t.task_content_id = c.id
@@ -165,6 +166,7 @@
 		e.actual_amount,
 		e.settle_note_status,
 		e.sub_time,
+		e.sub_to_gig_time,
 		e.notify_time
 		FROM wm_task t
 		LEFT JOIN wm_score_package p on p.id = t.score_package_id