feat: 积分包记录加结算状态和回调时间

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -45,6 +45,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmDaHospital;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaPharmacy;
 import com.qunzhixinxi.hnqz.admin.entity.WmFeedback;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageStatus;
 import com.qunzhixinxi.hnqz.admin.entity.WmScoreTaskType;
 import com.qunzhixinxi.hnqz.admin.entity.WmTask;
@@ -67,11 +68,11 @@ import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
-import com.qunzhixinxi.hnqz.admin.enums.SettleStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
 import com.qunzhixinxi.hnqz.admin.enums.TaskStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.UserSignResultEnum;
+import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageSettleNoteMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScoreTaskTypeMapper;
 import com.qunzhixinxi.hnqz.admin.service.MedicalEquipmentService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptCsmService;
@@ -218,6 +219,7 @@ public class ApiController {
 	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
 	private final SysDeptCsmService deptCsmService;
 	private final MedicalEquipmentService medicalEquipmentService;
+	private final WmScorePackageSettleNoteMapper wmScorePackageSettleNoteMapper;
 
 	@SysLog("通过任务类型获取表单配置")
 	@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
@@ -1822,8 +1824,18 @@ public class ApiController {
 
 			scorePackageList = scorePage.getRecords();
 			if (CollectionUtils.isNotEmpty(scorePackageList)) {
+				Set<String> scorePackageIds = scorePackageList.stream().map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
+				List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+						.in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
+				Map<String, LocalDateTime> settelMap = new HashMap<>();
+				if (CollUtil.isNotEmpty(settleNotes)) {
+					settelMap = settleNotes.stream()
+							.filter(note -> StrUtil.isNotBlank(note.getPackageId()) && note.getNotifyTime() != null)
+							.collect(Collectors.toMap(WmScorePackageSettleNote::getPackageId, WmScorePackageSettleNote::getNotifyTime));
+				}
 //				Map<String, Object> map = new HashMap<>();
 				for (WmScorePackageApiOutput item : scorePackageList) {
+					item.setNotifyTime(settelMap.get(item.getId()));
 //					WmScorePackage item = wmScorePackageService.getById(status1.getPackageId());
 //					map.put("id", item.getId());
 //					map.put("packageName", item.getScorePackageName());

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

@@ -56,6 +56,14 @@ public class WmScorePackageApiOutput {
 
 	private Integer waitApprovalTaskNum;
 
-
+	/**
+	 * 积分包状态
+	 */
+	private String scorePackageStatus;
+
+	/**
+	 * 回调时间
+	 */
+	private LocalDateTime notifyTime;
 
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageStatusMapper.xml

@@ -101,7 +101,7 @@
 	<select id="getReceivedPackageList" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput">
 		SELECT s.enable_flag, s.id statusId, p.id, p.score_package_name, p.send_package_dept_id, s.task_add_flag,
 		p.create_time, p.package_type1, p.user_num, p.task_num, p.description, p.belong_date,
-		p.score, s.enable_type, s.status, s.task_num taskNum2 , s.create_time receiveTime, d.name packageEntName
+		p.score, p.score_package_status, s.enable_type, s.status, s.task_num taskNum2 , s.create_time receiveTime, d.name packageEntName
 		FROM
 		wm_score_package_status s, wm_score_package p , sys_dept d
 		WHERE s.package_id = p.id AND p.send_package_dept_id = d.dept_id