fix: 工单确认委托单 id 参与查询

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/controller/ItdmGongdanQuerenController.java

@@ -6,6 +6,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -47,11 +48,18 @@ public class ItdmGongdanQuerenController extends JeecgController<ItdmGongdanDeta
     //@AutoLog(value = "工单detail-分页列表查询")
     @ApiOperation(value = "工单detail-分页列表查询", notes = "工单detail-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<ItdmGongdanDetail>> queryPageList(ItdmGongdanDetail itdmGongdanDetail,
+    public Result<IPage<ItdmGongdanDetail>> queryPageList(String woId, String woNo,
                                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                           HttpServletRequest req) {
+        ItdmGongdanDetail itdmGongdanDetail = new ItdmGongdanDetail();
+        itdmGongdanDetail.setWoId(woId);
+
+
         QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
+        queryWrapper.inSql(StringUtils.isNotEmpty(woNo) && StringUtils.isEmpty(woId), "wo_id", " select distinct g.id\n" +
+                "    from  itdm_test_plan  as t\n" +
+                "              inner join itdm_gongdan_master as g on t.id=g.jihua_shiyan_id  where t.weituo_id='" + woNo + "'");
         Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
         IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -94,18 +102,17 @@ public class ItdmGongdanQuerenController extends JeecgController<ItdmGongdanDeta
     @GetMapping(value = "/gongdanDateListByWoId")
     @ApiOperation(value = "工单detail-获取试验类型", notes = "工单detail-获取试验类型")
 
-    public Result<List<Map<String,String>>> gongdanDateList(String woId, String riqi) {
-        List<Map<String,String>> detailListByWoId = itdmGongdanDetailService.getDetailListByWoId(woId, riqi);
+    public Result<List<Map<String, String>>> gongdanDateList(String woId, String riqi) {
+        List<Map<String, String>> detailListByWoId = itdmGongdanDetailService.getDetailListByWoId(woId, riqi);
         return Result.OK(detailListByWoId);
     }
 
 
-
     @GetMapping(value = "/gongdanShebeiListByWoId")
     @ApiOperation(value = "工单detail-获取试验设备", notes = "工单detail-获取试验设备")
 
-    public Result<List<Map<String,String>>> gongdanShebeiList(String woId, String riqi,String shiyanType) {
-        List<Map<String,String>> detailListByWoId = itdmGongdanDetailService.gongdanShebeiList(woId, riqi,shiyanType);
+    public Result<List<Map<String, String>>> gongdanShebeiList(String woId, String riqi, String shiyanType) {
+        List<Map<String, String>> detailListByWoId = itdmGongdanDetailService.gongdanShebeiList(woId, riqi, shiyanType);
         return Result.OK(detailListByWoId);
     }