新购详情导出接口优化
This commit is contained in:
parent
24ebbabf86
commit
d8247d5f38
|
|
@ -50,7 +50,7 @@ public class PurchaseBindController extends BaseController {
|
|||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "获取新购绑定二级明细列表")
|
||||
@RequiresPermissions("purchase:bind:details")
|
||||
@RequiresPermissions("purchase:bind:query")
|
||||
@GetMapping("/details")
|
||||
public TableDataInfo getDetails(PurchaseDto dto) {
|
||||
startPage();
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ 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.PurchaseCheckDetails;
|
||||
import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
|
||||
import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
|
||||
import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo;
|
||||
|
|
@ -41,7 +42,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
* 查询新购验收任务列表
|
||||
*/
|
||||
@ApiOperation(value = "查询新购验收任务列表")
|
||||
@RequiresPermissions("purchase:info:list")
|
||||
//@RequiresPermissions("purchase:info:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) {
|
||||
startPage();
|
||||
|
|
@ -54,7 +55,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
* 获取新购验收任务详细信息
|
||||
*/
|
||||
@ApiOperation(value = "获取新购验收任务详细信息")
|
||||
@RequiresPermissions("purchase:info:query")
|
||||
//@RequiresPermissions("purchase:info:query")
|
||||
@GetMapping(value = "/getInfo")
|
||||
public AjaxResult getInfo(@NotNull(message = "请求对象不能为空") PurchaseQueryDto purchaseQueryDto) {
|
||||
return success(purchaseCheckInfoService.selectPurchaseCheckInfoById(purchaseQueryDto));
|
||||
|
|
@ -65,7 +66,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "新增新购验收任务")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("purchase:info:add")
|
||||
//@RequiresPermissions("purchase:info:add")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.INSERT, module = "物资新购->新增新购验收任务")
|
||||
@PostMapping
|
||||
public AjaxResult add(@Valid @NotNull @RequestBody PurchaseCheckDto purchaseCheckDto) {
|
||||
|
|
@ -81,7 +82,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "修改新购验收任务")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("purchase:info:edit")
|
||||
//@RequiresPermissions("purchase:info:edit")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->修改新购验收任务")
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody PurchaseCheckDto purchaseCheckDto) {
|
||||
|
|
@ -97,7 +98,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "外层批量验收合格API")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("purchase:info:edit")
|
||||
//@RequiresPermissions("purchase:info:edit")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->外层批量验收合格API")
|
||||
@PutMapping("/acceptance")
|
||||
public AjaxResult acceptance(@RequestBody @NotEmpty(message = "任务id集合不能为空") List<Long> taskIds) {
|
||||
|
|
@ -108,7 +109,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
* 根据任务id查询验收单
|
||||
*/
|
||||
@ApiOperation(value = "根据任务id查询验收单--taskId")
|
||||
@RequiresPermissions("purchase:info:query")
|
||||
//@RequiresPermissions("purchase:info:query")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.UPDATE, module = "物资新购->查询验收单API")
|
||||
@GetMapping("/getPurchaseCheckFormByTaskId/{taskId}")
|
||||
public AjaxResult getPurchaseCheckFormByTaskId(@PathVariable("taskId") Long taskId) {
|
||||
|
|
@ -123,7 +124,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "删除新购验收任务")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("purchase:info:remove")
|
||||
//@RequiresPermissions("purchase:info:remove")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.DELETE, module = "物资新购->删除新购验收任务")
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids) {
|
||||
|
|
@ -137,7 +138,7 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
*/
|
||||
@ApiOperation(value = "导出新购验收任务列表")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("purchase:info:export")
|
||||
//@RequiresPermissions("purchase:info:export")
|
||||
@SysLog(title = "新购验收任务", businessType = OperaType.EXPORT, module = "物资新购->导出新购验收任务")
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
|
||||
|
|
@ -145,4 +146,18 @@ public class PurchaseCheckInfoController extends BaseController {
|
|||
ExcelUtil<PurchaseCheckInfo> util = new ExcelUtil<PurchaseCheckInfo>(PurchaseCheckInfo.class);
|
||||
util.exportExcel(response, list, "新购验收任务数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出新购验收任务详细列表
|
||||
*/
|
||||
@ApiOperation(value = "导出新购验收任务详细列表")
|
||||
@PreventRepeatSubmit
|
||||
//@RequiresPermissions("purchase:details:export")
|
||||
@SysLog(title = "新购验收任务详细", businessType = OperaType.EXPORT, logType = 1,module = "物资新购->导出新购验收任务详细")
|
||||
@PostMapping("/exportDetails")
|
||||
public void exportDetails(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
|
||||
List<PurchaseCheckDetails> list = purchaseCheckInfoService.selectPurchaseCheckDetailsList(purchaseCheckInfo);
|
||||
ExcelUtil<PurchaseCheckDetails> util = new ExcelUtil<PurchaseCheckDetails>(PurchaseCheckDetails.class);
|
||||
util.exportExcel(response, list, "新购验收任务详细数据");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.bonus.material.purchase.mapper;
|
|||
|
||||
import java.util.List;
|
||||
import com.bonus.material.purchase.domain.PurchaseCheckDetails;
|
||||
import com.bonus.material.purchase.domain.PurchaseCheckInfo;
|
||||
import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
|
|
@ -50,6 +51,8 @@ public interface PurchaseCheckDetailsMapper {
|
|||
*/
|
||||
List<PurchaseCheckDetails> selectPurchaseCheckDetailsList(PurchaseCheckDetails purchaseCheckDetails);
|
||||
|
||||
List<PurchaseCheckDetails> selectPurchaseCheckDetailsListFromInfo(PurchaseCheckInfo purchaseCheckInfo);
|
||||
|
||||
/**
|
||||
* 新增新购验收任务详细
|
||||
*
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.bonus.material.purchase.service;
|
|||
import java.util.List;
|
||||
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.material.purchase.domain.PurchaseCheckDetails;
|
||||
import com.bonus.material.purchase.domain.PurchaseCheckInfo;
|
||||
import com.bonus.material.purchase.domain.dto.PurchaseCheckDto;
|
||||
import com.bonus.material.purchase.domain.dto.PurchaseQueryDto;
|
||||
|
|
@ -30,6 +31,8 @@ public interface IPurchaseCheckInfoService {
|
|||
*/
|
||||
List<PurchaseCheckInfo> selectPurchaseCheckInfoList(PurchaseCheckInfo purchaseCheckInfo);
|
||||
|
||||
List<PurchaseCheckDetails> selectPurchaseCheckDetailsList(PurchaseCheckInfo purchaseCheckInfo);
|
||||
|
||||
/**
|
||||
* 新增新购验收任务
|
||||
*
|
||||
|
|
|
|||
|
|
@ -144,6 +144,16 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
|
|||
return purchaseCheckInfos;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询新购验收任务详细列表
|
||||
*
|
||||
* @param purchaseCheckInfo 新购验收任务详细
|
||||
* @return 新购验收任务详细
|
||||
*/
|
||||
@Override
|
||||
public List<PurchaseCheckDetails> selectPurchaseCheckDetailsList(PurchaseCheckInfo purchaseCheckInfo) {
|
||||
return purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListFromInfo(purchaseCheckInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 含税价格计算
|
||||
|
|
|
|||
|
|
@ -74,6 +74,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="fixCode != null "> and fix_code = #{fixCode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectPurchaseCheckDetailsListFromInfo" parameterType="com.bonus.material.purchase.domain.PurchaseCheckInfo" resultMap="PurchaseCheckDetailsResult">
|
||||
<include refid="selectPurchaseCheckDetailsVo"/>
|
||||
<where>
|
||||
<if test="taskId != null "> and task_id = #{taskId}</if>
|
||||
<if test="typeId != null "> and type_id = #{typeId}</if>
|
||||
<if test="purchasePrice != null "> and purchase_price = #{purchasePrice}</if>
|
||||
<if test="purchaseTaxPrice != null "> and purchase_tax_price = #{purchaseTaxPrice}</if>
|
||||
<if test="purchaseNum != null "> and purchase_num = #{purchaseNum}</if>
|
||||
<if test="checkNum != null "> and check_num = #{checkNum}</if>
|
||||
<if test="bindNum != null "> and bind_num = #{bindNum}</if>
|
||||
<if test="checkResult != null and checkResult != ''"> and check_result = #{checkResult}</if>
|
||||
<if test="supplierId != null "> and supplier_id = #{supplierId}</if>
|
||||
<if test="status != null "> and status = #{status}</if>
|
||||
<if test="productionTime != null "> and production_time = #{productionTime}</if>
|
||||
<if test="checkUrlName != null and checkUrlName != ''"> and check_url_name like concat('%', #{checkUrlName}, '%')</if>
|
||||
<if test="checkUrl != null and checkUrl != ''"> and check_url = #{checkUrl}</if>
|
||||
<if test="inputNum != null "> and input_num = #{inputNum}</if>
|
||||
<if test="inputStatus != null and inputStatus != ''"> and input_status = #{inputStatus}</if>
|
||||
<if test="inputTime != null "> and input_time = #{inputTime}</if>
|
||||
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
|
||||
<if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if>
|
||||
<if test="companyId != null "> and company_id = #{companyId}</if>
|
||||
<if test="fixCode != null "> and fix_code = #{fixCode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectPurchaseCheckDetailsById" parameterType="Long" resultMap="PurchaseCheckDetailsResult">
|
||||
<include refid="selectPurchaseCheckDetailsVo"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue