bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购列表接口优化

This commit is contained in:
sxu 2024-11-08 17:18:38 +08:00
parent f4f830d7ff
commit 454a69b7ae
7 changed files with 187 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java
View File

@ -35,28 +35,28 @@ public class PurchaseBindController extends BaseController {
/**
* 一级分页查询
*/
@ApiOperation(value = "查询新购验收绑定详细列表")
@RequiresPermissions("purchase:bind:list")
@GetMapping(value = "/list")
public TableDataInfo getList(PurchaseDto dto) {
startPage();
List<PurchaseVo> list = purchaseBindService.selectAll(dto);
return getDataTable(list);
}
// @ApiOperation(value = "查询新购验收绑定详细列表")
// @RequiresPermissions("purchase:bind:list")
// @GetMapping(value = "/list")
// public TableDataInfo getList(PurchaseDto dto) {
// startPage();
// List<PurchaseVo> list = purchaseBindService.selectAll(dto);
// return getDataTable(list);
// }
/**
* 获取新购绑定二级明细列表
* @param
* @return
*/
@ApiOperation(value = "获取新购绑定二级明细列表")
@RequiresPermissions("purchase:bind:query")
@GetMapping("/details")
public TableDataInfo getDetails(PurchaseDto dto) {
startPage();
List<PurchaseVo> list = purchaseBindService.getDetails(dto);
return getDataTable(list);
}
// @ApiOperation(value = "获取新购绑定二级明细列表")
// @RequiresPermissions("purchase:bind:query")
// @GetMapping("/details")
// public TableDataInfo getDetails(PurchaseDto dto) {
// startPage();
// List<PurchaseVo> list = purchaseBindService.getDetails(dto);
// return getDataTable(list);
// }
/**
* 绑定

276
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java
View File

@ -1,138 +1,138 @@
package com.bonus.material.purchase.controller;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.material.purchase.domain.PurchaseCheckDetails;
import com.bonus.material.purchase.service.IPurchaseCheckDetailsService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.page.TableDataInfo;
/**
* 新购验收任务详细Controller
* @author syruan
*/
@Api(tags = "新购验收任务详细接口")
@RestController
@RequestMapping("/purchase_check_details")
public class PurchaseCheckDetailsController extends BaseController {
@Resource
private IPurchaseCheckDetailsService purchaseCheckDetailsService;
/**
* 查询新购验收任务详细列表
*/
@ApiOperation(value = "查询新购验收任务详细列表")
@RequiresPermissions("purchase:details:list")
@GetMapping("/list")
public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails) {
startPage();
List<PurchaseCheckDetails> list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails);
return getDataTable(list);
}
/**
* 导出新购验收任务详细列表
*/
@ApiOperation(value = "导出新购验收任务详细列表")
@PreventRepeatSubmit
@RequiresPermissions("purchase:details:export")
@SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细")
@PostMapping("/export")
public void export(HttpServletResponse response, PurchaseCheckDetails purchaseCheckDetails) {
List<PurchaseCheckDetails> list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails);
ExcelUtil<PurchaseCheckDetails> util = new ExcelUtil<PurchaseCheckDetails>(PurchaseCheckDetails.class);
util.exportExcel(response, list, "新购验收任务详细数据");
}
/**
* 获取新购验收任务详细详细信息
*/
@ApiOperation(value = "获取新购验收任务详细详细信息")
@RequiresPermissions("purchase:details:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(purchaseCheckDetailsService.selectPurchaseCheckDetailsById(id));
}
/**
* 新增新购验收任务详细
*/
@ApiOperation(value = "新增新购验收任务详细")
@PreventRepeatSubmit
@RequiresPermissions("purchase:details:add")
@SysLog(title = "新购验收任务详细", businessType = OperaType.INSERT, logType = 1,module = "物资新购->新增新购验收任务详细")
@PostMapping
public AjaxResult add(@RequestBody PurchaseCheckDetails purchaseCheckDetails) {
try {
return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetails));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 修改新购验收任务详细
*/
@ApiOperation(value = "修改新购验收任务详细")
@PreventRepeatSubmit
@RequiresPermissions("purchase:details:edit")
@SysLog(title = "新购验收任务详细", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务详细")
@PutMapping
public AjaxResult edit(@RequestBody PurchaseCheckDetails purchaseCheckDetails) {
try {
return toAjax(purchaseCheckDetailsService.updatePurchaseCheckDetails(purchaseCheckDetails));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 删除新购验收任务详细
*/
@ApiOperation(value = "删除新购验收任务详细")
@PreventRepeatSubmit
@RequiresPermissions("purchase:details:remove")
@SysLog(title = "新购验收任务详细", businessType = OperaType.DELETE, logType = 1,module = "物资新购->删除新购验收任务详细")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(purchaseCheckDetailsService.deletePurchaseCheckDetailsByIds(ids));
}
/**
* 根据任务id查询报告附件
*/
@ApiOperation(value = "根据任务id查询报告附件")
@RequiresPermissions("purchase:details:query")
@GetMapping("/fileList")
@SysLog(title = "新购验收任务明细报告查询", businessType = OperaType.QUERY, module = "物资新购->根据任务id查询物资报告附件")
public AjaxResult getFileList(PurchaseCheckFileDto purchaseCheckFileDto) {
return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskType(purchaseCheckFileDto.getTaskType(), purchaseCheckFileDto.getTypeId()));
}
@ApiOperation(value = "上传报告附件")
@PreventRepeatSubmit
@RequiresPermissions("purchase:details:add")
@SysLog(title = "上传报告附件", businessType = OperaType.INSERT, logType = 1,module = "物资新购->上传物资报告附件")
@PostMapping("/uploadFile")
public AjaxResult uploadFile(@RequestBody @NotNull @Valid PurchaseCheckFileDto purchaseCheckFileDto) {
return purchaseCheckDetailsService.insertPurchaseCheckFile(purchaseCheckFileDto);
}
}
//package com.bonus.material.purchase.controller;
//
//import java.util.List;
//import javax.annotation.Resource;
//import javax.servlet.http.HttpServletResponse;
//import javax.validation.Valid;
//import javax.validation.constraints.NotNull;
//
//import com.bonus.common.log.enums.OperaType;
//import com.bonus.material.common.annotation.PreventRepeatSubmit;
//import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.web.bind.annotation.*;
//import com.bonus.common.log.annotation.SysLog;
//import com.bonus.common.security.annotation.RequiresPermissions;
//import com.bonus.material.purchase.domain.PurchaseCheckDetails;
//import com.bonus.material.purchase.service.IPurchaseCheckDetailsService;
//import com.bonus.common.core.web.controller.BaseController;
//import com.bonus.common.core.web.domain.AjaxResult;
//import com.bonus.common.core.utils.poi.ExcelUtil;
//import com.bonus.common.core.web.page.TableDataInfo;
//
///**
// * 新购验收任务详细Controller
// * @author syruan
// */
//@Api(tags = "新购验收任务详细接口")
//@RestController
//@RequestMapping("/purchase_check_details")
//public class PurchaseCheckDetailsController extends BaseController {
//
// @Resource
// private IPurchaseCheckDetailsService purchaseCheckDetailsService;
//
// /**
// * 查询新购验收任务详细列表
// */
// @ApiOperation(value = "查询新购验收任务详细列表")
// @RequiresPermissions("purchase:details:list")
// @GetMapping("/list")
// public TableDataInfo list(PurchaseCheckDetails purchaseCheckDetails) {
// startPage();
// List<PurchaseCheckDetails> list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails);
// return getDataTable(list);
// }
//
// /**
// * 导出新购验收任务详细列表
// */
// @ApiOperation(value = "导出新购验收任务详细列表")
// @PreventRepeatSubmit
// @RequiresPermissions("purchase:details:export")
// @SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细")
// @PostMapping("/export")
// public void export(HttpServletResponse response, PurchaseCheckDetails purchaseCheckDetails) {
// List<PurchaseCheckDetails> list = purchaseCheckDetailsService.selectPurchaseCheckDetailsList(purchaseCheckDetails);
// ExcelUtil<PurchaseCheckDetails> util = new ExcelUtil<PurchaseCheckDetails>(PurchaseCheckDetails.class);
// util.exportExcel(response, list, "新购验收任务详细数据");
// }
//
// /**
// * 获取新购验收任务详细详细信息
// */
// @ApiOperation(value = "获取新购验收任务详细详细信息")
// @RequiresPermissions("purchase:details:query")
// @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") Long id) {
// return success(purchaseCheckDetailsService.selectPurchaseCheckDetailsById(id));
// }
//
// /**
// * 新增新购验收任务详细
// */
// @ApiOperation(value = "新增新购验收任务详细")
// @PreventRepeatSubmit
// @RequiresPermissions("purchase:details:add")
// @SysLog(title = "新购验收任务详细", businessType = OperaType.INSERT, logType = 1,module = "物资新购->新增新购验收任务详细")
// @PostMapping
// public AjaxResult add(@RequestBody PurchaseCheckDetails purchaseCheckDetails) {
// try {
// return toAjax(purchaseCheckDetailsService.insertPurchaseCheckDetails(purchaseCheckDetails));
// } catch (Exception e) {
// return error("系统错误, " + e.getMessage());
// }
// }
//
// /**
// * 修改新购验收任务详细
// */
// @ApiOperation(value = "修改新购验收任务详细")
// @PreventRepeatSubmit
// @RequiresPermissions("purchase:details:edit")
// @SysLog(title = "新购验收任务详细", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务详细")
// @PutMapping
// public AjaxResult edit(@RequestBody PurchaseCheckDetails purchaseCheckDetails) {
// try {
// return toAjax(purchaseCheckDetailsService.updatePurchaseCheckDetails(purchaseCheckDetails));
// } catch (Exception e) {
// return error("系统错误, " + e.getMessage());
// }
// }
//
// /**
// * 删除新购验收任务详细
// */
// @ApiOperation(value = "删除新购验收任务详细")
// @PreventRepeatSubmit
// @RequiresPermissions("purchase:details:remove")
// @SysLog(title = "新购验收任务详细", businessType = OperaType.DELETE, logType = 1,module = "物资新购->删除新购验收任务详细")
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids) {
// return toAjax(purchaseCheckDetailsService.deletePurchaseCheckDetailsByIds(ids));
// }
//
// /**
// * 根据任务id查询报告附件
// */
// @ApiOperation(value = "根据任务id查询报告附件")
// @RequiresPermissions("purchase:details:query")
// @GetMapping("/fileList")
// @SysLog(title = "新购验收任务明细报告查询", businessType = OperaType.QUERY, module = "物资新购->根据任务id查询物资报告附件")
// public AjaxResult getFileList(PurchaseCheckFileDto purchaseCheckFileDto) {
// return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskType(purchaseCheckFileDto.getTaskType(), purchaseCheckFileDto.getTypeId()));
// }
//
//
// @ApiOperation(value = "上传报告附件")
// @PreventRepeatSubmit
// @RequiresPermissions("purchase:details:add")
// @SysLog(title = "上传报告附件", businessType = OperaType.INSERT, logType = 1,module = "物资新购->上传物资报告附件")
// @PostMapping("/uploadFile")
// public AjaxResult uploadFile(@RequestBody @NotNull @Valid PurchaseCheckFileDto purchaseCheckFileDto) {
// return purchaseCheckDetailsService.insertPurchaseCheckFile(purchaseCheckFileDto);
// }
//
//
//}

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java
View File

@ -29,7 +29,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
*
* @author syruan
*/
@Api(tags = "新购验收任务接口")
@Api(tags = "新购管理接口")
@RestController
@RequestMapping("/purchase_check_info")
public class PurchaseCheckInfoController extends BaseController {
@ -112,8 +112,8 @@ public class PurchaseCheckInfoController extends BaseController {
//@RequiresPermissions("purchase:info:edit")
@SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->内层批量验收API")
@PutMapping("/innerVerify")
public AjaxResult innerVerify(@RequestBody PurchaseCheckDto purchaseCheckDto) {
return purchaseCheckInfoService.innerVerify(purchaseCheckDto);
public AjaxResult innerVerify(@RequestBody List<PurchaseCheckDetails> purchaseCheckDetailsList) {
return purchaseCheckInfoService.innerVerify(purchaseCheckDetailsList);
}

32
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java
View File

@ -35,28 +35,28 @@ public class PurchaseStorageController extends BaseController {
/**
* 一级分页查询
*/
@ApiOperation(value = "查询新购验收入库详细列表")
@RequiresPermissions("purchase:storage:list")
@GetMapping(value = "/list")
public TableDataInfo getList(PurchaseDto dto) {
startPage();
List<PurchaseVo> list = purchaseStorageService.selectAll(dto);
return getDataTable(list);
}
// @ApiOperation(value = "查询新购验收入库详细列表")
// @RequiresPermissions("purchase:storage:list")
// @GetMapping(value = "/list")
// public TableDataInfo getList(PurchaseDto dto) {
// startPage();
// List<PurchaseVo> list = purchaseStorageService.selectAll(dto);
// return getDataTable(list);
// }
/**
* 获取新购入库二级明细列表
* @param
* @return
*/
@ApiOperation(value = "获取新购入库二级明细列表")
@RequiresPermissions("purchase:storage:details")
@GetMapping("/details")
public TableDataInfo getDetails(PurchaseDto dto) {
startPage();
List<PurchaseVo> list = purchaseStorageService.getDetails(dto);
return getDataTable(list);
}
// @ApiOperation(value = "获取新购入库二级明细列表")
// @RequiresPermissions("purchase:storage:details")
// @GetMapping("/details")
// public TableDataInfo getDetails(PurchaseDto dto) {
// startPage();
// List<PurchaseVo> list = purchaseStorageService.getDetails(dto);
// return getDataTable(list);
// }
/**
* 入库或批量入库

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java
View File

@ -50,7 +50,7 @@ public interface IPurchaseCheckInfoService {
AjaxResult outVerify(PurchaseDto purchaseDto);
AjaxResult innerVerify(PurchaseCheckDto purchaseCheckDto);
AjaxResult innerVerify(List<PurchaseCheckDetails> purchaseCheckDetailsList);
/**
* 根据任务id查询验收单

22
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -235,18 +235,20 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
@Override
@Transactional
public AjaxResult innerVerify(PurchaseCheckDto purchaseCheckDto) {
public AjaxResult innerVerify(List<PurchaseCheckDetails> purchaseCheckDetailsList) {
try {
AjaxResult result = new AjaxResult();
Long taskId = purchaseCheckDto.getPurchaseCheckInfo().getTaskId();
Integer status = purchaseCheckDto.getPurchaseCheckDetailsList().get(0).getStatus();
for (PurchaseCheckDetails details : purchaseCheckDto.getPurchaseCheckDetailsList()) {
result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败");
}
//查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态
int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status);
if (count == 0) {
result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, status) > 0 ? AjaxResult.success("task验收状态更改成功") : AjaxResult.error("task验收状态更改失败");
if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) {
Long taskId = purchaseCheckDetailsList.get(0).getTaskId();
Integer status = purchaseCheckDetailsList.get(0).getStatus();
for (PurchaseCheckDetails details : purchaseCheckDetailsList) {
result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败");
}
//查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态
int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status);
if (count == 0) {
result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, status) > 0 ? AjaxResult.success("task验收状态更改成功") : AjaxResult.error("task验收状态更改失败");
}
}
return result;
} catch (Exception e) {

8
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml
View File

@ -278,13 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
set
`status` = #{newTaskStatus}, check_result = #{checkResult}
where
1=1
<if test="taskId != null">
and task_id = #{taskId}
</if>
<if test="typeId != null">
and type_id = #{typeId}
</if>
task_id = #{taskId}
</update>
<update id="updatePurchaseDetails">