Merge branch 'feat-20230420-querycondition2' into temp-pre

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

@@ -18,8 +18,8 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,6 +28,7 @@ import com.qunzhixinxi.hnqz.admin.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.entity.vo.WmTaskVO;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.admin.entity.WmReport;
@@ -40,8 +41,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 /**
@@ -59,6 +62,7 @@ public class WmReportController {
 	private final  WmReportService wmReportService;
 	private final WmScorePackageService wmScorePackageService;
 	private final WmTaskService wmTaskService;
+	private final WmTaskTypeService wmTaskTypeService;
 	/**
 	 * 分页查询
 	 * @param page 分页对象
@@ -263,12 +267,12 @@ public class WmReportController {
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/getTaskListPage" )
-	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage) {
+	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId) {
 		WmReport wmReport1=wmReportService.getById(wmReport.getId());
 		if(null==wmReport1){
 			return R.failed("未查询到报告信息");
 		}
-		return wmReportService.getTaskListPage(page,wmReport1, isApprovalPage);
+		return wmReportService.getTaskListPage(page,wmReport1, isApprovalPage, taskTypeId);
 	}
 
 	/**
@@ -285,6 +289,41 @@ public class WmReportController {
 		return wmReportService.taskPageByTaskType(page, taskTypeName, entTaskStatus);
 	}
 
-
+	/**
+	 * 查询待审核的任务类型
+	 *
+	 * @param reportId       报告id
+	 * @return 列表数据
+	 */
+	@GetMapping("/list-package-task-type")
+	public R<?> listPackageTaskType(@RequestParam("id") String reportId, Integer isApprovalPage) {
+		WmReport wmReport1 = wmReportService.getById(reportId);
+		if(null == wmReport1){
+			return R.failed("未查询到报告信息");
+		}
+		// 获取待审核的任务
+		WmScorePackage scorePackage = wmScorePackageService.getById(wmReport1.getScoreId());
+		LambdaQueryWrapper<WmTask> lambdaQueryWrapper= Wrappers.<WmTask>query().lambda();
+		lambdaQueryWrapper.and(wrapper -> wrapper.eq(WmTask::getReportDrugId, reportId)
+				.or().eq(WmTask::getReportOneId, reportId)
+				.or().eq(WmTask::getReportSecondId, reportId));
+		// 如果是审批页面，则过滤掉通过和不通过的数据（reportDrugApprovalOpinion或reportOneApprovalOpinion：1通过，2不通过）
+		if (isApprovalPage != null && isApprovalPage.equals(1)) {
+			if ("0".equals(scorePackage.getTypeid())) {//药企
+				lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
+			} else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
+				lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
+			} else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
+				lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
+			}
+		}
+		lambdaQueryWrapper.select(WmTask::getTaskTypeId);
+		List<WmTask> wmTasks = wmTaskService.list(lambdaQueryWrapper);
+		if (CollUtil.isEmpty(wmTasks)) {
+			return R.ok(Collections.emptyList());
+		}
+		Set<String> taskTypes = wmTasks.stream().map(WmTask::getTaskTypeId).collect(Collectors.toSet());
+		return R.ok(wmTaskTypeService.listByIds(taskTypes));
+	}
 
 }

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

