From 1e6b8303d5f4059d035b964c1cd08cb434925544 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Fri, 27 Jun 2025 11:36:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoscoAnnualreviewScoringController.java | 8 ++-- .../CoscoAnnualreviewTaskController.java | 8 ++-- ...scoAnnualreviewTaskSupplierController.java | 8 ++-- ...nnualreviewTaskSupplierUserController.java | 10 ++-- .../CoscoAnnualreviewTemplateController.java | 10 ++-- ...nualreviewTemplateIndicatorController.java | 8 ++-- .../ICoscoAnnualreviewTaskService.java | 2 +- .../controller/CoscoCategoryController.java | 14 +++--- ...CoscoCategoryLibraryContainController.java | 13 ++--- .../CoscoCategoryLibraryController.java | 20 ++++---- ...ategoryLibrarySupplierApplyController.java | 10 ++-- ...oscoCategoryLibrarySupplierController.java | 8 ++-- ...coCategoryLibrarySupplierApplyService.java | 2 +- .../CoscoEvaluateLevelController.java | 8 ++-- .../CoscoEvaluateScoringController.java | 8 ++-- .../CoscoEvaluateTaskController.java | 12 ++--- .../CoscoEvaluateTaskSupplierController.java | 48 +++++++++++-------- ...scoEvaluateTaskSupplierUserController.java | 13 ++--- ...coEvaluateTaskUserIndicatorController.java | 8 ++-- .../CoscoEvaluateTemplateController.java | 10 ++-- ...EvaluateTemplateIndicatorNdController.java | 8 ++-- ...EvaluateTemplateIndicatorStController.java | 8 ++-- .../ICoscoEvaluateTemplateService.java | 2 +- 23 files changed, 130 insertions(+), 116 deletions(-) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewScoringController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewScoringController.java index a587283..11e6a19 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewScoringController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewScoringController.java @@ -31,7 +31,7 @@ public class CoscoAnnualreviewScoringController extends BaseController { * 获取供应商年审_年审评审结果详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoAnnualreviewScoringService.selectCoscoAnnualreviewScoringById(id)); } @@ -39,7 +39,7 @@ public class CoscoAnnualreviewScoringController extends BaseController { * 新增供应商年审_年审评审结果 */ @PostMapping - public BaseResponse add(@RequestBody CoscoAnnualreviewScoring coscoAnnualreviewScoring) { + public BaseResponse add(@RequestBody CoscoAnnualreviewScoring coscoAnnualreviewScoring) { return BaseResponse.success(coscoAnnualreviewScoringService.insertCoscoAnnualreviewScoring(coscoAnnualreviewScoring)); } @@ -47,7 +47,7 @@ public class CoscoAnnualreviewScoringController extends BaseController { * 修改供应商年审_年审评审结果 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoAnnualreviewScoring coscoAnnualreviewScoring) { + public BaseResponse edit(@RequestBody CoscoAnnualreviewScoring coscoAnnualreviewScoring) { return BaseResponse.success(coscoAnnualreviewScoringService.updateCoscoAnnualreviewScoring(coscoAnnualreviewScoring)); } @@ -55,7 +55,7 @@ public class CoscoAnnualreviewScoringController extends BaseController { * 删除供应商年审_年审评审结果 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoAnnualreviewScoringService.deleteCoscoAnnualreviewScoringByIds(ids)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java index 79402e6..e408b10 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java @@ -43,7 +43,7 @@ public class CoscoAnnualreviewTaskController extends BaseController { * 获取供应商年审_年审任务主详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoAnnualreviewTaskService.selectCoscoAnnualreviewTaskById(id)); } @@ -51,7 +51,7 @@ public class CoscoAnnualreviewTaskController extends BaseController { * 新增供应商年审_年审任务主 */ @PostMapping - public BaseResponse add(@RequestBody AddTaskVo taskVo) { + public BaseResponse add(@RequestBody AddTaskVo taskVo) { return BaseResponse.success(coscoAnnualreviewTaskService.insertCoscoAnnualreviewTask(taskVo)); } @@ -59,7 +59,7 @@ public class CoscoAnnualreviewTaskController extends BaseController { * 修改供应商年审_年审任务主 */ @PutMapping - public BaseResponse edit(@RequestBody AddTaskVo taskVo) { + public BaseResponse edit(@RequestBody AddTaskVo taskVo) { return BaseResponse.success(coscoAnnualreviewTaskService.updateCoscoAnnualreviewTask(taskVo)); } @@ -67,7 +67,7 @@ public class CoscoAnnualreviewTaskController extends BaseController { * 删除供应商年审_年审任务主 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoAnnualreviewTaskService.deleteCoscoAnnualreviewTaskByIds(ids)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierController.java index 6ae660e..71ce4d6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierController.java @@ -34,7 +34,7 @@ public class CoscoAnnualreviewTaskSupplierController extends BaseController { * 获取供应商评价_年审任务关联供应商详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoAnnualreviewTaskSupplierService.selectCoscoAnnualreviewTaskSupplierById(id)); } @@ -42,7 +42,7 @@ public class CoscoAnnualreviewTaskSupplierController extends BaseController { * 新增供应商评价_年审任务关联供应商 */ @PostMapping - public BaseResponse add(@RequestBody CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier) { + public BaseResponse add(@RequestBody CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier) { return BaseResponse.success(coscoAnnualreviewTaskSupplierService.insertCoscoAnnualreviewTaskSupplier(coscoAnnualreviewTaskSupplier)); } @@ -50,7 +50,7 @@ public class CoscoAnnualreviewTaskSupplierController extends BaseController { * 修改供应商评价_年审任务关联供应商 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier) { + public BaseResponse edit(@RequestBody CoscoAnnualreviewTaskSupplier coscoAnnualreviewTaskSupplier) { return BaseResponse.success(coscoAnnualreviewTaskSupplierService.updateCoscoAnnualreviewTaskSupplier(coscoAnnualreviewTaskSupplier)); } @@ -58,7 +58,7 @@ public class CoscoAnnualreviewTaskSupplierController extends BaseController { * 删除供应商评价_年审任务关联供应商 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoAnnualreviewTaskSupplierService.deleteCoscoAnnualreviewTaskSupplierByIds(ids)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java index 7193ea5..26c3a30 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java @@ -34,7 +34,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController * 获取供应商评价_年审任务供应商对应评审人详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.selectCoscoAnnualreviewTaskSupplierUserById(id)); } @@ -42,7 +42,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController * 新增供应商评价_年审任务供应商对应评审人 */ @PostMapping - public BaseResponse add(@RequestBody CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser) { + public BaseResponse add(@RequestBody CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser) { return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.insertCoscoAnnualreviewTaskSupplierUser(coscoAnnualreviewTaskSupplierUser)); } @@ -50,7 +50,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController * 修改供应商评价_年审任务供应商对应评审人 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser) { + public BaseResponse edit(@RequestBody CoscoAnnualreviewTaskSupplierUser coscoAnnualreviewTaskSupplierUser) { return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.updateCoscoAnnualreviewTaskSupplierUser(coscoAnnualreviewTaskSupplierUser)); } @@ -58,7 +58,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController * 删除供应商评价_年审任务供应商对应评审人 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.deleteCoscoAnnualreviewTaskSupplierUserByIds(ids)); } @@ -85,7 +85,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController return BaseResponse.fail("当前人员已经打分，无法修改"); } List scoreVoList = vo.getScoreVoList(); - if(scoreVoList.size()==0){ + if(scoreVoList.isEmpty()){ return BaseResponse.fail("请选择打分项"); } coscoAnnualreviewTaskSupplierUserService.addScore(vo); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java index 66995f7..59d298f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateController.java @@ -14,6 +14,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 供应商年审_年审模板主Controller * @@ -32,7 +34,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController { * @return */ @GetMapping("/getAllList") - public BaseResponse getAllList(CoscoAnnualreviewTemplate coscoAnnualreviewTemplate) { + public BaseResponse> getAllList(CoscoAnnualreviewTemplate coscoAnnualreviewTemplate) { return BaseResponse.success(coscoAnnualreviewTemplateService.selectCoscoAnnualreviewTemplateList(coscoAnnualreviewTemplate)); } @@ -53,7 +55,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController { * 获取供应商年审_年审模板主详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoAnnualreviewTemplateService.selectCoscoAnnualreviewTemplateById(id)); } @@ -61,7 +63,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController { * 新增供应商年审_年审模板主 */ @PostMapping - public BaseResponse add(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { + public BaseResponse add(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { return BaseResponse.success(coscoAnnualreviewTemplateService.insertCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate)); } @@ -84,7 +86,7 @@ public class CoscoAnnualreviewTemplateController extends BaseController { * 删除供应商年审_年审模板主 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoAnnualreviewTemplateService.deleteCoscoAnnualreviewTemplateByIds(ids)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateIndicatorController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateIndicatorController.java index 9075e07..1a34c97 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateIndicatorController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTemplateIndicatorController.java @@ -24,7 +24,7 @@ public class CoscoAnnualreviewTemplateIndicatorController extends BaseController * 获取供应商年审_年审模板指标项详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoAnnualreviewTemplateIndicatorService.selectCoscoAnnualreviewTemplateIndicatorById(id)); } @@ -32,7 +32,7 @@ public class CoscoAnnualreviewTemplateIndicatorController extends BaseController * 新增供应商年审_年审模板指标项 */ @PostMapping - public BaseResponse add(@RequestBody CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator) { + public BaseResponse add(@RequestBody CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator) { return BaseResponse.success(coscoAnnualreviewTemplateIndicatorService.insertCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplateIndicator)); } @@ -40,7 +40,7 @@ public class CoscoAnnualreviewTemplateIndicatorController extends BaseController * 修改供应商年审_年审模板指标项 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator) { + public BaseResponse edit(@RequestBody CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator) { return BaseResponse.success(coscoAnnualreviewTemplateIndicatorService.updateCoscoAnnualreviewTemplateIndicator(coscoAnnualreviewTemplateIndicator)); } @@ -48,7 +48,7 @@ public class CoscoAnnualreviewTemplateIndicatorController extends BaseController * 删除供应商年审_年审模板指标项 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoAnnualreviewTemplateIndicatorService.deleteCoscoAnnualreviewTemplateIndicatorByIds(ids)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/ICoscoAnnualreviewTaskService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/ICoscoAnnualreviewTaskService.java index 70568db..82ad120 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/ICoscoAnnualreviewTaskService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/ICoscoAnnualreviewTaskService.java @@ -41,7 +41,7 @@ public interface ICoscoAnnualreviewTaskService { /** * 修改供应商年审_年审任务主 * - * @param coscoAnnualreviewTask 供应商年审_年审任务主 + * @param taskVo 供应商年审_年审任务主 * @return 结果 */ public int updateCoscoAnnualreviewTask(AddTaskVo taskVo); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java index d51be69..5375e43 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java @@ -11,6 +11,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 品类库_品类Controller * @@ -41,7 +43,7 @@ public class CoscoCategoryController extends BaseController { * 品类列表查询 */ @GetMapping(value = "/categoryTree") - public BaseResponse categoryTree(CoscoCategory coscoCategory) { + public BaseResponse> categoryTree(CoscoCategory coscoCategory) { return BaseResponse.success(coscoCategoryService.selectCategoryTree(coscoCategory)); } @@ -49,7 +51,7 @@ public class CoscoCategoryController extends BaseController { * 品类查询去除上级锁定列表 */ @GetMapping(value = "/categoryTreeNoSuperior") - public BaseResponse categoryTreeNoSuperior(CoscoCategory coscoCategory) { + public BaseResponse> categoryTreeNoSuperior(CoscoCategory coscoCategory) { return BaseResponse.success(coscoCategoryService.selectCategoryTreeNoSuperior(coscoCategory)); } @@ -59,7 +61,7 @@ public class CoscoCategoryController extends BaseController { * 获取品类库_品类详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoCategoryService.selectCoscoCategoryById(id)); } @@ -67,7 +69,7 @@ public class CoscoCategoryController extends BaseController { * 新增品类库_品类 */ @PostMapping - public BaseResponse add(@RequestBody CoscoCategory coscoCategory) { + public BaseResponse add(@RequestBody CoscoCategory coscoCategory) { return BaseResponse.success(coscoCategoryService.insertCoscoCategory(coscoCategory)); } @@ -75,7 +77,7 @@ public class CoscoCategoryController extends BaseController { * 修改品类库_品类 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoCategory coscoCategory) { + public BaseResponse edit(@RequestBody CoscoCategory coscoCategory) { return BaseResponse.success(coscoCategoryService.updateCoscoCategory(coscoCategory)); } @@ -83,7 +85,7 @@ public class CoscoCategoryController extends BaseController { * 删除品类库_品类 */ @DeleteMapping("/{id}") - public BaseResponse remove(@PathVariable String id) { + public BaseResponse remove(@PathVariable String id) { return BaseResponse.success(coscoCategoryService.deleteCoscoCategoryById(id)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java index 2f66422..79cac04 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryContainController.java @@ -5,6 +5,7 @@ import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,7 +31,7 @@ public class CoscoCategoryLibraryContainController extends BaseController { * 获取品类库_品类库包含品类详细信息 */ @GetMapping(value = "/{categoryLibraryId}") - public BaseResponse getInfo(@PathVariable("categoryLibraryId") String categoryLibraryId) { + public BaseResponse getInfo(@PathVariable("categoryLibraryId") String categoryLibraryId) { return BaseResponse.success(coscoCategoryLibraryContainService.selectCoscoCategoryLibraryContainByCategoryLibraryId(categoryLibraryId)); } @@ -38,7 +39,7 @@ public class CoscoCategoryLibraryContainController extends BaseController { * 新增品类库_品类库包含品类 */ @PostMapping - public BaseResponse add(@RequestBody CoscoCategoryLibraryContain coscoCategoryLibraryContain) { + public BaseResponse add(@RequestBody CoscoCategoryLibraryContain coscoCategoryLibraryContain) { return BaseResponse.success(coscoCategoryLibraryContainService.insertCoscoCategoryLibraryContain(coscoCategoryLibraryContain)); } @@ -46,7 +47,7 @@ public class CoscoCategoryLibraryContainController extends BaseController { * 修改品类库_品类库包含品类 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoCategoryLibraryContain coscoCategoryLibraryContain) { + public BaseResponse edit(@RequestBody CoscoCategoryLibraryContain coscoCategoryLibraryContain) { return BaseResponse.success(coscoCategoryLibraryContainService.updateCoscoCategoryLibraryContain(coscoCategoryLibraryContain)); } @@ -54,7 +55,7 @@ public class CoscoCategoryLibraryContainController extends BaseController { * 删除品类库_品类库包含品类 */ @DeleteMapping("/{categoryLibraryIds}") - public BaseResponse remove(@PathVariable String[] categoryLibraryIds) { + public BaseResponse remove(@PathVariable String[] categoryLibraryIds) { return BaseResponse.success(coscoCategoryLibraryContainService.deleteCoscoCategoryLibraryContainByCategoryLibraryIds(categoryLibraryIds)); } @@ -64,7 +65,7 @@ public class CoscoCategoryLibraryContainController extends BaseController { * @return */ @GetMapping("/treeList") - public BaseResponse treeList(CoscoCategoryLibraryContain coscoCategoryLibraryContain) { + public BaseResponse> treeList(CoscoCategoryLibraryContain coscoCategoryLibraryContain) { return BaseResponse.success(coscoCategoryLibraryContainService.treeList(coscoCategoryLibraryContain)); } @@ -72,7 +73,7 @@ public class CoscoCategoryLibraryContainController extends BaseController { * 修改品类库锁定状态 */ @PutMapping("/lock") - public BaseResponse lock(@RequestBody List coscoCategoryLibraryContain) { + public BaseResponse lock(@RequestBody List coscoCategoryLibraryContain) { return BaseResponse.success(coscoCategoryLibraryContainService.updateList(coscoCategoryLibraryContain)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java index 269cd3e..808cad5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibraryController.java @@ -6,9 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrary; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.*; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibraryVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibraryVo; -import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO; +import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.*; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +48,7 @@ public class CoscoCategoryLibraryController extends BaseController { * 获取品类库_品类库详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoCategoryLibraryService.selectCoscoCategoryLibraryById(id)); } @@ -59,8 +57,8 @@ public class CoscoCategoryLibraryController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody AddCoscoCategoryLibraryVo coscoCategoryLibrary) { - if(coscoCategoryLibrary.getCategoryIds()==null || coscoCategoryLibrary.getCategoryIds().size()==0){ - throw new RuntimeException("请选择品类"); + if(coscoCategoryLibrary.getCategoryIds()==null || coscoCategoryLibrary.getCategoryIds().isEmpty()){ + BaseResponse.fail("请选择品类"); } return BaseResponse.success(coscoCategoryLibraryService.insertCoscoCategoryLibrary(coscoCategoryLibrary)); } @@ -69,7 +67,7 @@ public class CoscoCategoryLibraryController extends BaseController { * 修改品类库_品类库 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoCategoryLibrary coscoCategoryLibrary) { + public BaseResponse edit(@RequestBody CoscoCategoryLibrary coscoCategoryLibrary) { return BaseResponse.success(coscoCategoryLibraryService.updateCoscoCategoryLibrary(coscoCategoryLibrary)); } @@ -77,7 +75,7 @@ public class CoscoCategoryLibraryController extends BaseController { * 删除品类库_品类库 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoCategoryLibraryService.deleteCoscoCategoryLibraryByIds(ids)); } @@ -85,7 +83,7 @@ public class CoscoCategoryLibraryController extends BaseController { * 品类库详情查看 */ @GetMapping("/detail") - public BaseResponse detail(String id) { + public BaseResponse detail(String id) { return BaseResponse.success(coscoCategoryLibraryService.selectCoscoCategoryLibraryDetailById(id)); } @@ -96,7 +94,7 @@ public class CoscoCategoryLibraryController extends BaseController { * @return */ @GetMapping("/getAddSupplierList") - public BaseResponse getAddSupplierList(String id) { + public BaseResponse> getAddSupplierList(String id) { return BaseResponse.success(coscoCategoryLibraryService.selectSupplierByLibraryId(id)); } @@ -118,7 +116,7 @@ public class CoscoCategoryLibraryController extends BaseController { * @return */ @GetMapping("/superiorLockList") - public BaseResponse superiorLockList() { + public BaseResponse> superiorLockList() { return BaseResponse.success(coscoCategoryLibraryService.superiorLockList()); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierApplyController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierApplyController.java index 58d00e9..bae0cd1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierApplyController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierApplyController.java @@ -35,7 +35,7 @@ public class CoscoCategoryLibrarySupplierApplyController extends BaseController * 获取品类库_品类库入库供应商申请单详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoCategoryLibrarySupplierApplyService.selectCoscoCategoryLibrarySupplierApplyById(id)); } @@ -43,7 +43,7 @@ public class CoscoCategoryLibrarySupplierApplyController extends BaseController * 新增品类库_品类库入库供应商申请单 */ @PostMapping - public BaseResponse add(@RequestBody AddCoscoCategoryLibrarySupplierApplyVo coscoCategoryLibrarySupplierApply) { + public BaseResponse add(@RequestBody AddCoscoCategoryLibrarySupplierApplyVo coscoCategoryLibrarySupplierApply) { return BaseResponse.success(coscoCategoryLibrarySupplierApplyService.insertCoscoCategoryLibrarySupplierApply(coscoCategoryLibrarySupplierApply)); } @@ -51,7 +51,7 @@ public class CoscoCategoryLibrarySupplierApplyController extends BaseController * 修改品类库_品类库入库供应商申请单 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoCategoryLibrarySupplierApply coscoCategoryLibrarySupplierApply) { + public BaseResponse edit(@RequestBody CoscoCategoryLibrarySupplierApply coscoCategoryLibrarySupplierApply) { return BaseResponse.success(coscoCategoryLibrarySupplierApplyService.updateCoscoCategoryLibrarySupplierApply(coscoCategoryLibrarySupplierApply)); } @@ -59,7 +59,7 @@ public class CoscoCategoryLibrarySupplierApplyController extends BaseController * 删除品类库_品类库入库供应商申请单 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoCategoryLibrarySupplierApplyService.deleteCoscoCategoryLibrarySupplierApplyByIds(ids)); } @@ -85,7 +85,7 @@ public class CoscoCategoryLibrarySupplierApplyController extends BaseController * 请求审批 */ @PostMapping("/approval") - public BaseResponse approval(@RequestBody AddCoscoCategoryLibrarySupplierApplyVo applyVo) { + public BaseResponse approval(@RequestBody AddCoscoCategoryLibrarySupplierApplyVo applyVo) { return BaseResponse.success(coscoCategoryLibrarySupplierApplyService.approval(applyVo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierController.java index daebbe8..364f15a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryLibrarySupplierController.java @@ -30,7 +30,7 @@ public class CoscoCategoryLibrarySupplierController extends BaseController { * 获取品类库_品类库入库供应商详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoCategoryLibrarySupplierService.selectCoscoCategoryLibrarySupplierById(id)); } @@ -38,7 +38,7 @@ public class CoscoCategoryLibrarySupplierController extends BaseController { * 新增品类库_品类库入库供应商 */ @PostMapping - public BaseResponse add(@RequestBody CoscoCategoryLibrarySupplier coscoCategoryLibrarySupplier) { + public BaseResponse add(@RequestBody CoscoCategoryLibrarySupplier coscoCategoryLibrarySupplier) { return BaseResponse.success(coscoCategoryLibrarySupplierService.insertCoscoCategoryLibrarySupplier(coscoCategoryLibrarySupplier)); } @@ -46,7 +46,7 @@ public class CoscoCategoryLibrarySupplierController extends BaseController { * 修改品类库_品类库入库供应商 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoCategoryLibrarySupplier coscoCategoryLibrarySupplier) { + public BaseResponse edit(@RequestBody CoscoCategoryLibrarySupplier coscoCategoryLibrarySupplier) { return BaseResponse.success(coscoCategoryLibrarySupplierService.updateCoscoCategoryLibrarySupplier(coscoCategoryLibrarySupplier)); } @@ -54,7 +54,7 @@ public class CoscoCategoryLibrarySupplierController extends BaseController { * 删除品类库_品类库入库供应商 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoCategoryLibrarySupplierService.deleteCoscoCategoryLibrarySupplierByIds(ids)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java index e742d0f..0f6783e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryLibrarySupplierApplyService.java @@ -101,7 +101,7 @@ public interface ICoscoCategoryLibrarySupplierApplyService extends IBaseService< /** * 审核同步接口 * - * @param coscoCategoryLibrary + * @param librarySupplierApply * @return */ int synchronousLibrarySupplierApply(CoscoCategoryLibrarySupplierApply librarySupplierApply); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java index c5b42db..3979770 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateLevelController.java @@ -7,6 +7,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateLe import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 【供应商评价_评价结果等级规则表】Controller * @@ -21,7 +23,7 @@ public class CoscoEvaluateLevelController extends BaseController { @GetMapping("/getAllList") - public BaseResponse getAllList(CoscoEvaluateLevel coscoEvaluateLevel) { + public BaseResponse> getAllList(CoscoEvaluateLevel coscoEvaluateLevel) { return BaseResponse.success(coscoEvaluateLevelService.selectCoscoEvaluateLevelList(coscoEvaluateLevel)); } @@ -29,7 +31,7 @@ public class CoscoEvaluateLevelController extends BaseController { * 获取【供应商评价_评价结果等级规则表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateLevelService.selectCoscoEvaluateLevelById(id)); } @@ -80,7 +82,7 @@ public class CoscoEvaluateLevelController extends BaseController { * 删除【供应商评价_评价结果等级规则表】 */ @DeleteMapping("/{id}") - public BaseResponse remove(@PathVariable String id) { + public BaseResponse remove(@PathVariable String id) { return BaseResponse.success(coscoEvaluateLevelService.deleteCoscoEvaluateLevelById(id)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateScoringController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateScoringController.java index 1ce0b8b..6495908 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateScoringController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateScoringController.java @@ -27,7 +27,7 @@ public class CoscoEvaluateScoringController extends BaseController { * 获取【供应商评价_评价任务评审打分表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateScoringService.selectCoscoEvaluateScoringById(id)); } @@ -35,7 +35,7 @@ public class CoscoEvaluateScoringController extends BaseController { * 新增【供应商评价_评价任务评审打分表】 */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateScoring coscoEvaluateScoring) { + public BaseResponse add(@RequestBody CoscoEvaluateScoring coscoEvaluateScoring) { return BaseResponse.success(coscoEvaluateScoringService.insertCoscoEvaluateScoring(coscoEvaluateScoring)); } @@ -43,7 +43,7 @@ public class CoscoEvaluateScoringController extends BaseController { * 修改【供应商评价_评价任务评审打分表】 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateScoring coscoEvaluateScoring) { + public BaseResponse edit(@RequestBody CoscoEvaluateScoring coscoEvaluateScoring) { return BaseResponse.success(coscoEvaluateScoringService.updateCoscoEvaluateScoring(coscoEvaluateScoring)); } @@ -51,7 +51,7 @@ public class CoscoEvaluateScoringController extends BaseController { * 删除【供应商评价_评价任务评审打分表】 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoEvaluateScoringService.deleteCoscoEvaluateScoringByIds(ids)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java index 30c427e..8d53ec6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java @@ -53,7 +53,7 @@ public class CoscoEvaluateTaskController extends BaseController { * 获取【供应商评价_评价任务主表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateTaskService.selectCoscoEvaluateTaskById(id)); } @@ -61,7 +61,7 @@ public class CoscoEvaluateTaskController extends BaseController { * 新增【供应商评价_评价任务主表】 */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateTask coscoEvaluateTask) { + public BaseResponse add(@RequestBody CoscoEvaluateTask coscoEvaluateTask) { return BaseResponse.success(coscoEvaluateTaskService.insertCoscoEvaluateTask(coscoEvaluateTask)); } @@ -69,7 +69,7 @@ public class CoscoEvaluateTaskController extends BaseController { * 修改【供应商评价_评价任务主表】 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateTask coscoEvaluateTask) { + public BaseResponse edit(@RequestBody CoscoEvaluateTask coscoEvaluateTask) { return BaseResponse.success(coscoEvaluateTaskService.updateCoscoEvaluateTask(coscoEvaluateTask)); } @@ -77,7 +77,7 @@ public class CoscoEvaluateTaskController extends BaseController { * 删除【供应商评价_评价任务主表】 */ @DeleteMapping("/{id}") - public BaseResponse remove(@PathVariable String id) { + public BaseResponse remove(@PathVariable String id) { return BaseResponse.success(coscoEvaluateTaskService.deleteCoscoEvaluateTaskById(id)); } @@ -87,7 +87,7 @@ public class CoscoEvaluateTaskController extends BaseController { * @return */ @PostMapping("/addTask") - public BaseResponse addTask(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + public BaseResponse addTask(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { return BaseResponse.success(coscoEvaluateTaskService.addTask(addCoscoEvaluateTaskVo)); } @@ -111,7 +111,7 @@ public class CoscoEvaluateTaskController extends BaseController { * @return */ @PostMapping("/incrementalDivisionOfLaborAdditionAdd") - public BaseResponse incrementalDivisionOfLaborAdditionAdd(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { + public BaseResponse incrementalDivisionOfLaborAdditionAdd(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { return BaseResponse.success(coscoEvaluateTaskService.incrementalDivisionOfLaborAdditionAdd(addCoscoEvaluateTaskVo)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java index 59ffd62..dc9c0ab 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java @@ -39,35 +39,41 @@ public class CoscoEvaluateTaskSupplierController extends BaseController { */ @PostMapping("/getPage") public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) - @RequestBody CoscoEvaluateTaskSupplier taskListVo) { + @RequestBody CoscoEvaluateTaskSupplier taskListVo) { return BaseResponse.success(coscoEvaluateTaskSupplierService.getPage(taskListVo)); } /** * 导出供应商评价 + * * @param taskListVo * @return */ @GetMapping("/export") - public void export(HttpServletResponse response, CoscoEvaluateTaskSupplier taskListVo) throws Exception { - List list=coscoEvaluateTaskSupplierService.export(taskListVo); - String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8"); - // 动态设置导出字段（忽略未标注字段） - Set includeFields = new HashSet<>(Arrays.asList( - "supplierName", "categoryName","reviewScore", "reviewResult" // 指定要导出的字段名 - )); - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - response.setCharacterEncoding("utf-8"); - EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) - .includeColumnFieldNames(includeFields) - .sheet("供应评价") - .doWrite(list); + public void export(HttpServletResponse response, CoscoEvaluateTaskSupplier taskListVo) { + try { + List list = coscoEvaluateTaskSupplierService.export(taskListVo); + String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8"); + // 动态设置导出字段（忽略未标注字段） + Set includeFields = new HashSet<>(Arrays.asList( + "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名 + )); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setCharacterEncoding("utf-8"); + EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) + .includeColumnFieldNames(includeFields) + .sheet("供应评价") + .doWrite(list); + } catch (Exception e) { + e.printStackTrace(); + } + } @GetMapping("/getScoreResult") - public BaseResponse getScoreResult(String id) { + public BaseResponse getScoreResult(String id) { return BaseResponse.success(coscoEvaluateTaskSupplierService.getScoreResult(id)); } @@ -76,7 +82,7 @@ public class CoscoEvaluateTaskSupplierController extends BaseController { * 获取【供应商评价_评价任务关联供应商表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateTaskSupplierService.selectCoscoEvaluateTaskSupplierById(id)); } @@ -84,7 +90,7 @@ public class CoscoEvaluateTaskSupplierController extends BaseController { * 新增【供应商评价_评价任务关联供应商表】 */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier) { + public BaseResponse add(@RequestBody CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier) { return BaseResponse.success(coscoEvaluateTaskSupplierService.insertCoscoEvaluateTaskSupplier(coscoEvaluateTaskSupplier)); } @@ -92,15 +98,15 @@ public class CoscoEvaluateTaskSupplierController extends BaseController { * 修改【供应商评价_评价任务关联供应商表】 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier) { + public BaseResponse edit(@RequestBody CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier) { return BaseResponse.success(coscoEvaluateTaskSupplierService.updateCoscoEvaluateTaskSupplier(coscoEvaluateTaskSupplier)); } /** * 删除【供应商评价_评价任务关联供应商表】 */ - @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + @DeleteMapping("/{ids}") + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoEvaluateTaskSupplierService.deleteCoscoEvaluateTaskSupplierByIds(ids)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierUserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierUserController.java index e817e2c..1c828bc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierUserController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierUserController.java @@ -6,6 +6,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplierUser; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierUserService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.AddScoreVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskIndicatorBaseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,7 +30,7 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { * 获取【供应商评价_评价任务供应商对应评审人表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateTaskSupplierUserService.selectCoscoEvaluateTaskSupplierUserById(id)); } @@ -37,7 +38,7 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { * 新增【供应商评价_评价任务供应商对应评审人表】 */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser) { + public BaseResponse add(@RequestBody CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser) { return BaseResponse.success(coscoEvaluateTaskSupplierUserService.insertCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUser)); } @@ -45,7 +46,7 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { * 修改【供应商评价_评价任务供应商对应评审人表】 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser) { + public BaseResponse edit(@RequestBody CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser) { return BaseResponse.success(coscoEvaluateTaskSupplierUserService.updateCoscoEvaluateTaskSupplierUser(coscoEvaluateTaskSupplierUser)); } @@ -53,7 +54,7 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { * 删除【供应商评价_评价任务供应商对应评审人表】 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoEvaluateTaskSupplierUserService.deleteCoscoEvaluateTaskSupplierUserByIds(ids)); } @@ -61,7 +62,7 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { * 获取打分项 */ @GetMapping("/getIndicator") - public BaseResponse getIndicator(String id) { + public BaseResponse getIndicator(String id) { return BaseResponse.success(coscoEvaluateTaskSupplierUserService.getIndicator(id)); } @@ -75,7 +76,7 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { if(coscoEvaluateTaskSupplierUser.getReviewStatus().equals(SupplierUserConstant.SCORE_STATUS_YD)){ return BaseResponse.fail("当前人员已经打分，无法修改"); } - if(vo.getScoreVoList()==null||vo.getScoreVoList().size()==0){ + if(vo.getScoreVoList()==null||vo.getScoreVoList().isEmpty()){ return BaseResponse.fail("打分项信息为空"); } //打分项信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskUserIndicatorController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskUserIndicatorController.java index ce48f86..2f82d74 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskUserIndicatorController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskUserIndicatorController.java @@ -27,7 +27,7 @@ public class CoscoEvaluateTaskUserIndicatorController extends BaseController { * 获取【供应商评价_评审人评价分工关联指标表】详细信息 */ @GetMapping(value = "/{evaluateTaskSupplierUserId}") - public BaseResponse getInfo(@PathVariable("evaluateTaskSupplierUserId") String evaluateTaskSupplierUserId) { + public BaseResponse getInfo(@PathVariable("evaluateTaskSupplierUserId") String evaluateTaskSupplierUserId) { return BaseResponse.success(coscoEvaluateTaskUserIndicatorService.selectCoscoEvaluateTaskUserIndicatorByEvaluateTaskSupplierUserId(evaluateTaskSupplierUserId)); } @@ -35,7 +35,7 @@ public class CoscoEvaluateTaskUserIndicatorController extends BaseController { * 新增【供应商评价_评审人评价分工关联指标表】 */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateTaskUserIndicator coscoEvaluateTaskUserIndicator) { + public BaseResponse add(@RequestBody CoscoEvaluateTaskUserIndicator coscoEvaluateTaskUserIndicator) { return BaseResponse.success(coscoEvaluateTaskUserIndicatorService.insertCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskUserIndicator)); } @@ -43,7 +43,7 @@ public class CoscoEvaluateTaskUserIndicatorController extends BaseController { * 修改【供应商评价_评审人评价分工关联指标表】 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateTaskUserIndicator coscoEvaluateTaskUserIndicator) { + public BaseResponse edit(@RequestBody CoscoEvaluateTaskUserIndicator coscoEvaluateTaskUserIndicator) { return BaseResponse.success(coscoEvaluateTaskUserIndicatorService.updateCoscoEvaluateTaskUserIndicator(coscoEvaluateTaskUserIndicator)); } @@ -51,7 +51,7 @@ public class CoscoEvaluateTaskUserIndicatorController extends BaseController { * 删除【供应商评价_评审人评价分工关联指标表】 */ @DeleteMapping("/{evaluateTaskSupplierUserIds}") - public BaseResponse remove(@PathVariable String[] evaluateTaskSupplierUserIds) { + public BaseResponse remove(@PathVariable String[] evaluateTaskSupplierUserIds) { return BaseResponse.success(coscoEvaluateTaskUserIndicatorService.deleteCoscoEvaluateTaskUserIndicatorByEvaluateTaskSupplierUserIds(evaluateTaskSupplierUserIds)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateController.java index cc2c559..e0971dc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateController.java @@ -15,6 +15,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 【供应商评价_评价表模板主表】Controller @@ -46,7 +48,7 @@ public class CoscoEvaluateTemplateController extends BaseController { * 获取全部模板接口 */ @GetMapping("/getAllList") - public BaseResponse getAllList( CoscoEvaluateTemplate template) { + public BaseResponse> getAllList(CoscoEvaluateTemplate template) { return BaseResponse.success(coscoEvaluateTemplateService.selectCoscoEvaluateTemplateList(template)); } @@ -55,7 +57,7 @@ public class CoscoEvaluateTemplateController extends BaseController { * 获取【供应商评价_评价表模板主表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateTemplateService.selectCoscoEvaluateTemplateById(id)); } @@ -64,7 +66,7 @@ public class CoscoEvaluateTemplateController extends BaseController { */ @PostMapping - public BaseResponse add(@RequestBody AddCoscoEvaluateTemplateVo templateVo) { + public BaseResponse add(@RequestBody AddCoscoEvaluateTemplateVo templateVo) { return BaseResponse.success(coscoEvaluateTemplateService.insertCoscoEvaluateTemplate(templateVo)); } @@ -93,7 +95,7 @@ public class CoscoEvaluateTemplateController extends BaseController { */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoEvaluateTemplateService.deleteCoscoEvaluateTemplateByIds(ids)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorNdController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorNdController.java index fefcdc1..9b2e485 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorNdController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorNdController.java @@ -27,7 +27,7 @@ public class CoscoEvaluateTemplateIndicatorNdController extends BaseController { * 获取【供应商评价_评价单模板二级指标项表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateTemplateIndicatorNdService.selectCoscoEvaluateTemplateIndicatorNdById(id)); } @@ -36,7 +36,7 @@ public class CoscoEvaluateTemplateIndicatorNdController extends BaseController { */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd) { + public BaseResponse add(@RequestBody CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd) { return BaseResponse.success(coscoEvaluateTemplateIndicatorNdService.insertCoscoEvaluateTemplateIndicatorNd(coscoEvaluateTemplateIndicatorNd)); } @@ -45,7 +45,7 @@ public class CoscoEvaluateTemplateIndicatorNdController extends BaseController { */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd) { + public BaseResponse edit(@RequestBody CoscoEvaluateTemplateIndicatorNd coscoEvaluateTemplateIndicatorNd) { return BaseResponse.success(coscoEvaluateTemplateIndicatorNdService.updateCoscoEvaluateTemplateIndicatorNd(coscoEvaluateTemplateIndicatorNd)); } @@ -54,7 +54,7 @@ public class CoscoEvaluateTemplateIndicatorNdController extends BaseController { */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoEvaluateTemplateIndicatorNdService.deleteCoscoEvaluateTemplateIndicatorNdByIds(ids)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorStController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorStController.java index f53cc01..943fe99 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorStController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTemplateIndicatorStController.java @@ -27,7 +27,7 @@ public class CoscoEvaluateTemplateIndicatorStController extends BaseController { * 获取【供应商评价_评价表模板一级指标项表】详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoEvaluateTemplateIndicatorStService.selectCoscoEvaluateTemplateIndicatorStById(id)); } @@ -36,7 +36,7 @@ public class CoscoEvaluateTemplateIndicatorStController extends BaseController { */ @PostMapping - public BaseResponse add(@RequestBody CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt) { + public BaseResponse add(@RequestBody CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt) { return BaseResponse.success(coscoEvaluateTemplateIndicatorStService.insertCoscoEvaluateTemplateIndicatorSt(coscoEvaluateTemplateIndicatorSt)); } @@ -45,7 +45,7 @@ public class CoscoEvaluateTemplateIndicatorStController extends BaseController { */ @PutMapping - public BaseResponse edit(@RequestBody CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt) { + public BaseResponse edit(@RequestBody CoscoEvaluateTemplateIndicatorSt coscoEvaluateTemplateIndicatorSt) { return BaseResponse.success(coscoEvaluateTemplateIndicatorStService.updateCoscoEvaluateTemplateIndicatorSt(coscoEvaluateTemplateIndicatorSt)); } @@ -54,7 +54,7 @@ public class CoscoEvaluateTemplateIndicatorStController extends BaseController { */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoEvaluateTemplateIndicatorStService.deleteCoscoEvaluateTemplateIndicatorStByIds(ids)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTemplateService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTemplateService.java index a6cae53..c2990a5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTemplateService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ICoscoEvaluateTemplateService.java @@ -33,7 +33,7 @@ public interface ICoscoEvaluateTemplateService { /** * 新增【供应商评价_评价表模板主表】 * - * @param coscoEvaluateTemplate 【供应商评价_评价表模板主表】 + * @param templateVo 【供应商评价_评价表模板主表】 * @return 结果 */ public int insertCoscoEvaluateTemplate(AddCoscoEvaluateTemplateVo templateVo);