|
|
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
+import org.jeecg.common.system.query.QueryGenerator;
|
|
|
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
|
|
|
import org.jeecg.modules.weituochaxun.vo.ItdmWeituoAllVO;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -39,17 +41,19 @@ public class ItdmGongdanshujuController {
|
|
|
|
|
|
@ApiOperation(value="工单数据-列表", notes="工单数据-列表")
|
|
|
@GetMapping("/list")
|
|
|
- public Result<IPage<ItdmGongdanShuju>> list(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
+ public Result<IPage<ItdmGongdanShuju>> list(ItdmGongdanShuju itdmGongdanShuju,
|
|
|
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
HttpServletRequest req){
|
|
|
+ QueryWrapper<ItdmGongdanShuju> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanShuju, req.getParameterMap());
|
|
|
Page<ItdmGongdanShuju> page = new Page<ItdmGongdanShuju>(pageNo, pageSize);
|
|
|
- IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page);
|
|
|
+ IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page,queryWrapper);
|
|
|
return Result.OK(list);
|
|
|
}
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "工单数据-生成", notes = "工单数据-生成")
|
|
|
- @GetMapping("/create")
|
|
|
+ @PostMapping("/create")
|
|
|
public Result create(@RequestBody ItdmGongdanDto itdmGongdanDto, HttpServletRequest req) {
|
|
|
List<ItdmGongdanShuju> detail = itdmGongdanShujuService.list(new QueryWrapper<ItdmGongdanShuju>().eq("wo_id", itdmGongdanDto.getWoId()));
|
|
|
if (detail.size() > 0) {
|
110