Merge branch 'hotfix-20230925-batchapprovalbug' into temp-pre

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

@@ -41,6 +41,8 @@ public interface WmDaDistributionService extends IService<WmDaDistribution> {
 
 	public R updateByApproval(Map<String,String> map);
 
+	R updateByapprovalForManualOperation(Map<String,String> map);
+
 	/**
 	 * 解析商业公司地址
 	 */

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

@@ -43,6 +43,14 @@ public interface WmDaHospitalService extends IService<WmDaHospital> {
 
 	public R updateByApproval(Map<String,String> map);
 
+	/**
+	 * 手动处理调查信息入库
+	 *
+	 * @param map
+	 * @return
+	 */
+	R updateByApprovalForManualOperation(Map<String,String> map);
+
 	public Map<String,String> compareDictItem(String name, String str1, String str2, String param);
 
 	/**

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

@@ -36,6 +36,8 @@ public interface WmDaPharmacyService extends IService<WmDaPharmacy> {
 
 	R updateByapproval(Map<String, String> map);
 
+	R updateByapprovalForManualOperation(Map<String, String> map);
+
 	/**
 	 * 根据经纬度查询
 	 *

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

@@ -228,4 +228,13 @@ public interface WmTaskService extends IService<WmTask> {
 	 * @param taskStatusInfo 审批说明
 	 */
 	void task15_30_16_18(WmTask task, String taskStatus, String taskStatusInfo);
+
+	/**
+	 * 更新调查信息数据(只入库调查信息数据,不更新任务和积分包数据,用于手动处理)
+	 *
+	 * @param task 任务信息
+	 * @param taskStatus 审核状态
+	 * @param taskStatusInfo 审批说明
+	 */
+	void task15_30_16_18ForManualOperation(WmTask task, String taskStatus, String taskStatusInfo);
 }

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

@@ -494,6 +494,121 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 		return R.ok();
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R updateByapprovalForManualOperation(Map<String, String> map) {
+		//先更新任务表
+		String taskId=map.get("taskId");
+		WmTask wmTask=wmTaskService.getById(taskId);
+		if(wmTask==null){
+			return R.failed("未查询到调查信息");
+		}
+		String approvalInfo=map.get("approvalInfo");
+		String approvalOpinion=map.get("approvalOpinion");
+		String compareResult=map.get("compareResult");
+
+//		LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<WmTask>();
+//		updateWrapper.set(WmTask::getPlatAuditStatus,"1");
+//		updateWrapper.set(WmTask::getApprovalOpinion,approvalOpinion);
+//		updateWrapper.set(WmTask::getCompareResult,compareResult);
+//		updateWrapper.set(WmTask::getApprovalInfo,approvalInfo);
+//		updateWrapper.eq(WmTask::getTaskContentId,wmTask.getTaskContentId());
+//		updateWrapper.eq(WmTask::getCreateTime,wmTask.getCreateTime());
+
+//		WmTask updateTask = new WmTask();
+//		updateTask.setId(taskId);
+//		updateTask.setPlatAuditStatus("1");
+//		updateTask.setApprovalOpinion(approvalOpinion);
+//		updateTask.setCompareResult(compareResult);
+//		updateTask.setApprovalInfo(approvalInfo);
+
+//		wmTask.setApprovalInfo(approvalInfo);
+//		wmTask.setApprovalOpinion(approvalOpinion);
+//		wmTask.setCompareResult(compareResult);
+//		wmTask.setPlatAuditStatus("1");
+//		wmTaskService.updateById(wmTask);
+		WmDaDistribution wmDaDistribution=generateDistribution(map);
+
+		if("1".equals(approvalOpinion)){//采纳
+			// TODO 根据任务积分修改积分包状态
+//			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
+//			updateTask.setRealFlag("0");
+			//更新审核信息
+			LocalDateTime now = LocalDateTime.now();
+//			Integer userId = SecurityUtils.getUser().getId();
+			if("1".equals(compareResult)){//新增
+				//新增
+				wmDaDistribution.setCreateTime(now);
+//				wmDaDistribution.setCreateUser(userId);
+				this.save(wmDaDistribution);
+			}else if("2".equals(compareResult)){//信息不一致
+				wmDaDistribution.setUpdateTime(now);
+//				wmDaDistribution.setUpdateUser(userId);
+				this.updateById(wmDaDistribution);
+			}else if("3".equals(compareResult)){//信息一致
+				//信息一致的情况下，只改地址
+				if(!StringUtil.isEmpty(map.get("address"))){
+					WmDaDistribution wmDaDistribution1=new WmDaDistribution();
+					wmDaDistribution1.setId(wmDaDistribution.getId());
+					wmDaDistribution1.setAddress(map.get("address"));
+					wmDaDistribution1.setLongitude(map.get("longitude"));
+					wmDaDistribution1.setLatitude(map.get("latitude"));
+					wmDaDistribution1.setUpdateTime(now);
+//					wmDaDistribution1.setUpdateUser(userId);
+					this.updateById(wmDaDistribution1);
+				}
+			}
+			//更新任务内容表
+			WmTaskContent wmTaskContent=wmTaskContentMapper.selectById(wmTask.getTaskContentId());
+			String infoId=map.get("infoId");
+			wmTaskContent.setTemp29(infoId);
+			wmTaskContentMapper.updateById(wmTaskContent);
+		}else{
+			//updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
+//			updateWrapper.set(WmTask::getRealFlag,"1");//1不通过
+//			updateTask.setRealFlag("1");
+		}
+
+		//提交
+//		updateTask.setTaskStatus("2");
+		WmScorePackage wmScorePackage = packageService.getById(wmTask.getScorePackageId());
+// 		if("1".equals(approvalOpinion)){
+// 			if("1".equals(wmScorePackage.getPackageType1())){
+// 				Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
+// 				if(fullFlag){
+// //					return R.failed(1, "每日最多提交5万积分");
+// 					updateTask.setScore(0);
+// 				}
+//
+// 			}
+// 		}
+
+//		wmTaskService.updateById(updateTask);
+
+		//审核之后的操作//采纳
+//		if("1".equals(approvalOpinion)){
+//		}else {
+
+		//更新积分包状态
+
+		WmScorePackageStatus query = new WmScorePackageStatus();
+		query.setUserId(wmTask.getTaskUserId());
+		query.setPackageId(wmTask.getScorePackageId());
+		query.setStatus("2");
+		WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
+
+		/**
+		 * 不需要释放 直接返回
+		 */
+//			if("1".equals(wmScorePackage.getTaskAddFlag()) && "1".equals(scorePackageStatus.getTaskAddFlag())){
+//				return R.ok();
+//			}
+
+		packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
+//		}
+		return R.ok();
+	}
+
 	/**
 	 * 解析商业公司地址
 	 */

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

@@ -606,6 +606,123 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 		return R.ok();
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R updateByApprovalForManualOperation(Map<String, String> map) {
+		//先更新任务表
+		String taskId = map.get("taskId");
+		WmTask wmTask = wmTaskService.getById(taskId);
+		if (wmTask == null) {
+			return R.failed("未查询到调查信息");
+		}
+		String approvalInfo = map.get("approvalInfo");
+		String approvalOpinion = map.get("approvalOpinion");
+		String compareResult = map.get("compareResult");
+		//更新时，同一个task_content_id和createtime下的数据，都要更新状态为已审核
+//		LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<WmTask>();
+//		updateWrapper.set(WmTask::getPlatAuditStatus,"1");
+//		updateWrapper.set(WmTask::getApprovalOpinion,approvalOpinion);
+//		updateWrapper.set(WmTask::getCompareResult,compareResult);
+//		updateWrapper.set(WmTask::getApprovalInfo,approvalInfo);
+//		updateWrapper.eq(WmTask::getTaskContentId,wmTask.getTaskContentId());
+//		updateWrapper.eq(WmTask::getCreateTime,wmTask.getCreateTime());
+//		WmTask updateTask = new WmTask();
+//		updateTask.setId(taskId);
+//		updateTask.setPlatAuditStatus("1");
+//		updateTask.setApprovalOpinion(approvalOpinion);
+//		updateTask.setCompareResult(compareResult);
+//		updateTask.setApprovalInfo(approvalInfo);
+
+		WmDaHospital wmDaHospital = generateHospital(map);
+
+		if ("1".equals(approvalOpinion)) {//采纳
+			//updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
+			// TODO 根据任务积分修改积分包状态
+
+//			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
+//			updateTask.setRealFlag("0");
+
+			//更新审核信息
+			LocalDateTime now = LocalDateTime.now();
+			Integer userId = SecurityUtils.getUser().getId();
+			if ("1".equals(compareResult)) {//新增
+				//新增
+				wmDaHospital.setCreateTime(now);
+				wmDaHospital.setCreateUser(userId);
+				wmDaHospital.setLongitude(map.get("longitude"));
+				wmDaHospital.setLatitude(map.get("latitude"));
+				this.save(wmDaHospital);
+			} else if ("2".equals(compareResult)) {//信息不一致
+				wmDaHospital.setUpdateTime(now);
+				wmDaHospital.setUpdateUser(userId);
+				this.updateById(wmDaHospital);
+			} else if ("3".equals(compareResult)) {//信息一致
+				//信息一致的情况下，只改地址
+				if (!StringUtil.isEmpty(map.get("address"))) {
+					WmDaHospital wmDaHospital1 = new WmDaHospital();
+					wmDaHospital1.setId(wmDaHospital.getId());
+					wmDaHospital1.setAddress(map.get("address"));
+					wmDaHospital1.setLongitude(map.get("longitude"));
+					wmDaHospital1.setLatitude(map.get("latitude"));
+					wmDaHospital1.setUpdateTime(now);
+					wmDaHospital1.setUpdateUser(userId);
+					this.updateById(wmDaHospital1);
+				}
+			}
+
+
+			//更新任务内容表
+			WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
+			String infoId = map.get("infoId");
+			wmTaskContent.setTemp29(infoId);
+			wmTaskContentMapper.updateById(wmTaskContent);
+		} else {
+			//updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
+//			updateWrapper.set(WmTask::getRealFlag,"1");//1bu通过
+//			updateTask.setRealFlag("1");
+		}
+		//提交
+//		updateTask.setTaskStatus("2");
+		LocalDateTime localDateTime = LocalDateTime.now();
+//		updateTask.setUpdateTime(localDateTime);
+
+		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
+// 		if ("1".equals(approvalOpinion)) {
+// 			if ("1".equals(wmScorePackage.getPackageType1())) {
+// 				Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
+// 				if (fullFlag) {
+// //					return R.failed(1, "每日最多提交5万积分");
+// 					updateTask.setScore(0);
+// 				}
+//
+// 			}
+// 		}
+//		wmTaskService.updateById(updateTask);
+//		wmTaskService.update(updateWrapper);
+
+		//审核之后的操作 //采纳
+//		if("1".equals(approvalOpinion)){
+//		}else {
+		//更新积分包状态
+
+		WmScorePackageStatus query = new WmScorePackageStatus();
+		query.setUserId(wmTask.getTaskUserId());
+		query.setPackageId(wmTask.getScorePackageId());
+		query.setStatus("2");
+		WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
+
+		/**
+		 * 不需要释放 直接返回
+		 */
+//			if("1".equals(wmScorePackage.getTaskAddFlag()) && "1".equals(scorePackageStatus.getTaskAddFlag())){
+//				return R.ok();
+//			}
+
+//		packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
+//		}
+		return R.ok();
+	}
+
 
 	public WmDaHospital generateHospital(Map<String, String> map) {
 		WmDaHospital wmDaHospital = new WmDaHospital();

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

@@ -122,6 +122,150 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 		return R.ok(result);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R updateByapprovalForManualOperation(Map<String, String> map) {
+		String taskId=map.get("taskId");
+		WmTask wmTask=wmTaskService.getById(taskId);
+		if(wmTask==null){
+			return R.failed("未查询到调查信息");
+		}
+		String approvalInfo=map.get("approvalInfo");
+		String approvalOpinion=map.get("approvalOpinion");
+		String compareResult=map.get("compareResult");
+		//更新时，同一个task_content_id和createtime下的数据，都要更新状态为已审核
+//		LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<WmTask>();
+//		updateWrapper.set(WmTask::getPlatAuditStatus,"1");
+//		updateWrapper.set(WmTask::getApprovalOpinion,approvalOpinion);
+//		updateWrapper.set(WmTask::getCompareResult,compareResult);
+//		updateWrapper.set(WmTask::getApprovalInfo,approvalInfo);
+//		updateWrapper.eq(WmTask::getTaskContentId,wmTask.getTaskContentId());
+//		updateWrapper.eq(WmTask::getCreateTime,wmTask.getCreateTime());
+
+//		WmTask updateTask = new WmTask();
+//		updateTask.setId(taskId);
+//		updateTask.setPlatAuditStatus("1");
+//		updateTask.setApprovalOpinion(approvalOpinion);
+//		updateTask.setCompareResult(compareResult);
+//		updateTask.setApprovalInfo(approvalInfo);
+
+		if("1".equals(approvalOpinion)){//采纳
+			//updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
+			// TODO 根据任务积分修改积分包状态
+//			updateWrapper.set(WmTask::getRealFlag,"0");//0审核通过
+//			updateTask.setRealFlag("0");
+
+			WmDaPharmacy wmDaPharmacy = new WmDaPharmacy();
+			WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
+			//更新审核信息
+			LocalDateTime now = LocalDateTime.now();
+//			Integer userId = SecurityUtils.getUser().getId();
+			if("1".equals(compareResult)){//新增
+				//新增
+				wmDaPharmacy.setPharmacyName(wmTaskContent.getTemp3());//名称
+				wmDaPharmacy.setAddress(wmTaskContent.getTemp4());//名称
+				if (!StringUtil.isEmpty(wmTaskContent.getTemp7())) {//省市区
+					String[] citys = wmTaskContent.getTemp7().split("-");
+					if(citys.length==3) {
+						wmDaPharmacy.setProvince(citys[0]);
+						wmDaPharmacy.setCity(citys[1]);
+						wmDaPharmacy.setArea(citys[2]);
+					}else {
+						String[] citys1=wmTaskContent.getTemp7().split(",");
+						if(citys1.length==3) {
+							wmDaPharmacy.setProvince(citys1[0]);
+							wmDaPharmacy.setCity(citys1[1]);
+							wmDaPharmacy.setArea(citys1[2]);
+						}
+					}
+				}
+				wmDaPharmacy.setCreateTime(now);
+				wmDaPharmacy.setCreateUser(0);
+				// 根据地址转换经纬度
+				this.convertToLatAndLong(wmDaPharmacy);
+				this.save(wmDaPharmacy);
+			}else if("2".equals(compareResult)){//信息不一致
+				//对比药店和调研信息,只有所属地区不一样
+//				List<WmDaPharmacy> wdplist=wmDaPharmacyMapper.slectByParam(wmTaskContent.getTemp3());
+//				if(null!=wdplist&&wdplist.size()>0){
+//					wmDaPharmacy=wdplist.get(0);
+//				}
+//				String address=wmDaPharmacy.getProvince()+"-"+wmDaPharmacy.getCity()+"-"+wmDaPharmacy.getArea();
+//				if(null!=wmTaskContent.getTemp7()&&!wmTaskContent.getTemp7().equals(address)){
+//					String[] citys=wmTaskContent.getTemp7().split("-");
+//					if(citys.length==3){
+//						wmDaPharmacy.setProvince(citys[0]);
+//						wmDaPharmacy.setCity(citys[1]);
+//						wmDaPharmacy.setArea(citys[2]);
+//					}else {
+//						String[] citys1=wmTaskContent.getTemp7().split(",");
+//						if(citys1.length==3) {
+//							wmDaPharmacy.setProvince(citys1[0]);
+//							wmDaPharmacy.setCity(citys1[1]);
+//							wmDaPharmacy.setArea(citys1[2]);
+//						}
+//					}
+//				}
+//				wmDaPharmacy.setId(map.get("infoId"));
+//				wmDaPharmacy.setPharmacyName(wmTaskContent.getTemp3());//名称
+//				wmDaPharmacy.setAddress(wmTaskContent.getTemp4());
+//				wmDaPharmacy.setUpdateTime(now);
+//				wmDaPharmacy.setUpdateUser(userId);
+				// 根据地址转换经纬度
+//				this.convertToLatAndLong(wmDaPharmacy);
+				//更新药店信息;
+//				this.updateById(wmDaPharmacy);
+			}
+
+		}else{
+			//updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
+//			updateWrapper.set(WmTask::getRealFlag,"1");//1不通过
+
+//			updateTask.setRealFlag("1");
+		}
+		//提交
+//		updateTask.setTaskStatus("2");
+		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
+// 		if("1".equals(approvalOpinion)){
+// 			if("1".equals(wmScorePackage.getPackageType1())){
+// 				Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
+// 				if(fullFlag){
+// //					return R.failed(1, "每日最多提交5万积分");
+// 					updateTask.setScore(0);
+// 				}
+//
+// 			}
+// 		}
+//		wmTaskService.updateById(updateTask);
+//		wmTaskService.update(updateWrapper);
+
+//		if("1".equals(approvalOpinion)){
+//
+//		}else {
+
+			/**
+			 * 审核不通过可能需要释放积分
+			 */
+			//更新积分包状态
+//			WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
+			WmScorePackageStatus query = new WmScorePackageStatus();
+			query.setUserId(wmTask.getTaskUserId());
+			query.setPackageId(wmTask.getScorePackageId());
+			query.setStatus("2");
+			WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
+
+			/**
+			 * 不需要释放 直接返回
+			 */
+//			if("1".equals(wmScorePackage.getTaskAddFlag()) && "1".equals(scorePackageStatus.getTaskAddFlag())){
+//				return R.ok();
+//			}
+
+//			packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
+//		}
+		return R.ok();
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R updateByapproval(Map<String, String> map) {

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

@@ -2825,6 +2825,52 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		}
 	}
 
+	/**
+	 * 更新调查信息数据(只入库调查信息数据,不更新任务和积分包数据,用于手动处理)
+	 *
+	 * @param task 任务信息
+	 * @param taskStatus 审核状态
+	 * @param taskStatusInfo 审批说明
+	 */
+	public void task15_30_16_18ForManualOperation(WmTask task, String taskStatus, String taskStatusInfo) {
+
+		// 调查信息审核（15、30-医院 16-商业公司 18-药店）
+		String approvalOpinion = taskStatus.equals(TaskStatusEnum.APPROVED.val()) ? "1" : "2";
+		if ("15".equals(task.getTaskTypeId()) || "30".equals(task.getTaskTypeId())) {
+			Map<String, Object> data = (Map<String, Object>) wmDaHospitalService.approvalHospital(task.getId()).getData();
+			WmTask _wmTask = (WmTask) data.get("wmTask");
+			Map<String, String> paramMap = BeanUtil.toBean(data.get("newinfo"), Map.class);
+			paramMap.put("approvalInfo", taskStatusInfo);
+			paramMap.put("approvalOpinion", approvalOpinion);
+			paramMap.put("compareResult", _wmTask.getCompareResult());
+			paramMap.put("taskId", task.getId());
+			log.info("更新调查信息数据hospital:{}", paramMap);
+			wmDaHospitalService.updateByApprovalForManualOperation(paramMap);
+		} else if ("16".equals(task.getTaskTypeId())) {
+			Map<String, Object> data = (Map<String, Object>) wmDaDistributionService.approvalDistribution(task.getId()).getData();
+			WmTask _wmTask = (WmTask) data.get("wmTask");
+			Map<String, String> paramMap = BeanUtil.toBean(data.get("newinfo"), Map.class);
+			paramMap.put("approvalInfo", taskStatusInfo);
+			paramMap.put("approvalOpinion", approvalOpinion);
+			paramMap.put("compareResult", _wmTask.getCompareResult());
+			paramMap.put("taskId", task.getId());
+			log.info("更新调查信息数据distribution:{}", paramMap);
+			wmDaDistributionService.updateByapprovalForManualOperation(paramMap);
+		} else if ("18".equals(task.getTaskTypeId())) {
+			Map<String, Object> data = (Map<String, Object>) wmDaPharmacyService.approvalPharmacy(task.getId()).getData();
+			WmTask _wmTask = (WmTask) data.get("_wmTask");
+			WmDaPharmacy info = (WmDaPharmacy) data.get("info");
+			Map<String, String> paramMap = MapUtil.newHashMap(4);
+			paramMap.put("infoId", info.getId());
+			paramMap.put("approvalInfo", taskStatusInfo);
+			paramMap.put("approvalOpinion", approvalOpinion);
+			paramMap.put("compareResult", _wmTask.getCompareResult());
+			paramMap.put("taskId", task.getId());
+			log.info("更新调查信息数据pharmacy:{}", paramMap);
+			wmDaPharmacyService.updateByapprovalForManualOperation(paramMap);
+		}
+	}
+
 	/**
 	 * 移除图片缓存
 	 *

hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmReportApprovalTest.java

@@ -0,0 +1,61 @@
+package com.qunzhixinxi.hnqz.admin;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.qunzhixinxi.hnqz.admin.entity.WmTask;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = {HnqzAdminApplication.class})
+public class WmReportApprovalTest {
+
+    @Autowired
+    private WmTaskService wmTaskService;
+
+//    @Test
+    public void testApprovalData() {
+        String taskIdStr = "315679,\n" +
+                "315681,\n" +
+                "315682,\n" +
+                "315683,\n" +
+                "315685,\n" +
+                "315690,\n" +
+                "315695,\n" +
+                "315697,\n" +
+                "315703,\n" +
+                "315704,\n" +
+                "315705,\n" +
+                "315706,\n" +
+                "315707,\n" +
+                "315708,\n" +
+                "315709,\n" +
+                "315710,\n" +
+                "315711\n";
+        List<String> taskIdList = StrUtil.split(taskIdStr, ",")
+                .stream().map(String::trim)
+                .collect(Collectors.toList());;
+
+        taskIdList.forEach(id -> {
+            // 查询这条任务
+            WmTask queryTask = wmTaskService.getById(id);
+            if (queryTask == null) {
+                throw new RuntimeException("任务不存在");
+            }
+
+
+            // STEP4: 如果是源头积分包，则判断是否审核入库调查信息
+//            if (StringUtils.isNotBlank(reportScorePackage.getRelationScoreId())) {
+                wmTaskService.task15_30_16_18ForManualOperation(queryTask, "3", "手动审核通过入库"+ DateUtil.now());
+//            }
+            System.out.println("处理完成taskID="+id);
+        });
+    }
+}