修改问题

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<CoscoAnnualreviewScoring> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewScoringService.deleteCoscoAnnualreviewScoringByIds(ids));
     }
 

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<AddTaskVo> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewTaskService.deleteCoscoAnnualreviewTaskByIds(ids));
     }
 

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<CoscoAnnualreviewTaskSupplier> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewTaskSupplierService.deleteCoscoAnnualreviewTaskSupplierByIds(ids));
     }
 

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<AnnualreviewTaskSupplierUserInfoVo> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.deleteCoscoAnnualreviewTaskSupplierUserByIds(ids));
     }
 
@@ -85,7 +85,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
             return BaseResponse.fail("当前人员已经打分，无法修改");
         }
         List<AnnualTaskIndicatorVo> scoreVoList = vo.getScoreVoList();
-        if(scoreVoList.size()==0){
+        if(scoreVoList.isEmpty()){
             return BaseResponse.fail("请选择打分项");
         }
         coscoAnnualreviewTaskSupplierUserService.addScore(vo);

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<List<CoscoAnnualreviewTemplate>> 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<AddCoscoAnnualreviewTemplateVo> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewTemplateService.deleteCoscoAnnualreviewTemplateByIds(ids));
     }
 

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<CoscoAnnualreviewTemplateIndicator> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewTemplateIndicatorService.deleteCoscoAnnualreviewTemplateIndicatorByIds(ids));
     }
 }

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);

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<List<CoscoCategoryVO>> 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<List<CoscoCategoryVO>> 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<CoscoCategory> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String id) {
         return BaseResponse.success(coscoCategoryService.deleteCoscoCategoryById(id));
     }
 }

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<CoscoCategoryLibraryContain> 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<Integer> 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<Integer> 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<Integer> 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<List<CategoryContainListVo>> 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> coscoCategoryLibraryContain) {
+    public BaseResponse<Integer> lock(@RequestBody List<CoscoCategoryLibraryContain> coscoCategoryLibraryContain) {
         return BaseResponse.success(coscoCategoryLibraryContainService.updateList(coscoCategoryLibraryContain));
     }
 

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<CoscoCategoryLibrary> 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<Integer> 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<Integer> 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<CoscoCategoryLibraryDetailVo> 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<List<CoscoCategoryLibrarySupplierVo>> 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<List<String>> superiorLockList() {
         return BaseResponse.success(coscoCategoryLibraryService.superiorLockList());
     }
 

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<ListCoscoCategoryLibrarySupplierApplyVo> 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<Integer> 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<Integer> 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<Integer> 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<Integer> approval(@RequestBody AddCoscoCategoryLibrarySupplierApplyVo applyVo) {
         return BaseResponse.success(coscoCategoryLibrarySupplierApplyService.approval(applyVo));
     }
 

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<CoscoCategoryLibrarySupplier> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoCategoryLibrarySupplierService.deleteCoscoCategoryLibrarySupplierByIds(ids));
     }
 }

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);

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<List<CoscoEvaluateLevel>> 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<CoscoEvaluateLevel> 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<Integer> remove(@PathVariable String id) {
         return BaseResponse.success(coscoEvaluateLevelService.deleteCoscoEvaluateLevelById(id));
     }
 }

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<CoscoEvaluateScoring> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoEvaluateScoringService.deleteCoscoEvaluateScoringByIds(ids));
     }
 }

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<AddCoscoEvaluateTaskVo> 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<Integer> 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<Integer> 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<Integer> 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<Integer> 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<Integer> incrementalDivisionOfLaborAdditionAdd(@RequestBody AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
         return BaseResponse.success(coscoEvaluateTaskService.incrementalDivisionOfLaborAdditionAdd(addCoscoEvaluateTaskVo));
     }
 

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<IPage<CoscoEvaluateTaskSupplier>> 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<CoscoEvaluateTaskSupplier> list=coscoEvaluateTaskSupplierService.export(taskListVo);
-        String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8");
-        // 动态设置导出字段（忽略未标注字段）
-        Set<String> 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<CoscoEvaluateTaskSupplier> list = coscoEvaluateTaskSupplierService.export(taskListVo);
+            String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8");
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> 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<Object> 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<CoscoEvaluateTaskSupplier> 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<Integer> 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<Integer> edit(@RequestBody CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier) {
         return BaseResponse.success(coscoEvaluateTaskSupplierService.updateCoscoEvaluateTaskSupplier(coscoEvaluateTaskSupplier));
     }
 
     /**
      * 删除【供应商评价_评价任务关联供应商表】
      */
-	@DeleteMapping("/{ids}")
-    public BaseResponse remove(@PathVariable String[] ids) {
+    @DeleteMapping("/{ids}")
+    public BaseResponse<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoEvaluateTaskSupplierService.deleteCoscoEvaluateTaskSupplierByIds(ids));
     }
 

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<CoscoEvaluateTaskSupplierUser> 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<Integer> 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<Integer> 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<Integer> 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<TaskIndicatorBaseVo> 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("打分项信息为空");
         }
         //打分项信息

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<CoscoEvaluateTaskUserIndicator> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] evaluateTaskSupplierUserIds) {
         return BaseResponse.success(coscoEvaluateTaskUserIndicatorService.deleteCoscoEvaluateTaskUserIndicatorByEvaluateTaskSupplierUserIds(evaluateTaskSupplierUserIds));
     }
 }

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<List<CoscoEvaluateTemplate>> 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<AddCoscoEvaluateTemplateVo> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoEvaluateTemplateService.deleteCoscoEvaluateTemplateByIds(ids));
     }
 }

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<CoscoEvaluateTemplateIndicatorNd> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoEvaluateTemplateIndicatorNdService.deleteCoscoEvaluateTemplateIndicatorNdByIds(ids));
     }
 }

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<CoscoEvaluateTemplateIndicatorSt> 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<Integer> 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<Integer> 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<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoEvaluateTemplateIndicatorStService.deleteCoscoEvaluateTemplateIndicatorStByIds(ids));
     }
 }

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);