|
|
@ -4,8 +4,15 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
|
|
|
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
|
|
|
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
|
|
|
|
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectOrderPageReqVO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.projectorder.vo.ProjectOrderPageReqVO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.controller.admin.qualitymanagement.vo.InspectionReportPageReqVO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.customer.CustomerDO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.plansub.PlanSubDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO;
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderDO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.enums.BusinessTypeEnum;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.enums.ProjectOrderStatusEnum;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.biz.enums.YesOrNoEnum;
|
|
|
|
|
|
|
|
import com.chanko.yunxi.mes.module.infra.dal.dataobject.file.FileDO;
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.DeptDO;
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
@ -64,4 +71,47 @@ public interface ProjectOrderMapper extends BaseMapperX<ProjectOrderDO> {
|
|
|
|
return selectOne(query);
|
|
|
|
return selectOne(query);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default PageResult<ProjectOrderDO> getInspectionReportPage(InspectionReportPageReqVO pageReqVO) {
|
|
|
|
|
|
|
|
MPJLambdaWrapper<ProjectOrderDO> query = new MPJLambdaWrapper<>();
|
|
|
|
|
|
|
|
query.distinct()
|
|
|
|
|
|
|
|
.select( "t.id")
|
|
|
|
|
|
|
|
.select( "t.code","t.external_code as externalCode")
|
|
|
|
|
|
|
|
.select("p.name as deptName")
|
|
|
|
|
|
|
|
.select("d.name as customerName")
|
|
|
|
|
|
|
|
.select("t.create_time")
|
|
|
|
|
|
|
|
.selectCount(FileDO::getId, "attachmentCount")
|
|
|
|
|
|
|
|
.leftJoin(FileDO.class, "b",
|
|
|
|
|
|
|
|
QueryWrapper -> QueryWrapper.eq(FileDO::getBusinessType, BusinessTypeEnum.INSPECTION_REPORT.name())
|
|
|
|
|
|
|
|
.eq(FileDO::getBusinessId, ProjectOrderDO::getId).eq(FileDO::getDeleted, YesOrNoEnum.N.getCode()))
|
|
|
|
|
|
|
|
.leftJoin(CustomerDO.class, "d", CustomerDO::getId, ProjectOrderDO::getCustomerId)
|
|
|
|
|
|
|
|
.leftJoin(DeptDO.class,"p",DeptDO::getId,ProjectOrderDO::getBusinessDeptId)
|
|
|
|
|
|
|
|
.disableSubLogicDel()
|
|
|
|
|
|
|
|
.orderByDesc(ProjectOrderDO::getId)
|
|
|
|
|
|
|
|
;
|
|
|
|
|
|
|
|
query.eq(ProjectOrderDO::getOrderStatus, ProjectOrderStatusEnum.DISPATCH.getCode())
|
|
|
|
|
|
|
|
.eq(ProjectOrderDO::getIsSnapshot, YesOrNoEnum.N.getCode())
|
|
|
|
|
|
|
|
.like(!StringUtils.isEmpty(pageReqVO.getProjectCode()), ProjectOrderDO::getCode, pageReqVO.getProjectCode());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return selectPage(pageReqVO, query);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default ProjectOrderDO getInspectionReport(Long id) {
|
|
|
|
|
|
|
|
MPJLambdaWrapper<ProjectOrderDO> query = new MPJLambdaWrapper<>();
|
|
|
|
|
|
|
|
query.distinct()
|
|
|
|
|
|
|
|
.select( "t.id")
|
|
|
|
|
|
|
|
.select( "t.code","t.external_code as externalCode")
|
|
|
|
|
|
|
|
.select("p.name as deptName")
|
|
|
|
|
|
|
|
.select("d.name as customerName")
|
|
|
|
|
|
|
|
.select("t.create_time")
|
|
|
|
|
|
|
|
.leftJoin(CustomerDO.class, "d", CustomerDO::getId, ProjectOrderDO::getCustomerId)
|
|
|
|
|
|
|
|
.leftJoin(DeptDO.class,"p",DeptDO::getId,ProjectOrderDO::getBusinessDeptId)
|
|
|
|
|
|
|
|
.disableSubLogicDel()
|
|
|
|
|
|
|
|
.eq(ProjectOrderDO::getId, id)
|
|
|
|
|
|
|
|
.orderByDesc(ProjectOrderDO::getId)
|
|
|
|
|
|
|
|
.last("LIMIT 1")
|
|
|
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return selectOne(query);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|