查询订单修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/entity/MesNotifyMessageEntity.java

@@ -45,4 +45,15 @@ public class MesNotifyMessageEntity extends BaseEntity {
 	@Schema(description = "接收人ID")
 	private Long receiveUserId;
 
+	/**
+	 * 接收人角色ID
+	 */
+	@Schema(description = "接收人角色ID")
+	private Long receiveRoleId;
+
+	/**
+	 * 接收人角色名称
+	 */
+	@Schema(description = "接收人角色名称")
+	private String receiveRoleName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/common/controller/MesNotifyMessageController.java

@@ -66,6 +66,7 @@ public class MesNotifyMessageController extends BladeController {
 	@Operation(summary = "分页", description  = "传入mesNotifyMessage")
 	public R<IPage<MesNotifyMessageVO>> page(MesNotifyMessageVO mesNotifyMessage, Query query) {
 		mesNotifyMessage.setReceiveUserId(AuthUtil.getUserId());
+		mesNotifyMessage.setReceiveRoleName(AuthUtil.getUserRole());
 		IPage<MesNotifyMessageVO> pages = mesNotifyMessageService.selectMesNotifyMessagePage(new Page<>(query.getCurrent(), query.getSize()), mesNotifyMessage);
 		return R.data(pages);
 	}

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesNotifyMessageServiceImpl.java

@@ -57,6 +57,11 @@ public class MesNotifyMessageServiceImpl extends BaseServiceImpl<MesNotifyMessag
 		Page<MesNotifyMessageEntity> mesNotifyMessageVOList = this.page(page, new LambdaQueryWrapper<MesNotifyMessageEntity>()
 				.eq(StrUtil.isNotEmpty(mesNotifyMessage.getBizType()), MesNotifyMessageEntity::getBizType, mesNotifyMessage.getBizType())
 				.like(StrUtil.isNotEmpty(mesNotifyMessage.getContent()), MesNotifyMessageEntity::getContent, mesNotifyMessage.getContent())
+				.and(wrapper -> wrapper
+						.eq(MesNotifyMessageEntity::getReceiveUserId, mesNotifyMessage.getReceiveUserId())
+						.or()
+						.eq(MesNotifyMessageEntity::getReceiveRoleName, mesNotifyMessage.getReceiveRoleName())
+				)
 				.orderByDesc(MesNotifyMessageEntity::getCreateTime));
 		Page<MesNotifyMessageVO>  page1 = new Page<>();
 		if (!mesNotifyMessageVOList.getRecords().isEmpty()){

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java

@@ -149,13 +149,10 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes
 
     @Override
     public JSONArray detail(PlanTest planTest) {
-        // 查询woId
+        // 查询wpCode
-        List<WorkOrder> prWorkOrderList = workOrderMapper.selectList(new LambdaQueryWrapper<WorkOrder>()
+        WorkPlan workPlan = workPlanService.getById(planTest.getWpId());
-                .eq(WorkOrder::getWpId, planTest.getWpId()));
+        WorkOrder workOrder = workOrderMapper.selectById(workPlan.getWoId());
-        if (prWorkOrderList == null || prWorkOrderList.isEmpty()){
+        JSONObject obj = httpRequestService.testRec(workOrder.getWoCode(), planTest.getErpId(),planTest.getDataId());
-            return null;
-        }
-        JSONObject obj = httpRequestService.testRec(prWorkOrderList.get(0).getWoCode(), planTest.getErpId(),planTest.getDataId());
         if (obj != null) {
             JSONObject data = obj.getJSONObject("data");
             return data.getJSONArray("nodeEndTime");