fix: 快速批量审核更新task失败(调查信息里面重复更新了,已删除)

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

@@ -400,12 +400,12 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 //		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 updateTask = new WmTask();
+//		updateTask.setId(taskId);
+//		updateTask.setPlatAuditStatus("1");
+//		updateTask.setApprovalOpinion(approvalOpinion);
+//		updateTask.setCompareResult(compareResult);
+//		updateTask.setApprovalInfo(approvalInfo);
 
 //		wmTask.setApprovalInfo(approvalInfo);
 //		wmTask.setApprovalOpinion(approvalOpinion);
@@ -417,7 +417,7 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 		if("1".equals(approvalOpinion)){//采纳
 			// TODO 根据任务积分修改积分包状态
 //			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
-			updateTask.setRealFlag("0");
+//			updateTask.setRealFlag("0");
 			//更新审核信息
 			LocalDateTime now = LocalDateTime.now();
 			Integer userId = SecurityUtils.getUser().getId();
@@ -451,12 +451,12 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 		}else{
 			//updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
 //			updateWrapper.set(WmTask::getRealFlag,"1");//1不通过
-			updateTask.setRealFlag("1");
+//			updateTask.setRealFlag("1");
 		}
 
 		//提交
-		updateTask.setTaskStatus("2");
-		WmScorePackage wmScorePackage = packageService.getById(wmTask.getScorePackageId());
+//		updateTask.setTaskStatus("2");
+//		WmScorePackage wmScorePackage = packageService.getById(wmTask.getScorePackageId());
 // 		if("1".equals(approvalOpinion)){
 // 			if("1".equals(wmScorePackage.getPackageType1())){
 // 				Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
@@ -468,7 +468,7 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 // 			}
 // 		}
 
-		wmTaskService.updateById(updateTask);
+//		wmTaskService.updateById(updateTask);
 
 		//审核之后的操作//采纳
 //		if("1".equals(approvalOpinion)){
@@ -476,11 +476,11 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 
 			//更新积分包状态
 
-			WmScorePackageStatus query = new WmScorePackageStatus();
-			query.setUserId(wmTask.getTaskUserId());
-			query.setPackageId(wmTask.getScorePackageId());
-			query.setStatus("2");
-			WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
+//			WmScorePackageStatus query = new WmScorePackageStatus();
+//			query.setUserId(wmTask.getTaskUserId());
+//			query.setPackageId(wmTask.getScorePackageId());
+//			query.setStatus("2");
+//			WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
 
 			/**
 			 * 不需要释放 直接返回
@@ -489,7 +489,7 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 //				return R.ok();
 //			}
 
-			packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
+//			packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
 //		}
 		return R.ok();
 	}

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

@@ -509,12 +509,12 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //		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 updateTask = new WmTask();
+//		updateTask.setId(taskId);
+//		updateTask.setPlatAuditStatus("1");
+//		updateTask.setApprovalOpinion(approvalOpinion);
+//		updateTask.setCompareResult(compareResult);
+//		updateTask.setApprovalInfo(approvalInfo);
 
 		WmDaHospital wmDaHospital = generateHospital(map);
 
@@ -523,7 +523,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 			// TODO 根据任务积分修改积分包状态
 
 //			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
-			updateTask.setRealFlag("0");
+//			updateTask.setRealFlag("0");
 
 			//更新审核信息
 			LocalDateTime now = LocalDateTime.now();
@@ -562,14 +562,14 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 		} else {
 			//updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
 //			updateWrapper.set(WmTask::getRealFlag,"1");//1bu通过
-			updateTask.setRealFlag("1");
+//			updateTask.setRealFlag("1");
 		}
 		//提交
-		updateTask.setTaskStatus("2");
-		LocalDateTime localDateTime = LocalDateTime.now();
-		updateTask.setUpdateTime(localDateTime);
+//		updateTask.setTaskStatus("2");
+//		LocalDateTime localDateTime = LocalDateTime.now();
+//		updateTask.setUpdateTime(localDateTime);
 
-		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
+//		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
 // 		if ("1".equals(approvalOpinion)) {
 // 			if ("1".equals(wmScorePackage.getPackageType1())) {
 // 				Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
@@ -580,7 +580,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //
 // 			}
 // 		}
-		wmTaskService.updateById(updateTask);
+//		wmTaskService.updateById(updateTask);
 //		wmTaskService.update(updateWrapper);
 
 		//审核之后的操作 //采纳
@@ -588,11 +588,11 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //		}else {
 		//更新积分包状态
 
-		WmScorePackageStatus query = new WmScorePackageStatus();
-		query.setUserId(wmTask.getTaskUserId());
-		query.setPackageId(wmTask.getScorePackageId());
-		query.setStatus("2");
-		WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
+//		WmScorePackageStatus query = new WmScorePackageStatus();
+//		query.setUserId(wmTask.getTaskUserId());
+//		query.setPackageId(wmTask.getScorePackageId());
+//		query.setStatus("2");
+//		WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
 
 		/**
 		 * 不需要释放 直接返回
@@ -601,7 +601,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //				return R.ok();
 //			}
 
-		packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
+//		packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
 //		}
 		return R.ok();
 	}

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

@@ -142,18 +142,18 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 //		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 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");
+//			updateTask.setRealFlag("0");
 
 			WmDaPharmacy wmDaPharmacy = new WmDaPharmacy();
 			WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
@@ -221,11 +221,11 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 			//updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
 //			updateWrapper.set(WmTask::getRealFlag,"1");//1不通过
 
-			updateTask.setRealFlag("1");
+//			updateTask.setRealFlag("1");
 		}
 		//提交
-		updateTask.setTaskStatus("2");
-		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
+//		updateTask.setTaskStatus("2");
+//		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
 // 		if("1".equals(approvalOpinion)){
 // 			if("1".equals(wmScorePackage.getPackageType1())){
 // 				Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
@@ -236,7 +236,7 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 //
 // 			}
 // 		}
-		wmTaskService.updateById(updateTask);
+//		wmTaskService.updateById(updateTask);
 //		wmTaskService.update(updateWrapper);
 
 //		if("1".equals(approvalOpinion)){
@@ -248,11 +248,11 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 			 */
 			//更新积分包状态
 //			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));
+//			WmScorePackageStatus query = new WmScorePackageStatus();
+//			query.setUserId(wmTask.getTaskUserId());
+//			query.setPackageId(wmTask.getScorePackageId());
+//			query.setStatus("2");
+//			WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
 
 			/**
 			 * 不需要释放 直接返回
@@ -261,7 +261,7 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
 //				return R.ok();
 //			}
 
-			packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
+//			packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
 //		}
 		return R.ok();
 	}