Merge branch 'feat-showgigtime' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -212,6 +212,12 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "结算成功时间")
 	private LocalDateTime notifyDate;
+
+	/**
+	 * 提交到零工时间
+	 */
+	@TableField(exist = false)
+	private LocalDateTime subToGigTime;
 	/**
 	 * 创建人
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -70,4 +70,9 @@ public class WmScorePackageSettleOutput {
 	 */
 	private String omsOrderSn;
 
+	/**
+	 * 提交到零工时间
+	 */
+	private LocalDateTime subToGigTime;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -1485,6 +1485,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					ouPut.setSettleStatus(String.valueOf(settleNote.getSettleNoteStatus()));
 				}
 				ouPut.setSubjectLocation(settleNote.getSubjectLocation());
+				ouPut.setSubToGigTime(settleNote.getSubToGigTime());
 			}
 			if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(ouPut.getPackageType1())) {
 				// 如果是患者教育，则转换积分值 '分'->'元'
@@ -2059,6 +2060,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		if (note != null) {
 			scorePackage.setNotifyDate(note.getNotifyTime());
+			scorePackage.setSubToGigTime(note.getSubToGigTime());
 		}
 
 		if (packageType2 == 2) {