Merge branch 'feature-settlesucctimedisplay-20210726'

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

@@ -202,6 +202,13 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	 */
 	@ApiModelProperty(value = "结算时间")
 	private LocalDateTime settlementDate;
+
+	/**
+	 * 结算时间
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "结算成功时间")
+	private LocalDateTime notifyDate;
 	/**
 	 * 创建人
 	 */

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

@@ -47,6 +47,7 @@ import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xssf.extractor.XSSFExportToXml;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -68,14 +69,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 	private final WmScorePackageMapper wmScorePackageMapper;
 	private final SysDeptRelationMapper sysDeptRelationMapper;
-	private final WmTaskRuleMapper wmTaskRuleMapper;
 	private final WmTaskMapper wmTaskMapper;
 	private final SysDeptMapper sysDeptMapper;
 	private final SysUserMapper sysUserMapper;
 	private final WmScoreTaskTypeMapper wmScoreTaskTypeMapper;
 	private final SysDeptService sysDeptService;
 	private final WmDaAgentService wmDaAgentService;
-	private final SysDictItemMapper sysDictItemMapper;
 	private final WmScorePackageStatusService wmScorePackageStatusService;
 	private final WmTaskTypeMapper wmTaskTypeMapper;
 	private final WmDaDrugEntService wmDaDrugEntService;
@@ -756,6 +755,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		IPage<WmScorePackage> pages = wmScorePackageMapper.getScorePackagekList(page, wmScorePackage);
 		List<WmScorePackage> records = pages.getRecords();
 		for (WmScorePackage wmScorePackage1 : records) {
+
+			List<WmScorePackageSettleNote> list =settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+					.eq(WmScorePackageSettleNote::getPackageId, wmScorePackage1.getId()));
+			if (CollectionUtil.isNotEmpty(list)){
+				wmScorePackage1.setNotifyDate(list.get(0).getNotifyTime());
+			}
+
 			if ("2".equals(wmScorePackage.getPackageType2())) {
 				WmScorePackageSettleNote wsquery = new WmScorePackageSettleNote();
 				wsquery.setPackageId(wmScorePackage1.getId());