@@ -136,6 +136,11 @@ public class SysUserSub extends Model<SysUserSub> {
 	 */
 	private LocalDateTime updateTime;
 
+	/**
+	 * 认证回调时间
+	 */
+	private LocalDateTime callbackTime;
+
 	/**
 	 * 创建人
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -183,6 +183,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getSubjectLocation, SubjectLocation.ZHONG_ZHI)
 				.eq(SysUserSub::getGigType, GigTypeEnum.ZHONG_ZHI)
 				.set(SysUserSub::getUpdateTime, now)
+				.set(SysUserSub::getCallbackTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult));
 
@@ -275,6 +276,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getGigType, GigTypeEnum.HUI_QI_YUN)
 				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
+				.set(SysUserSub::getCallbackTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult));
 
@@ -320,6 +322,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getGigType, GigTypeEnum.LANG_CHAO)
 				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
+				.set(SysUserSub::getCallbackTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult));
 
@@ -373,6 +376,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getGigType, GigTypeEnum.ZHENG_QI_ZHI_XING)
 				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
+				.set(SysUserSub::getCallbackTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult));
 
@@ -412,6 +416,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getGigType, GigTypeEnum.TAX_HELPOR)
 				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
+				.set(SysUserSub::getCallbackTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult))
 				.set(SysUserSub::getCertStatus, taxHelperCertStatus.getCode());
@@ -461,6 +466,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 				.eq(SysUserSub::getGigType, GigTypeEnum.YEE)
 				.eq(SysUserSub::getSubjectLocation, SubjectLocation.YI_LIAN)
 				.set(SysUserSub::getUpdateTime, now)
+				.set(SysUserSub::getCallbackTime, now)
 				.set(SysUserSub::getUpdateUser, 0)
 				.set(SysUserSub::getCertRemark, JSONUtil.toJsonStr(subjectResult));
 		// 如果是已签约并且当前不是已认证，则设置一下状态（处理阿拉丁没有回调的情况）

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

@@ -50,7 +50,7 @@ public interface WmReportService extends IService<WmReport> {
 	 */
 	R<?> approvalReportByTaskType(List<String> taskIds, String approvalOpinion, String approvalInfo);
 
-	R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage);
+	R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId);
 
 	IPage<WmReport> getReportListPage(Page page, WmReport wmReport, String scoreId, String name);
 

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

@@ -270,7 +270,9 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 		updateUserSub.setCertRemark(String.format("%s;%s", userSub.getCertRemark(), String.format("签约回调：%s;", resMsg)));
 		updateUserSub.setFailReason(String.format("签约回调：%s;", resMsg));
 		updateUserSub.setCallbackStatus(GigCallBackStatus.RETURNED);
-		updateUserSub.setUpdateTime(LocalDateTime.now());
+		LocalDateTime now = LocalDateTime.now();
+		updateUserSub.setUpdateTime(now);
+		updateUserSub.setCallbackTime(now);
 		updateUserSub.setUpdateUser(0);
 		sysUserSubService.updateById(updateUserSub);
 
@@ -855,7 +857,9 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			updateUserSubWrapper.set(SysUserSub::getIdCardFrontUrl, null);
 			updateUserSubWrapper.set(SysUserSub::getIdCardBackUrl, null);
 		}
-		updateUserSubWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
+		LocalDateTime now = LocalDateTime.now();
+		updateUserSubWrapper.set(SysUserSub::getUpdateTime, now);
+		updateUserSubWrapper.set(SysUserSub::getCallbackTime, now);
 		updateUserSubWrapper.set(SysUserSub::getUpdateUser, 0);
 		updateUserSubWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
 		if ("0".equals(req.getCode())) {
@@ -930,7 +934,9 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 			subMap.put("certStatus", OladingCertStatus.SIGNED.name());
 			updateUserSubWrapper.set(SysUserSub::getCertStatus, Integer.valueOf(OladingCertStatus.SIGNED.getCode()));
 		}
-		updateUserSubWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
+		LocalDateTime now = LocalDateTime.now();
+		updateUserSubWrapper.set(SysUserSub::getUpdateTime, now);
+		updateUserSubWrapper.set(SysUserSub::getCallbackTime, now);
 		updateUserSubWrapper.set(SysUserSub::getUpdateUser, 0);
 		updateUserSubWrapper.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED);
 		if ("0".equals(req.getCode())) {

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

@@ -497,13 +497,15 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
 	/**
 	 * 报告管理--查看
+	 *
 	 * @param page
 	 * @param wmReport
 	 * @param isApprovalPage 1审批，0查看
+	 * @param taskTypeId
 	 * @return
 	 */
 	@Override
-	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage) {
+	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId) {
 		Page pages=null;
 		WmScorePackage scorePackage=wmScorePackageService.getById(wmReport.getScoreId());
 		WmTask wmTask=new WmTask();
@@ -521,6 +523,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
 			}
 		}
+		if (StrUtil.isNotBlank(taskTypeId)) {
+			lambdaQueryWrapper.eq(WmTask::getTaskTypeId, taskTypeId);
+		}
 		pages=wmTaskService.page(page, lambdaQueryWrapper);
 //		if("0".equals(scorePackage.getTypeid())){//药企
 //			wmTask.setReportDrugId(wmReport.getId());