|
@@ -29,10 +29,10 @@ import java.util.List;
|
|
|
/**
|
|
|
* @Description: 委托信息
|
|
|
* @Author: jeecg-boot
|
|
|
- * @Date: 2023-05-17
|
|
|
+ * @Date: 2023-05-17
|
|
|
* @Version: V1.011
|
|
|
*/
|
|
|
-@Api(tags="工单数据11")
|
|
|
+@Api(tags = "工单数据11")
|
|
|
@RestController
|
|
|
@RequestMapping("/itdmgomgongdanshuju/ItdmGongdanshuju")
|
|
|
@Slf4j
|
|
@@ -47,21 +47,16 @@ public class ItdmGongdanshujuController {
|
|
|
@GetMapping("/getWeiTuoData")
|
|
|
public Result getWeiTuoData() {
|
|
|
|
|
|
- return Result.OK(itdmWeituoInfoService.selectItdmWeituoYangpinCompany());
|
|
|
+ return Result.OK(itdmWeituoInfoService.selectItdmWeituoYangpinCompany());
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
- @ApiOperation(value="工单数据-列表", notes="工单数据-列表")
|
|
|
+ @ApiOperation(value = "工单数据-列表", notes = "工单数据-列表")
|
|
|
@GetMapping("/list")
|
|
|
- public Result<IPage<ItdmGongdanShuju>> list(ItdmGongdanShuju itdmGongdanShuju,
|
|
|
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
- HttpServletRequest req){
|
|
|
+ public Result<List<ItdmGongdanShuju>> list(ItdmGongdanShuju itdmGongdanShuju, HttpServletRequest req) {
|
|
|
QueryWrapper<ItdmGongdanShuju> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanShuju, req.getParameterMap());
|
|
|
- Page<ItdmGongdanShuju> page = new Page<ItdmGongdanShuju>(pageNo, pageSize);
|
|
|
- IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page,queryWrapper);
|
|
|
+ List<ItdmGongdanShuju> list = itdmGongdanShujuService.list(queryWrapper);
|
|
|
return Result.OK(list);
|
|
|
}
|
|
|
|
|
@@ -73,7 +68,7 @@ public class ItdmGongdanshujuController {
|
|
|
if (detail.size() > 0) {
|
|
|
return Result.error("当前工单已有数据,不能重复生成数据");
|
|
|
}
|
|
|
- Boolean b = itdmGongdanShujuService.generate(itdmGongdanDto);
|
|
|
+ Boolean b = itdmGongdanShujuService.generate(itdmGongdanDto);
|
|
|
if (b) {
|
|
|
return Result.OK();
|
|
|
}
|
|
@@ -89,46 +84,42 @@ public class ItdmGongdanshujuController {
|
|
|
}
|
|
|
|
|
|
@AutoLog(value = "工单数据-批量删除")
|
|
|
- @ApiOperation(value="工单数据-批量删除", notes="工单数据-批量删除")
|
|
|
+ @ApiOperation(value = "工单数据-批量删除", notes = "工单数据-批量删除")
|
|
|
//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:deleteBatch")
|
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
|
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
|
|
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
|
this.itdmGongdanShujuService.removeByIds(Arrays.asList(ids.split(",")));
|
|
|
return Result.OK("批量删除成功!");
|
|
|
}
|
|
|
|
|
|
@AutoLog(value = "工单数据-编辑")
|
|
|
- @ApiOperation(value="工单数据-编辑", notes="工单数据-编辑")
|
|
|
+ @ApiOperation(value = "工单数据-编辑", notes = "工单数据-编辑")
|
|
|
//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:edit")
|
|
|
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
|
|
public Result<String> edit(@RequestBody ItdmGongdanShuju itdmGongdanShuju) {
|
|
|
itdmGongdanShujuService.updateById(itdmGongdanShuju);
|
|
|
return Result.OK("编辑成功!");
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@AutoLog(value = "工单数据-上传")
|
|
|
- @ApiOperation(value="工单数据-上传", notes="工单数据-上传")
|
|
|
+ @ApiOperation(value = "工单数据-上传", notes = "工单数据-上传")
|
|
|
//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:edit")
|
|
|
- @RequestMapping(value = "/upload", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
+ @RequestMapping(value = "/upload", method = {RequestMethod.PUT, RequestMethod.POST})
|
|
|
public Result<String> upload(@RequestBody ItdmGongdanUploadDto itdmGongdanShuju) {
|
|
|
itdmGongdanShujuService.upload(itdmGongdanShuju);
|
|
|
return Result.OK("上传文件!");
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@AutoLog(value = "工单数据-编辑")
|
|
|
- @ApiOperation(value="工单数据-批量编辑", notes="工单数据-批量编辑")
|
|
|
+ @ApiOperation(value = "工单数据-批量编辑", notes = "工单数据-批量编辑")
|
|
|
//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:edit")
|
|
|
- @RequestMapping(value = "/editList", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
+ @RequestMapping(value = "/editList", method = {RequestMethod.PUT, RequestMethod.POST})
|
|
|
public Result<String> editList(@RequestBody List<ItdmGongdanShuju> itdmGongdanShuju) {
|
|
|
itdmGongdanShujuService.updateBatchById(itdmGongdanShuju);
|
|
|
return Result.OK("编辑成功!");
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
}
|