Merge branch 'feat-20230530-miniappsettlestatus'

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,27 @@ public class ApiController {
 
 			scorePackageList = scorePage.getRecords();
 			if (CollectionUtils.isNotEmpty(scorePackageList)) {
+				Set<String> scorePackageIds = scorePackageList.stream()
+						.filter(output -> PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(output.getPackageType1()))
+						.map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
+				List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+						.in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
+				Map<String, List<WmScorePackageSettleNote>> settelMap = new HashMap<>();
+				if (CollUtil.isNotEmpty(settleNotes)) {
+					settelMap = settleNotes.stream()
+							.collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
+				}
 //				Map<String, Object> map = new HashMap<>();
 				for (WmScorePackageApiOutput item : scorePackageList) {
+					if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(item.getPackageType1())) {
+						// 只处理积分包的情况
+						List<WmScorePackageSettleNote> settleNoteList = settelMap.get(item.getId());
+						if (CollUtil.isNotEmpty(settleNoteList)) {
+							WmScorePackageSettleNote settleNote = settleNoteList.get(0);
+							item.setNotifyTime(settleNote.getNotifyTime());
+							item.setSettleNoteStatus(String.valueOf(settleNote.getSettleNoteStatus()));
+						}
+					}
 //					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/dto/SettleConfigDTO.java

@@ -28,7 +28,7 @@ public class SettleConfigDTO implements Serializable {
 	/**
 	 * 各渠道配置
 	 */
-	@NotEmpty(message = "subList必填")
+//	@NotEmpty(message = "subList必填")
 	private List<DeptSub> subList;
 
 	/**

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 settleNoteStatus;
+
+	/**
+	 * 回调时间
+	 */
+	private LocalDateTime notifyTime;
 
 }