添加市场法规库清单功能
This commit is contained in:
梁琦涛
+2
-2
@@ -82,8 +82,8 @@ public class MarketStandardController {
|
||||
@ApiOperationSupport(order = 3)
|
||||
@RequiresPermissions("marketStandard:export")
|
||||
@GetMapping(value = "/exportXls", produces = "application/zip")
|
||||
public ModelAndView exportXls(HttpServletResponse response, LawsMarketStandard LawsMarketStandard, HttpServletRequest req) {
|
||||
return marketStandardService.export(response, LawsMarketStandard, "市场法规清单", "市场法规清单", req);
|
||||
public ModelAndView exportXls(HttpServletResponse response, LawsMarketStandard lawsMarketStandard, HttpServletRequest req) {
|
||||
return marketStandardService.export(response, lawsMarketStandard, "市场法规清单", "市场法规清单", req);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+17
-87
@@ -1,14 +1,17 @@
|
||||
package com.jero.modules.laws.marketStandard.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.api.vo.ResultCommon;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.aspect.annotation.Translation;
|
||||
import com.jero.common.util.MessageUtils;
|
||||
import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard;
|
||||
import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail;
|
||||
import com.jero.modules.laws.marketStandard.entity.MarketStandardDetailVO;
|
||||
import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService;
|
||||
import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -35,101 +38,28 @@ import java.util.Map;
|
||||
public class MarketStandardDetailController {
|
||||
|
||||
@Resource
|
||||
private ILawsMarketStandardService marketStandardService;
|
||||
|
||||
private ILawsMarketStandardDetailService lawsMarketStandardDetailService;
|
||||
|
||||
/**
|
||||
* 查看
|
||||
* 市场法规清单详情列表
|
||||
*
|
||||
* @param marketStandardDetail
|
||||
* @param manifestId
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "外部标准库-市场法规清单-查看")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单-查看", notes = "外部标准库-市场法规清单-查看")
|
||||
@GetMapping(value = "/detail")
|
||||
@AutoLog(value = "外部标准库-市场法规清单详情列表")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单详情列表", notes = "外部标准库-市场法规清单详情列表")
|
||||
@GetMapping(value = "/list")
|
||||
@ApiOperationSupport(order = 2)
|
||||
@RequiresPermissions("marketStandard:detail")
|
||||
public Result<MarketStandardDetailVO> detail(LawsMarketStandardDetail marketStandardDetail) {
|
||||
MarketStandardDetailVO result = marketStandardService.detail(marketStandardDetail);
|
||||
return Result.OK(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@AutoLog(value = "外部标准库-市场法规清单-导出")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单-导出", notes = "外部标准库-市场法规清单-导出")
|
||||
@ApiOperationSupport(order = 3)
|
||||
@RequiresPermissions("marketStandard:export")
|
||||
@GetMapping(value = "/exportXls", produces = "application/zip")
|
||||
public void exportXls(HttpServletResponse response, LawsMarketStandard LawsMarketStandard, HttpServletRequest req) {
|
||||
marketStandardService.export(response, LawsMarketStandard, "市场法规清单", "市场法规清单", req);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "外部标准库-市场法规清单-批量删除")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除")
|
||||
@ApiOperationSupport(order = 4)
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
@RequiresPermissions("marketStandard:deleteBatch")
|
||||
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
|
||||
if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
|
||||
return Result.error("请选择数据!");
|
||||
@Translation
|
||||
public Result<?> detail(@RequestParam("manifestId") String manifestId) {
|
||||
if(StringUtils.isBlank(manifestId)){
|
||||
return Result.error("id不能为空");
|
||||
}
|
||||
this.marketStandardService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param marketStandardDetailVO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "外部标准库-市场法规清单-新增")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单-新增", notes = "外部标准库-市场法规清单-新增")
|
||||
@ApiOperationSupport(order = 5)
|
||||
@PostMapping(value = "/add")
|
||||
@RequiresPermissions("marketStandard:add")
|
||||
public Result<T> add(@RequestBody MarketStandardDetailVO marketStandardDetailVO) {
|
||||
this.marketStandardService.add(marketStandardDetailVO);
|
||||
return Result.OK("新增成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param marketStandardDetailVO
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "外部标准库-市场法规清单-编辑")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单-编辑", notes = "外部标准库-市场法规清单-编辑")
|
||||
@ApiOperationSupport(order = 6)
|
||||
@PostMapping(value = "/edit")
|
||||
@RequiresPermissions("marketStandard:edit")
|
||||
public Result<T> edit(@RequestBody MarketStandardDetailVO marketStandardDetailVO) {
|
||||
this.marketStandardService.edit(marketStandardDetailVO);
|
||||
return Result.OK("修改成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入
|
||||
*
|
||||
* @param file
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "外部标准库-市场法规清单-导入")
|
||||
@ApiOperation(value = "外部标准库-市场法规清单-导入", notes = "外部标准库-市场法规清单-导入")
|
||||
@ApiOperationSupport(order = 7)
|
||||
@PostMapping(value = "/importExcel")
|
||||
@RequiresPermissions("marketStandard:importExcel")
|
||||
public Result<?> importExcel(@RequestParam("file") @ApiParam("文件") MultipartFile file) {
|
||||
List<LawsMarketStandardDetail> list = marketStandardService.importExcel(file);
|
||||
LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
|
||||
queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,
|
||||
Arrays.asList(manifestId.split(",")));
|
||||
List<LawsMarketStandardDetail> list = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -119,6 +119,7 @@ public class LawsMarketStandardDetail implements Serializable {
|
||||
@Excel(name = "注册日期", width = 15)
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "注册日期")
|
||||
// todo 类型改成varchar
|
||||
private String registrationDate;
|
||||
|
||||
/**
|
||||
|
||||
+8
-8
@@ -229,14 +229,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
|
||||
result.setManifest(manifest);
|
||||
|
||||
// 列表数据
|
||||
LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardNumber()),
|
||||
LawsMarketStandardDetail::getStandardNumber, marketStandardDetail.getStandardNumber());
|
||||
wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardName()),
|
||||
LawsMarketStandardDetail::getStandardName, marketStandardDetail.getStandardName());
|
||||
wrapper.in(LawsMarketStandardDetail::getManifestId, idList);
|
||||
List<LawsMarketStandardDetail> pageData = lawsMarketStandardDetailService.list(wrapper);
|
||||
result.setLists(pageData);
|
||||
// LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
|
||||
// wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardNumber()),
|
||||
// LawsMarketStandardDetail::getStandardNumber, marketStandardDetail.getStandardNumber());
|
||||
// wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardName()),
|
||||
// LawsMarketStandardDetail::getStandardName, marketStandardDetail.getStandardName());
|
||||
// wrapper.in(LawsMarketStandardDetail::getManifestId, idList);
|
||||
// List<LawsMarketStandardDetail> pageData = lawsMarketStandardDetailService.list(wrapper);
|
||||
// result.setLists(pageData);
|
||||
|
||||
// 如果不是合并查看列表页面
|
||||
if (idList.size() > 1) {
|
||||
|
||||
Reference in New Issue
Block a user