diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 82563643..a12626dd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -432,14 +432,6 @@ public class ImportUtil { return errMsgList; } - private String convertBiddingCommitteeValid(String cellValue) { - return cellValue; - } - - private boolean biddingCommitteeValid(String cellValue) { - return true; - } - public Date convertDate(String cellValue) { if (StrUtil.isBlank(cellValue)) { return null; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 774eb3a1..c524a40a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -69,7 +69,7 @@ public class MarketStandardController { @ApiOperation(value = "外部标准库-市场法规清单-查看", notes = "外部标准库-市场法规清单-查看") @GetMapping(value = "/detail") @ApiOperationSupport(order = 2) - @RequiresPermissions("lawsConformityAssessment:detail") + @RequiresPermissions("marketStandard:detail") public Result detail(LawsMarketStandardDetail marketStandardDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @@ -83,7 +83,7 @@ public class MarketStandardController { @AutoLog(value = "外部标准库-市场法规清单-导出") @ApiOperation(value = "外部标准库-市场法规清单-导出", notes = "外部标准库-市场法规清单-导出") @ApiOperationSupport(order = 3) - @RequiresPermissions("lawsConformityAssessment:export") + @RequiresPermissions("marketStandard:export") @GetMapping(value = "/exportXls", produces = "application/zip") public void exportXls(HttpServletResponse response, LawsMarketStandard LawsMarketStandard, HttpServletRequest req) { marketStandardService.export(response, LawsMarketStandard, "市场法规清单", "市场法规清单", req); @@ -99,6 +99,7 @@ public class MarketStandardController { @ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除") @ApiOperationSupport(order = 4) @PostMapping(value = "/deleteBatch") + @RequiresPermissions("marketStandard:deleteBatch") public Result deleteBatch(@RequestBody Map map) { if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { return Result.error("请选择数据!"); @@ -117,6 +118,7 @@ public class MarketStandardController { @ApiOperation(value = "外部标准库-市场法规清单-新增", notes = "外部标准库-市场法规清单-新增") @ApiOperationSupport(order = 5) @PostMapping(value = "/add") + @RequiresPermissions("marketStandard:add") public Result add(@RequestBody MarketStandardDetailVO marketStandardDetailVO) { this.marketStandardService.add(marketStandardDetailVO); return Result.OK("新增成功!"); @@ -132,6 +134,7 @@ public class MarketStandardController { @ApiOperation(value = "外部标准库-市场法规清单-编辑", notes = "外部标准库-市场法规清单-编辑") @ApiOperationSupport(order = 6) @PostMapping(value = "/edit") + @RequiresPermissions("marketStandard:edit") public Result edit(@RequestBody MarketStandardDetailVO marketStandardDetailVO) { this.marketStandardService.edit(marketStandardDetailVO); return Result.OK("修改成功!"); @@ -146,7 +149,8 @@ public class MarketStandardController { @AutoLog(value = "外部标准库-市场法规清单-导入") @ApiOperation(value = "外部标准库-市场法规清单-导入", notes = "外部标准库-市场法规清单-导入") @ApiOperationSupport(order = 7) - @PostMapping(value = "/deleteBatch") + @PostMapping(value = "/importExcel") + @RequiresPermissions("marketStandard:importExcel") public Result importExcel(@RequestParam("file") @ApiParam("文件") MultipartFile file) { List errorMessages = marketStandardService.importExcel(file); if (!errorMessages.isEmpty()) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java index 8b5f4aed..bdeb9d67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandard.java @@ -1,9 +1,7 @@ package com.jero.modules.laws.marketStandard.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.util.Date; @@ -65,6 +63,7 @@ public class LawsMarketStandard implements Serializable { * 0表示未删除,1表示删除 */ @ApiModelProperty(value = "0表示未删除,1表示删除") + @TableLogic private Integer delFlag; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 078712f8..fea13ff2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -1,9 +1,7 @@ package com.jero.modules.laws.marketStandard.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.util.Date; @@ -64,6 +62,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 0表示未删除,1表示删除 */ + @TableLogic @ApiModelProperty(value = "0表示未删除,1表示删除") private Integer delFlag; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 7d3e514a..fe174fc2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -53,7 +53,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl