Forráskód Böngészése

feat: 调查信息审核修改(源头企业审核入库)

lixuesong 3 éve
szülő
commit
06fd10d22f

+ 12 - 12
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDistributionController.java

@@ -337,22 +337,22 @@ public class WmDaDistributionController {
 	 *
 	 * @return
 	 */
-	@ApiOperation(value = "调查信息审核", notes = "调查信息审核")
-	@GetMapping("/approvalDistribution")
-	public R approvalDistribution(String taskId) {
-
-		return wmDaDistributionService.approvalDistribution(taskId);
-	}
+//	@ApiOperation(value = "调查信息审核", notes = "调查信息审核")
+//	@GetMapping("/approvalDistribution")
+//	public R approvalDistribution(String taskId) {
+//
+//		return wmDaDistributionService.approvalDistribution(taskId);
+//	}
 
 	/**
 	 * 审核意见保存--商业公司
 	 *
 	 * @return
 	 */
-	@ApiOperation(value = "审核意见保存", notes = "审核意见保存")
-	@PostMapping("/updateByApproval")
-	public R updateByApproval(@RequestBody Map<String, String> map) {
-		return wmDaDistributionService.updateByApproval(map);
-
-	}
+//	@ApiOperation(value = "审核意见保存", notes = "审核意见保存")
+//	@PostMapping("/updateByApproval")
+//	public R updateByApproval(@RequestBody Map<String, String> map) {
+//		return wmDaDistributionService.updateByApproval(map);
+//
+//	}
 }

+ 11 - 11
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaHospitalController.java

@@ -128,22 +128,22 @@ public class WmDaHospitalController {
 	 * 调查信息审核--医院
 	 * @return
 	 */
-	@ApiOperation(value = "调查信息审核", notes = "调查信息审核")
-	@GetMapping("/approvalHospital")
-	public R approvalHospital(String taskId) {
-		return wmDaHospitalService.approvalHospital(taskId);
-	}
+//	@ApiOperation(value = "调查信息审核", notes = "调查信息审核")
+//	@GetMapping("/approvalHospital")
+//	public R approvalHospital(String taskId) {
+//		return wmDaHospitalService.approvalHospital(taskId);
+//	}
 
 	/**
 	 * 审核意见保存
 	 * @return
 	 */
-	@ApiOperation(value = "审核意见保存", notes = "审核意见保存")
-	@PostMapping("/updateByapproval")
-	public R updateByapproval(@RequestBody Map<String,String> map) {
-		return wmDaHospitalService.updateByApproval(map);
-
-	}
+//	@ApiOperation(value = "审核意见保存", notes = "审核意见保存")
+//	@PostMapping("/updateByapproval")
+//	public R updateByapproval(@RequestBody Map<String,String> map) {
+//		return wmDaHospitalService.updateByApproval(map);
+//
+//	}
 
 
 

+ 12 - 12
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaPharmacyController.java

@@ -223,23 +223,23 @@ public class WmDaPharmacyController {
 	 *
 	 * @return
 	 */
-	@ApiOperation(value = "调查信息审核", notes = "调查信息审核")
-	@GetMapping("/approvalPharmacy")
-	public R approvalPharmacy(String taskId) {
-		return wmDaPharmacyService.approvalPharmacy(taskId);
-	}
+//	@ApiOperation(value = "调查信息审核", notes = "调查信息审核")
+//	@GetMapping("/approvalPharmacy")
+//	public R approvalPharmacy(String taskId) {
+//		return wmDaPharmacyService.approvalPharmacy(taskId);
+//	}
 
 	/**
 	 * 保存审核意见--药企
 	 *
 	 * @return R
 	 */
-	@ApiOperation(value = "保存审核意见", notes = "保存审核意见")
-	@SysLog("保存审核意见")
-	@PostMapping("/updateByApproval")
-	public R updateByApproval(@RequestBody Map<String, String> map) {
-
-		return wmDaPharmacyService.updateByapproval(map);
-	}
+//	@ApiOperation(value = "保存审核意见", notes = "保存审核意见")
+//	@SysLog("保存审核意见")
+//	@PostMapping("/updateByApproval")
+//	public R updateByApproval(@RequestBody Map<String, String> map) {
+//
+//		return wmDaPharmacyService.updateByapproval(map);
+//	}
 
 }

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

@@ -255,6 +255,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			// 审核不通过,则设置TaskStatus为不通过
 			updateTaskWrapper.set(WmTask::getTaskStatus, TaskStatusEnum.FAIL_APPROVED.val());
 		}
+		updateTaskWrapper.set(WmTask::getRealFlag, "0");
 		wmTaskService.update(updateTaskWrapper);
 		taskList = wmTaskService.list(Wrappers.query(wmTask));
 		//更新报告状态