工单制定显示相关数据

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmGongdanDetailController.java

@@ -1,27 +1,27 @@
 package org.jeecg.modules.itdmGongDan.controller;
 
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
  * @Description: 工单detail
  * @Author: jeecg-boot
  * @Date:   2023-05-21
@@ -47,15 +47,49 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 	//@AutoLog(value = "工单detail-分页列表查询")
 	@ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
-		Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
-		IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
-		return Result.OK(pageList);
+	public Result<Page<ItdmGongdanDetailListVO>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
+															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															   HttpServletRequest req) {
+		Result<Page<ItdmGongdanDetailListVO>> result = new Result<Page<ItdmGongdanDetailListVO>>();
+		Page<ItdmGongdanDetailListVO> pageList = new Page<>(pageNo,pageSize);
+		pageList = itdmGongdanDetailService.getDetailList(pageList,"");//通知公告消息
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
 	}
+//	public Result<Page<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
+//								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//								   HttpServletRequest req) {
+//		Result<Page<ItdmGongdanDetail>> result = new Result<Page<ItdmGongdanDetail>>();
+//		Page<ItdmGongdanDetail> pageList = new Page<>(pageNo,pageSize);
+//		pageList = itdmGongdanDetailService.getDetailList(pageList,"");//通知公告消息
+//		result.setSuccess(true);
+//		result.setResult(pageList);
+//		return result;
+//	}
+
+
+
+//	@ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
+//	@GetMapping(value = "/list")
+//	public Result<IPage<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
+//														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//														  HttpServletRequest req) {
+//		QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
+////		queryWrapper.select().orderByAsc("work_date");
+//		Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
+//		IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
+//		return Result.OK(pageList);
+////		IPage<ItdmGongdanDetailListVO> pageVOList = pageList.convert(result -> {
+////			ItdmGongdanDetailListVO vo = new ItdmGongdanDetailListVO();
+////			BeanUtil.copyProperties(result, vo);
+////			return vo;
+////		});
+////		return Result.OK(pageVOList);
+//	}
 
 	/**
 	 *   添加

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmGongdanDetailMapper.java

@@ -1,7 +1,11 @@
 package org.jeecg.modules.itdmGongDan.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+
+import java.util.List;
 
 /**
  * @Description: 工单detail
@@ -10,5 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface ItdmGongdanDetailMapper extends BaseMapper<ItdmGongdanDetail> {
-
+    List<ItdmGongdanDetailListVO> getDetailList (Page<ItdmGongdanDetailListVO> page, String weituoId);
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/xml/ItdmGongdanDetailMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper">
 
+    <resultMap id="ItdmGongdanDetailListVO" type="org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO" >
+        <result column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="wo_id" property="woId" jdbcType="VARCHAR"/>
+        <result column="shiji_shebei_id" property="shijiShebeiId" jdbcType="VARCHAR"/>
+        <result column="shiji_shiiyan_type" property="shijiShiiyanType" jdbcType="VARCHAR"/>
+        <result column="work_date" property="workDate" jdbcType="DATE"/>
+        <result column="start_time" property="startTime" jdbcType="VARCHAR"/>
+        <result column="end_time" property="endTime" jdbcType="VARCHAR"/>
+        <result column="shiji_work_date" property="shijiWorkDate" jdbcType="VARCHAR"/>
+        <result column="shiji_start_time" property="shijiStartTime" jdbcType="VARCHAR"/>
+        <result column="shiji_end_time" property="shijiEndTime" jdbcType="VARCHAR"/>
+        <result column="chuanganqi" property="chuanganqi" jdbcType="VARCHAR"/>
+    </resultMap>
+
+
+    <select id="getDetailList" parameterType="String"  resultMap="ItdmGongdanDetailListVO">
+        select d.id, d.wo_id, d.shiji_shebei_id, d.shiji_shiiyan_type, d.work_date, d.start_time, d.end_time,
+               d.shiji_work_date, d.shiji_start_time, d.shiji_end_time, d.chuanganqi,
+               m.jihua_shiyan_id, m.test_items_id, m.weituo_yangpin_id, m.shebei_id, t.weituo_id
+        from itdm_gongdan_detail d
+left join itdm_gongdan_master m on d.wo_id = m.id
+left join itdm_test_plan t on m.jihua_shiyan_id = t.id
+    </select>
+
+
 </mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/IItdmGongdanDetailService.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.itdmGongDan.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
 
 /**
  * @Description: 工单detail
@@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IItdmGongdanDetailService extends IService<ItdmGongdanDetail> {
 
+    public Page<ItdmGongdanDetailListVO> getDetailList(Page<ItdmGongdanDetailListVO> page, String weituoId);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmGongdanDetailServiceImpl.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.itdmGongDan.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +19,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ItdmGongdanDetailServiceImpl extends ServiceImpl<ItdmGongdanDetailMapper, ItdmGongdanDetail> implements IItdmGongdanDetailService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmGongdanDetailMapper itdmGongdanDetailMapper;
+
+    public Page<ItdmGongdanDetailListVO> getDetailList(Page<ItdmGongdanDetailListVO> page, String weituoId) {
+        return page.setRecords(itdmGongdanDetailMapper.getDetailList(page, weituoId));
+    }
+
 }