ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改错误返回语句

Browse Source
This commit is contained in:
caozhen
2023-09-18 16:31:02 +08:00
parent 6a0080558d
commit ac0f76b476
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsBrowsingHistoryController.java
+3 -1
View File
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.constant.ResultCommon;
@@ -91,9 +92,10 @@ public class LawsBrowsingHistoryController extends JeroController<LawsBrowsingHi
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
this.lawsBrowsingHistoryService.removeByIds(Arrays.asList(map.get("ids").split(","))); this.lawsBrowsingHistoryService.removeByIds(Arrays.asList(map.get("ids").split(",")));
return Result.error(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK)); return Result.error(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
} }
} }
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+7 -6
View File
@@ -5,13 +5,14 @@ import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.personal.entity.LawsStandardCollection; import com.jero.modules.personal.entity.LawsStandardCollection;
@@ -100,7 +101,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@PostMapping(value = "/domestic/delete") @PostMapping(value = "/domestic/delete")
public Result<T> domesticDelete(@RequestBody Map<String, String> map) { public Result<T> domesticDelete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
lawsStandardCollectionService.deleteById(map.get("id")); lawsStandardCollectionService.deleteById(map.get("id"));
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
@@ -152,7 +153,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@ApiOperation(value="标准收藏-企标收藏", notes="标准收藏-企标收藏") @ApiOperation(value="标准收藏-企标收藏", notes="标准收藏-企标收藏")
@PostMapping(value = "/enterprise/add") @PostMapping(value = "/enterprise/add")
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) { public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
EnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId()); LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId());
lawsStandardCollection.setStandardClass(standard.getCategoryCode()); lawsStandardCollection.setStandardClass(standard.getCategoryCode());
lawsStandardCollection.setStandardName(standard.getStandardName()); lawsStandardCollection.setStandardName(standard.getStandardName());
@@ -177,7 +178,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@PostMapping(value = "/enterprise/delete") @PostMapping(value = "/enterprise/delete")
public Result<T> enterpriseDelete(@RequestBody Map<String, String> map) { public Result<T> enterpriseDelete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
lawsStandardCollectionService.deleteById(map.get("id")); lawsStandardCollectionService.deleteById(map.get("id"));
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
@@ -191,7 +192,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
@PostMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) { public Result<T> delete(@RequestBody Map<String, String> map) {
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
lawsStandardCollectionService.removeById(map.get("id")); lawsStandardCollectionService.removeById(map.get("id"));
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+2 -1
View File
@@ -3,6 +3,7 @@ package com.jero.modules.personal.controller;
import java.util.*; import java.util.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils; import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.constant.ResultCommon;
@@ -204,7 +205,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@PostMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) { public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!"); throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
} }
this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(","))); this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessController.java
+1 -1
View File
@@ -262,7 +262,7 @@ public class LawsAssessController extends JeroController<LawsAssess, ILawsAssess
@ApiOperation(value="项目-标准评估-导出excel", notes="项目-标准评估-导出excel") @ApiOperation(value="项目-标准评估-导出excel", notes="项目-标准评估-导出excel")
@GetMapping(value = "/exportXls") @GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, LawsAssess lawsAssess, HttpServletResponse response) { public ModelAndView exportXls(HttpServletRequest request, LawsAssess lawsAssess, HttpServletResponse response) {
String outFileName = MessageUtils.getLanguage().equals("EN") ? "Internal Work Group Personnel Table" + System.currentTimeMillis() + ".xlsx" : "项目-标准评估" + System.currentTimeMillis() + ".xlsx"; String outFileName = "项目-标准评估" + System.currentTimeMillis() + ".xlsx";
String ENCODING = "UTF-8"; String ENCODING = "UTF-8";
ExcelWriter writer = ExcelUtil.getWriter(true); ExcelWriter writer = ExcelUtil.getWriter(true);
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsProjectLibraryController.java
+1 -1
View File
@@ -145,7 +145,7 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
@ApiOperation(value="项目库-导出excel", notes="项目库-导出excel") @ApiOperation(value="项目库-导出excel", notes="项目库-导出excel")
@GetMapping(value = "/exportXls") @GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, LawsProjectLibrary lawsProjectLibrary, HttpServletResponse response) { public ModelAndView exportXls(HttpServletRequest request, LawsProjectLibrary lawsProjectLibrary, HttpServletResponse response) {
String outFileName = MessageUtils.getLanguage().equals("EN") ? "Internal Work Group Personnel Table" + System.currentTimeMillis() + ".xlsx" : "内部工作组人员表" + System.currentTimeMillis() + ".xlsx"; String outFileName = "内部工作组人员表" + System.currentTimeMillis() + ".xlsx";
String ENCODING = "UTF-8"; String ENCODING = "UTF-8";
ExcelWriter writer = ExcelUtil.getWriter(true); ExcelWriter writer = ExcelUtil.getWriter(true);