生产质量检验修改

liweidong
pangyang 3 weeks ago
parent cabfd49e23
commit 51964df7d8
  1. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
  2. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java

@ -120,7 +120,10 @@ public class InspectionTaskController extends BladeController {
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入inspectionTask")
public R<InspectionTaskDetailVO> detail(InspectionTask inspectionTask) {
InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
InspectionTask detail = service.getById(inspectionTask.getId());
// InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
BladeUser user = AuthUtil.getUser();
// InspectionTaskListVO detailDetail = service.detailById(inspectionTask);

@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.desk.quality.pojo.entity.InspectionTask;
import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO;
import org.springframework.beans.BeanUtils;
import java.util.Objects;
@ -24,7 +25,11 @@ public class InspectionTaskDetailWrapper extends BaseEntityWrapper<InspectionTas
@Override
public InspectionTaskDetailVO entityVO(InspectionTask inspectionTask) {
InspectionTaskDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskDetailVO.class));
InspectionTaskDetailVO VO = new InspectionTaskDetailVO();
BeanUtils.copyProperties(inspectionTask, VO);
// InspectionTaskDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskDetailVO.class));
//User createUser = UserCache.getUser(inspectionTask.getCreateUser());
//User updateUser = UserCache.getUser(inspectionTask.getUpdateUser());

Loading…
Cancel
Save