diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java index db1e9e7..52dd4bd 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/CoscoCategoryConstant.java @@ -49,4 +49,8 @@ public interface CoscoCategoryConstant { * 锁定类型(0.未锁定、1.锁定) */ public static final Long LOCK_TYPE_YES = 1L; + /** + * 最高级 0 + */ + public static final String LEVEL_TOP = "0"; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java new file mode 100644 index 0000000..4b648f9 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/ErrorMessageConstant.java @@ -0,0 +1,23 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; + +/** + * 错误信息常量 + */ +public interface ErrorMessageConstant { + /** + * "id不能为空" + */ + public static final String ID_NOT_NULL = "id不能为空"; + /** + * "已启用禁用模板不能进行修改" + */ + public static final String ENABLE_DISABLE_TEMPLATE_NOT_MODIFY = "已启用禁用模板不能进行修改"; + /** + * "请选择上级品类" + */ + public static final String PLEASE_SELECT_SUPERIOR_CATEGORY = "请选择上级品类"; + /** + * "请选择正确的父级分类" + */ + public static final String PLEASE_SELECT_THE_CORRECT_PARENT_CATEGORY = "请选择正确的父级分类"; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java index c6801bc..3a798a2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/UserVo.java @@ -2,8 +2,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class UserVo { +public class UserVo implements Serializable { + private static final long serialVersionUID = 1L; /** * 用户名称 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java index 2f94df9..af67625 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/CoscoBaseEntity.java @@ -1,5 +1,6 @@ package com.chinaunicom.zyhy.ebtp.supplier.common; +import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java index 09b8761..be5f905 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/controller/FileController.java @@ -29,19 +29,20 @@ public class FileController { @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public Map upload(@RequestParam("file") MultipartFile file, HttpServletRequest request) { String baseUrl = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort(); - - String filename = fileStorageService.storeFile(file); - String fileUrl = baseUrl+"/files/" + filename; - - + String oldName= file.getOriginalFilename(); Map response = new HashMap<>(); - response.put("fileName", filename); - response.put("fileType", file.getContentType()); - response.put("fileSize", file.getSize()); - response.put("url", fileUrl); - response.put("filePath", uploadDir + "/"+filename); - + if(!file.isEmpty()){ + String filename = fileStorageService.storeFile(file); + String fileUrl = baseUrl+"/files/" + filename; + response.put("fileName", oldName); + response.put("fileType", file.getContentType()); + response.put("fileSize", file.getSize()); + response.put("url", fileUrl); + response.put("filePath", uploadDir + "/"+filename); + } return response; + + } } 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 6ed4473..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 @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ReviewTemplateConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTemplateService; @@ -13,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 * @@ -31,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)); } @@ -52,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)); } @@ -60,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)); } @@ -70,11 +73,11 @@ public class CoscoAnnualreviewTemplateController extends BaseController { @PutMapping public BaseResponse edit(@RequestBody AddCoscoAnnualreviewTemplateVo coscoAnnualreviewTemplate) { if (coscoAnnualreviewTemplate.getId() == null) { - return BaseResponse.fail("id不能为空"); + return BaseResponse.fail(ErrorMessageConstant.ID_NOT_NULL); } CoscoAnnualreviewTemplate coscoAnnualreviewTemplate1 = coscoAnnualreviewTemplateService.selectCoscoAnnualreviewTemplateById(coscoAnnualreviewTemplate.getId()); if (!coscoAnnualreviewTemplate1.getStatus().equals(ReviewTemplateConstant.DRAFT_STATUS)) { - return BaseResponse.fail("已启用禁用模板不能进行修改"); + return BaseResponse.fail(ErrorMessageConstant.ENABLE_DISABLE_TEMPLATE_NOT_MODIFY); } return BaseResponse.success(coscoAnnualreviewTemplateService.updateCoscoAnnualreviewTemplate(coscoAnnualreviewTemplate)); } @@ -83,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/coscoAnnualreview/vo/AnnualAddScoreVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualAddScoreVo.java index c48b1a4..4e7b6d0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualAddScoreVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualAddScoreVo.java @@ -1,11 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class AnnualAddScoreVo { +public class AnnualAddScoreVo implements Serializable { /** * 任务id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualTaskIndicatorVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualTaskIndicatorVo.java index 3f685b8..e428385 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualTaskIndicatorVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualTaskIndicatorVo.java @@ -1,12 +1,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; + /** * 人员打分项信息 */ @Data -public class AnnualTaskIndicatorVo { +public class AnnualTaskIndicatorVo implements Serializable { /** * 打分项id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java index 313e14a..7157827 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierListVo.java @@ -1,11 +1,14 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AnnualreviewTaskSupplierListVo { +public class AnnualreviewTaskSupplierListVo implements Serializable { /** * 供应商id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java index b2d2cf8..1b47d75 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java @@ -1,11 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class AnnualreviewTaskSupplierUserInfoVo { +public class AnnualreviewTaskSupplierUserInfoVo implements Serializable { /** * 供应商 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java index 9ed0cea..2c54b8c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserVo.java @@ -1,14 +1,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @Data -public class AnnualreviewTaskSupplierUserVo { +public class AnnualreviewTaskSupplierUserVo implements Serializable { private String id; /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AuditQuantityVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AuditQuantityVo.java index 0eb8c86..84f0f3b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AuditQuantityVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AuditQuantityVo.java @@ -1,9 +1,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; + @Data -public class AuditQuantityVo { +public class AuditQuantityVo implements Serializable { /** * 总数 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java index 7a9170d..3d4fb0e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java @@ -1,14 +1,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @Data -public class CoscoAnnualreviewTaskListVo { +public class CoscoAnnualreviewTaskListVo implements Serializable { /** * 评价id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/SupplierPeopleVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/SupplierPeopleVo.java index 08a5cf8..006fdbe 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/SupplierPeopleVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/SupplierPeopleVo.java @@ -1,11 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class SupplierPeopleVo { +public class SupplierPeopleVo implements Serializable { private String suppliedId; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistController.java index 20992c8..7b5a7fa 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistController.java @@ -43,7 +43,7 @@ public class CoscoBlacklistController extends BaseController { * 获取供应商黑名单_供应商加入黑灰名单申请详细信息 */ @GetMapping(value = "/{id}") - public BaseResponse getInfo(@PathVariable("id") String id) { + public BaseResponse getInfo(@PathVariable("id") String id) { return BaseResponse.success(coscoBlacklistService.selectCoscoBlacklistById(id)); } @@ -51,7 +51,7 @@ public class CoscoBlacklistController extends BaseController { * 新增供应商黑名单_供应商加入黑灰名单申请 */ @PostMapping - public BaseResponse add(@RequestBody AddBlackListVo listVo) { + public BaseResponse add(@RequestBody AddBlackListVo listVo) { return BaseResponse.success(coscoBlacklistService.insertCoscoBlacklist(listVo)); } @@ -59,7 +59,7 @@ public class CoscoBlacklistController extends BaseController { * 修改供应商黑名单_供应商加入黑灰名单申请 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoBlacklist coscoBlacklist) { + public BaseResponse edit(@RequestBody CoscoBlacklist coscoBlacklist) { return BaseResponse.success(coscoBlacklistService.updateCoscoBlacklist(coscoBlacklist)); } @@ -67,7 +67,7 @@ public class CoscoBlacklistController extends BaseController { * 删除供应商黑名单_供应商加入黑灰名单申请 */ @DeleteMapping("/{ids}") - public BaseResponse remove(@PathVariable String[] ids) { + public BaseResponse remove(@PathVariable String[] ids) { return BaseResponse.success(coscoBlacklistService.deleteCoscoBlacklistByIds(ids)); } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistSupplierController.java index fa73f45..2f08565 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/controller/CoscoBlacklistSupplierController.java @@ -25,7 +25,7 @@ public class CoscoBlacklistSupplierController extends BaseController { * 获取供应商黑名单_供应商加入黑灰名单申请关联供应商详细信息 */ @GetMapping(value = "/{blacklistId}") - public BaseResponse getInfo(@PathVariable("blacklistId") String blacklistId) { + public BaseResponse getInfo(@PathVariable("blacklistId") String blacklistId) { return BaseResponse.success(coscoBlacklistSupplierService.selectCoscoBlacklistSupplierByBlacklistId(blacklistId)); } @@ -33,7 +33,7 @@ public class CoscoBlacklistSupplierController extends BaseController { * 新增供应商黑名单_供应商加入黑灰名单申请关联供应商 */ @PostMapping - public BaseResponse add(@RequestBody CoscoBlacklistSupplier coscoBlacklistSupplier) { + public BaseResponse add(@RequestBody CoscoBlacklistSupplier coscoBlacklistSupplier) { return BaseResponse.success(coscoBlacklistSupplierService.insertCoscoBlacklistSupplier(coscoBlacklistSupplier)); } @@ -41,7 +41,7 @@ public class CoscoBlacklistSupplierController extends BaseController { * 修改供应商黑名单_供应商加入黑灰名单申请关联供应商 */ @PutMapping - public BaseResponse edit(@RequestBody CoscoBlacklistSupplier coscoBlacklistSupplier) { + public BaseResponse edit(@RequestBody CoscoBlacklistSupplier coscoBlacklistSupplier) { return BaseResponse.success(coscoBlacklistSupplierService.updateCoscoBlacklistSupplier(coscoBlacklistSupplier)); } @@ -49,7 +49,7 @@ public class CoscoBlacklistSupplierController extends BaseController { * 删除供应商黑名单_供应商加入黑灰名单申请关联供应商 */ @DeleteMapping("/{blacklistIds}") - public BaseResponse remove(@PathVariable String[] blacklistIds) { + public BaseResponse remove(@PathVariable String[] blacklistIds) { return BaseResponse.success(coscoBlacklistSupplierService.deleteCoscoBlacklistSupplierByBlacklistIds(blacklistIds)); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java index 575cb82..d819585 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BecomeDueVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class BecomeDueVo { +public class BecomeDueVo implements Serializable { /** * 部门id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java index 42781b4..8e5b031 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java @@ -4,10 +4,11 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @Data -public class BlackListVo { +public class BlackListVo implements Serializable { /** * 主键ID diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java index 9e42888..176309a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackSupplierVo.java @@ -1,14 +1,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class BlackSupplierVo { +public class BlackSupplierVo implements Serializable { /** * 供应商id 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..b00def9 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 @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryVO; @@ -11,6 +12,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 +44,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 +52,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 +62,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)); } @@ -68,6 +71,9 @@ public class CoscoCategoryController extends BaseController { */ @PostMapping public BaseResponse add(@RequestBody CoscoCategory coscoCategory) { + if(coscoCategory.getParentId()==null){ + return BaseResponse.fail(ErrorMessageConstant.PLEASE_SELECT_SUPERIOR_CATEGORY); + } return BaseResponse.success(coscoCategoryService.insertCoscoCategory(coscoCategory)); } @@ -75,7 +81,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 +89,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/dao/CoscoCategoryMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java index 8b9f611..cf700d5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/CoscoCategoryMapper.java @@ -64,4 +64,6 @@ public interface CoscoCategoryMapper extends IBaseMapper { public int deleteCoscoCategoryByIds(String[] ids); IPage selectMyPage(IPage p,@Param("coscoCategory") CoscoCategoryVO coscoCategory); + + String selectCategoryNameById(String id); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml index 477d7df..a4c1617 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/dao/mapper/CoscoCategoryMapper.xml @@ -68,9 +68,6 @@ and cc.order_by = #{orderBy} - - and cc.ancestors = #{ancestors} - and cc.last_update_time = #{lastUpdateTime} @@ -103,6 +100,19 @@ where id = #{id} + + insert into cosco_category diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java index f2a593c..7fbf7cc 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/entity/CoscoCategory.java @@ -46,7 +46,7 @@ public class CoscoCategory extends CoscoBaseEntity { /** * 祖级节点数组(包含本级) */ - private String ancestors; + private String ancestors="0"; /** * 删除标识(normal.正常、deleted.已删除) 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/coscoCategory/service/ICoscoCategoryService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java index 6320092..e7d9f1c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java @@ -83,4 +83,11 @@ public interface ICoscoCategoryService extends IBaseService { * @return */ List selectCategoryTreeNoSuperior(CoscoCategory coscoCategory); + + /** + * 获取所有级别名称 + * @param id + * @return + */ + String getCategoryNameById(String id); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java index 0923e48..92e85d6 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoCategoryConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService; @@ -63,17 +65,15 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl getPage(CoscoCategoryVO coscoCategory) { IPage p = new Page<>(coscoCategory.getBasePageRequest().getPageNo(), coscoCategory.getBasePageRequest().getPageSize()); - return coscoCategoryMapper.selectMyPage(p,coscoCategory); + return coscoCategoryMapper.selectMyPage(p, coscoCategory); } @Override public List selectCategoryTree(CoscoCategory coscoCategory) { List coscoCategories = coscoCategoryMapper.selectCoscoCategoryList(coscoCategory); - List cosco=new ArrayList<>(); + List cosco = new ArrayList<>(); for (CoscoCategory co : coscoCategories) { cosco.add(BeanUtil.toBean(co, CoscoCategoryVO.class)); } @@ -135,12 +135,22 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl deptIds=new ArrayList<>(); + List deptIds = new ArrayList<>(); deptIds.add("dep01"); coscoCategory.setDeptIds(deptIds); return selectCategoryTree(coscoCategory); } + /** + * 获取所有级别名称 + * @param id + * @return + */ + @Override + public String getCategoryNameById(String id) { + return coscoCategoryMapper.selectCategoryNameById(id); + } + private List buildTree(List categories) { // 获取所有顶级节点 (parentId = "0") List rootNodes = categories.stream() @@ -172,5 +182,4 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl> 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 60aa7d7..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 @@ -11,10 +11,14 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import com.alibaba.excel.EasyExcelFactory; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** @@ -35,31 +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"); - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setHeader("Content-Disposition", "attachment;filename=" + fileName); - response.setCharacterEncoding("utf-8"); + 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(); + } - EasyExcel.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class) - .sheet("供应评价") - .doWrite(list); } @GetMapping("/getScoreResult") - public BaseResponse getScoreResult(String id) { + public BaseResponse getScoreResult(String id) { return BaseResponse.success(coscoEvaluateTaskSupplierService.getScoreResult(id)); } @@ -68,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)); } @@ -76,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)); } @@ -84,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..08a9e9e 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)); } @@ -72,10 +73,10 @@ public class CoscoEvaluateTaskSupplierUserController extends BaseController { public BaseResponse getScore(@RequestBody AddScoreVo vo) { //判断人员是否已经打分 CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser = coscoEvaluateTaskSupplierUserService.selectCoscoEvaluateTaskSupplierUserById(vo.getId()); - if(coscoEvaluateTaskSupplierUser.getReviewStatus().equals(SupplierUserConstant.SCORE_STATUS_YD)){ + if(coscoEvaluateTaskSupplierUser.getReviewStatus()!=null && 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/dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml index 4f21e57..ee4c787 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskMapper.xml @@ -351,6 +351,12 @@ cet.end_time as endTime, cet.status, cet.dept_id as deptId, + cet.approve_status as approveStatus, + case + when cet.approve_status = 0 then '审批中' + when cet.approve_status = 1 then '通过' + when cet.approve_status = 2 then '驳回' + else '未审批' end as approveName, case when cet.status = 0 then '待评价' when cet.status = 1 then '评价中' diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java index 091f9ae..1720b95 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java @@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity; import java.math.BigDecimal; import java.util.Date; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; @@ -50,41 +51,50 @@ public class CoscoEvaluateTaskSupplier extends BaseEntity { /** * 评价任务id(cosco_evaluate_task表主键) */ + @ExcelIgnore private String evaluateTaskId; /** * 供应商id(cosco_supplier_base表主键) */ + @ExcelIgnore private String supplierId; /** * 等级名称(A级、B级、C级、D级) */ + @ExcelIgnore private String levelName; /** * 评级名称(优秀供应商、良好供应商、应辅导供应商、应淘汰供应商) */ + @ExcelIgnore private String ratingName; /** * 删除标识(normal.正常、deleted.已删除) */ + @ExcelIgnore private String delFlag = "normal"; - + @ExcelIgnore private Date createTime; + @ExcelIgnore private Date updateTime; /** * 部门id */ + @ExcelIgnore private String deptId; /** * 准入部门 */ + @ExcelIgnore private String deptName = "准入部门"; @ApiModelProperty(value = "分页对象信息") + @ExcelIgnore private BasePageRequest basePageRequest; } 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); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 2b5b2bc..c3cd8ac 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -121,79 +121,100 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { /** * 计算分数 * - * @param calculateAndObtainScoresVos - * @param coscoEvaluateTaskSupplier - * @param coscoEvaluateScoringResults - * @param coscoEvaluateTaskDeptWeightes + * @param scores + * @param supplier + * @param results + * @param weights * @return */ - private static int getCalculateScore(List calculateAndObtainScoresVos, CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier, List coscoEvaluateScoringResults, List coscoEvaluateTaskDeptWeightes) { - //基础百分比 - int basePercentage = 100; - if (coscoEvaluateTaskDeptWeightes.size() > 0) { - for (CoscoEvaluateTaskDeptWeight coscoEvaluateTaskDeptWeighte : coscoEvaluateTaskDeptWeightes) { - BigDecimal weightValue = coscoEvaluateTaskDeptWeighte.getWeightValue(); - basePercentage -= weightValue.multiply(BigDecimal.valueOf(basePercentage)).intValue(); - } - } - Map map = coscoEvaluateTaskDeptWeightes.stream().collect(Collectors.toMap(CoscoEvaluateTaskDeptWeight::getWeightDept, CoscoEvaluateTaskDeptWeight::getWeightValue)); - //查询当前供应商的评价分数 - List suppliList = calculateAndObtainScoresVos.stream().filter(vo -> vo.getSupplierId().equals(coscoEvaluateTaskSupplier.getSupplierId())).collect(Collectors.toList()); - //根据指标id进行分组 - Map> groupedByIndicator = suppliList.stream().collect(Collectors.groupingBy(CalculateAndObtainScoresVo::getIndicatorNdId)); - //开始计算评价结果 - //根据评价结果获取评价总分数 - Double totalScore = 0.00; - for (String id : groupedByIndicator.keySet()) { - double indicatorScore = 0; - List indicatorList = groupedByIndicator.get(id); - if (coscoEvaluateTaskDeptWeightes.size() > 0) { - //获取权重部门打分项信息 - // 假设 indicatorList 是 List 类型 - Map> groupedByDeptId = indicatorList.stream().collect(Collectors.groupingBy(CalculateAndObtainScoresVo::getDeptId)); - BigDecimal weightScore = new BigDecimal(0.00); - BigDecimal noWeightScore = new BigDecimal(0.00); - int noWeightDeptListI = 0; - BigDecimal hundred = BigDecimal.valueOf(100); - for (String deptId : groupedByDeptId.keySet()) { - //判断是否添加权重 - BigDecimal bigDecimal = map.get(deptId); - //获取部门打分项信息 - List calculateAndObtainScoresVos1 = groupedByDeptId.get(deptId); - if (bigDecimal != null) { - if (calculateAndObtainScoresVos1 != null) { - int scoreSum = calculateAndObtainScoresVos1.stream().mapToInt(CalculateAndObtainScoresVo::getScore).sum(); - // 转换为 BigDecimal 后进行计算 - BigDecimal allSco = BigDecimal.valueOf(scoreSum); - BigDecimal size = BigDecimal.valueOf(calculateAndObtainScoresVos1.size()); - BigDecimal result = allSco.divide(size, 2, BigDecimal.ROUND_HALF_UP) - .multiply(bigDecimal) - .divide(hundred, 2, BigDecimal.ROUND_HALF_UP); - weightScore.add(result); - } - } else { - if (calculateAndObtainScoresVos1 != null) { - int scoreSum = calculateAndObtainScoresVos1.stream().mapToInt(CalculateAndObtainScoresVo::getScore).sum(); - noWeightScore.add(BigDecimal.valueOf(scoreSum)); - noWeightDeptListI += calculateAndObtainScoresVos1.size(); - } - } - } - //计算非权重部门的打分 - BigDecimal divide = noWeightScore - .divide(BigDecimal.valueOf(noWeightDeptListI), 2, BigDecimal.ROUND_HALF_UP) - .multiply(new BigDecimal(basePercentage)).divide(hundred, 2, BigDecimal.ROUND_HALF_UP); - //计算分数总和 - indicatorScore = weightScore.add(divide).doubleValue(); - } else { - //获取没有权重的打分信息 - int sScore = indicatorList.stream().mapToInt(CalculateAndObtainScoresVo::getScore).sum(); - indicatorScore = (double) sScore / indicatorList.size(); - } - addResults(coscoEvaluateTaskSupplier, coscoEvaluateScoringResults, id, indicatorScore); + private static int getCalculateScore(List scores, + CoscoEvaluateTaskSupplier supplier, + List results, + List weights) { + int basePercentage = calculateBasePercentage(weights); + Map weightMap = weightsToMap(weights); + List supplierScores = filterSupplierScores(scores, supplier); + Map> groupedByIndicator = groupByIndicator(supplierScores); + + double totalScore = 0.0; + for (Map.Entry> entry : groupedByIndicator.entrySet()) { + String indicatorId = entry.getKey(); + List indicatorList = entry.getValue(); + double indicatorScore = calculateIndicatorScore(indicatorList, weightMap, basePercentage); + addResults(supplier, results, indicatorId, indicatorScore); totalScore += indicatorScore; } - return totalScore.intValue(); + + return (int) totalScore; + } + + // 1. 计算基础百分比（减去有权重的部分） + private static int calculateBasePercentage(List weights) { + int base = 100; + for (CoscoEvaluateTaskDeptWeight w : weights) { + BigDecimal weightValue = w.getWeightValue(); + base -= weightValue.multiply(BigDecimal.valueOf(base)).intValue(); + } + return base; + } + + // 2. 转换权重为 Map<部门ID, 权重> + private static Map weightsToMap(List weights) { + return weights.stream().collect(Collectors.toMap( + CoscoEvaluateTaskDeptWeight::getWeightDept, + CoscoEvaluateTaskDeptWeight::getWeightValue + )); + } + + // 3. 获取当前供应商的评分数据 + private static List filterSupplierScores(List allScores, + CoscoEvaluateTaskSupplier supplier) { + return allScores.stream() + .filter(vo -> vo.getSupplierId().equals(supplier.getSupplierId())) + .collect(Collectors.toList()); + } + + // 4. 按指标分组 + private static Map> groupByIndicator(List scores) { + return scores.stream().collect(Collectors.groupingBy(CalculateAndObtainScoresVo::getIndicatorNdId)); + } + + // 5. 计算每个指标的得分 + private static double calculateIndicatorScore(List indicatorList, + Map weightMap, + int basePercentage) { + Map> groupedByDept = indicatorList.stream() + .collect(Collectors.groupingBy(CalculateAndObtainScoresVo::getDeptId)); + + BigDecimal weightScore = BigDecimal.ZERO; + BigDecimal noWeightScore = BigDecimal.ZERO; + int noWeightCount = 0; + BigDecimal hundred = BigDecimal.valueOf(100); + + for (Map.Entry> entry : groupedByDept.entrySet()) { + String deptId = entry.getKey(); + List deptScores = entry.getValue(); + BigDecimal weight = weightMap.get(deptId); + + int sum = deptScores.stream().mapToInt(CalculateAndObtainScoresVo::getScore).sum(); + BigDecimal avg = BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(deptScores.size()), 2, BigDecimal.ROUND_HALF_UP); + + if (weight != null) { + BigDecimal weighted = avg.multiply(weight).divide(hundred, 2, BigDecimal.ROUND_HALF_UP); + weightScore = weightScore.add(weighted); + } else { + noWeightScore = noWeightScore.add(BigDecimal.valueOf(sum)); + noWeightCount += deptScores.size(); + } + } + + BigDecimal nonWeighted = noWeightCount > 0 ? + noWeightScore.divide(BigDecimal.valueOf(noWeightCount), 2, BigDecimal.ROUND_HALF_UP) + .multiply(BigDecimal.valueOf(basePercentage)) + .divide(hundred, 2, BigDecimal.ROUND_HALF_UP) : + BigDecimal.ZERO; + + return weightScore.add(nonWeighted).doubleValue(); } /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddScoreVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddScoreVo.java index 86fff91..fbc6c87 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddScoreVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AddScoreVo.java @@ -1,11 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class AddScoreVo { +public class AddScoreVo implements Serializable { /** * 打分主键 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java index e386b6e..ed5a620 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/AdduserIndicatorVo.java @@ -1,11 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class AdduserIndicatorVo { +public class AdduserIndicatorVo implements Serializable { /** * 用户id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java index 3dc8c1f..19783ef 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ApproveVo.java @@ -1,11 +1,13 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class ApproveVo { +public class ApproveVo implements Serializable { /** * 创建人 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CalculateAndObtainScoresVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CalculateAndObtainScoresVo.java index ac8c3bb..ef6df85 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CalculateAndObtainScoresVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CalculateAndObtainScoresVo.java @@ -1,9 +1,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; + @Data -public class CalculateAndObtainScoresVo { +public class CalculateAndObtainScoresVo implements Serializable { /** * 用户id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java index 9b4f877..431ff4f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java @@ -1,15 +1,17 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; import java.util.List; @Data -public class CoscoEvaluateTaskListVo { +public class CoscoEvaluateTaskListVo implements Serializable { /** * 主键ID diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java index f32e8d9..bee2503 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTemplateVo.java @@ -1,13 +1,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @Data -public class CoscoEvaluateTemplateVo { +public class CoscoEvaluateTemplateVo implements Serializable { /** * 部门名称 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java index 7246211..45bb10c 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/DivisionVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class DivisionVo { +public class DivisionVo implements Serializable { private String taskId; private String division; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/NoTaskVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/NoTaskVo.java index c6a5f77..600cad0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/NoTaskVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/NoTaskVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class NoTaskVo { +public class NoTaskVo implements Serializable { /** * 用户id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ScoreVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ScoreVo.java index 7e4a398..633f9c1 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ScoreVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/ScoreVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class ScoreVo { +public class ScoreVo implements Serializable { /** * 打分项id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java index a250f45..40a587e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java @@ -4,11 +4,13 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + /** * 供应商维度评价 */ @Data -public class SupplierDimensionVo { +public class SupplierDimensionVo implements Serializable { /** * 人员任务id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierListVo.java index 3eb8a95..6ad4732 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierListVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierListVo.java @@ -5,8 +5,10 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class SupplierListVo { +public class SupplierListVo implements Serializable { /** * 供应商id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorBaseVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorBaseVo.java index 94b0412..578ffe8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorBaseVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorBaseVo.java @@ -2,10 +2,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class TaskIndicatorBaseVo { +public class TaskIndicatorBaseVo implements Serializable { /** * 供应商名称 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorVo.java index 9c8fef2..73d93ef 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskIndicatorVo.java @@ -2,10 +2,11 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class TaskIndicatorVo { +public class TaskIndicatorVo implements Serializable { /** * 基础指标 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java index b6d6371..86d1818 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java @@ -4,8 +4,10 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class TaskPageVo { +public class TaskPageVo implements Serializable { /** * 任务id */ @@ -45,6 +47,13 @@ public class TaskPageVo { */ private String userId; + private String approveStatus; + + /** + * 审核名称 + */ + private String approveName; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java index bc20124..ad64720 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSubIndicatorVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class TaskSubIndicatorVo { +public class TaskSubIndicatorVo implements Serializable { /** * 打分项id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSupplierVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSupplierVo.java index 8da5f4e..e0d7395 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSupplierVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskSupplierVo.java @@ -1,11 +1,15 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; @Data -public class TaskSupplierVo { +public class TaskSupplierVo implements Serializable { + private static final long serialVersionUID = 1L; + /** * 供应商id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java index b579547..d894f29 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskUserVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class TaskUserVo { +public class TaskUserVo implements Serializable { /** * 人员ID */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/UserNdTypeVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/UserNdTypeVo.java index 7fae75e..aa2706a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/UserNdTypeVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/UserNdTypeVo.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo; import lombok.Data; +import java.io.Serializable; + @Data -public class UserNdTypeVo { +public class UserNdTypeVo implements Serializable { /** * 用户id */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java new file mode 100644 index 0000000..d01eb85 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java @@ -0,0 +1,52 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUserItemVo; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + + +/** + * 供应商业务处理消息推送Controller + * + * @author ruoyi + * @date 2025-06-23 + */ +@RestController +@RequestMapping("/supplierMessage") +public class CoscoMessageController extends BaseController { + @Autowired + private ICoscoMessageService coscoMessageService; + + /** + * 查询供应商业务处理消息推送列表 + */ + @ApiOperation("查询分页数据") + @PostMapping("/page") + public BaseResponse> page(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoMessage coscoMessage) { + return BaseResponse.success(coscoMessageService.getPage(coscoMessage)); + } + + @ApiOperation("修改数据") + @PostMapping("/update") + public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid CoscoMessage coscoMessage){ + return BaseResponse.success(coscoMessageService.updateCoscoMessage(coscoMessage)); + } + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java index 9e63414..e1abf2e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java @@ -2,17 +2,19 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.net.URLEncoder; +import java.util.*; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplierCategory; import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank; @@ -105,7 +107,7 @@ public class CoscoSupplierBaseController extends BaseController { @PostMapping("/getPageMy") public BaseResponse> getPageMy(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) { coscoSupplierBase.setCreateBy("1"); - return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase)); + return BaseResponse.success(coscoSupplierBaseService.getMySupplierBasePage(coscoSupplierBase)); } @@ -119,10 +121,74 @@ public class CoscoSupplierBaseController extends BaseController { public BaseResponse> getPageQualified(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoSupplierBase coscoSupplierBase) { coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W); - coscoSupplierBase.setGreylistStatus(CoscoType.GREYLIST_STATUS_W); + //coscoSupplierBase.setGreylistStatus(CoscoType.GREYLIST_STATUS_W);//灰名单字段暂时不用 return BaseResponse.success(coscoSupplierBaseService.getPage(coscoSupplierBase)); } + + + /** + * 导出合格供应商列表查询分页数据 + * @return + */ + + @GetMapping("/getPageMyExport") + public void getPageMyExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception { + coscoSupplierBase.setCreateBy("1"); + List list = coscoSupplierBaseService.getMySupplierBaseList(coscoSupplierBase); + + // 动态设置导出字段（忽略未标注字段） + Set includeFields = new HashSet<>(Arrays.asList( + "name","supplierTypeCn", "enterpriseType","categoryName","updateTime" // 指定要导出的字段名 + )); + + String fileName = URLEncoder.encode("我的供应商.xlsx", "UTF-8"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setCharacterEncoding("utf-8"); + + EasyExcel.write(response.getOutputStream()) + .includeColumnFieldNames(includeFields) + .head(CoscoSupplierBase.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽 + .sheet("我的供应商") + .doWrite(list); + } + + + /** + * 导出合格供应商列表查询分页数据 + * @return + */ + + @GetMapping("/getPageQualifiedExport") + public void getPageQualifiedExport(HttpServletResponse response, CoscoSupplierBase coscoSupplierBase) throws Exception { + coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); + coscoSupplierBase.setBlacklistStatus(CoscoType.BLACKLIST_STATUS_W); + List list = coscoSupplierBaseService.selectCoscoSupplierBaseList(coscoSupplierBase); + + // 动态设置导出字段（忽略未标注字段） + Set includeFields = new HashSet<>(Arrays.asList( + "name", "socialCreditCode","supplierTypeCn", "enterpriseType","createTime" // 指定要导出的字段名 + )); + + String fileName = URLEncoder.encode("合格供应商.xlsx", "UTF-8"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setCharacterEncoding("utf-8"); + + EasyExcel.write(response.getOutputStream()) + .includeColumnFieldNames(includeFields) + .head(CoscoSupplierBase.class) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 自动列宽 + .sheet("合格供应商") + .doWrite(list); + } + + + + + @ApiOperation("查询数据") @GetMapping("/{id}") public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java index 3de7d08..bbeae10 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierexitController.java @@ -59,7 +59,7 @@ public class CoscoSupplierexitController extends BaseController { /** - * 供应商退出任务详情查询 + * 供应商退出任务详情查询(只查询退出品类分页) * @return 返回结果 */ @ApiOperation("查询分页数据") @@ -69,4 +69,16 @@ public class CoscoSupplierexitController extends BaseController { } + + /** + * 供应商退出任务详情查询，以及品类信息 + * @return 返回结果 + */ + @ApiOperation("查询分页数据") + @GetMapping("/{id}") + public BaseResponse getExitInfoPage(@PathVariable("id") String id) { + return BaseResponse.success(coscoSupplierexitService.selectCoscoSupplierexitById(id)); + } + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java new file mode 100644 index 0000000..08ac89a --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/TycAndFxController.java @@ -0,0 +1,76 @@ +package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.rm.client.RmFeignClient; +import com.chinaunicom.mall.ebtp.common.rm.entity.RmBaseResponse; +import com.chinaunicom.mall.ebtp.common.tyc.client.TycFeignClient; +import com.chinaunicom.mall.ebtp.common.tyc.entity.TianyanchaNormal; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoSupplierBaseService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/tycAndFxSupplierBase") +public class TycAndFxController { + + @Autowired + private TycFeignClient tycFeignClient; + + @Autowired + private RmFeignClient rmFeignClient; + + + @Autowired + private ICoscoSupplierBaseService coscoSupplierBaseService; + + + /** + * 企业基本信息 查询 + * 当前接口是直接查询数据库中企业基本信息 + * 前端可以根据实体是否存在，来判断是否调用更新接口 + * 当前代码中直接调用更新接口的方法没有开启，因为api次数较为珍贵，如果前端调用后是空的，让客户手动决定是否获取天眼查数据 + * @return 企业基本信息 + */ + @GetMapping("/query") + public BaseResponse query(@RequestParam("supplierId") String supplierId){ + CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseService.selectSocialCreditCodeById(supplierId); + return tycFeignClient.query(coscoSupplierBase.getSocialCreditCode()); + } + + /** + * 企业基本信息 更新后 查询 + * ... + * @return 企业基本信息 + */ + @ApiOperation("天眼查企业基本信息*更新*后查询接口") + @GetMapping("/queryAndUpdate") + public BaseResponse queryAndUpdate(@RequestParam("supplierId") String supplierId){ + CoscoSupplierBase coscoSupplierBase = coscoSupplierBaseService.selectSocialCreditCodeById(supplierId); + return tycFeignClient.queryAndUpdate(coscoSupplierBase.getSocialCreditCode()); + } + + /** + * 精确查询-核心风险信息 + * 返回： + { + "code":200, + "message":"success", + "success":true, + "data":[{"hit":"Shield AI,Inc.","hitlight":"Shield AI,Inc.","similar":100,"hittype":"Also Known As","activestatus":"Active","d1":"Special Interest Entity (SIE)","d2":["Sanctions Lists","Other Official Lists"],"d3":[],"countries":["United States"],"docid":"13467649","systemdate":"2025-05-16 12:10:12.703","details":{"date":"15-May-2025","descriptions":{"description":[{"description1":"Special Interest Entity (SIE)","description2":"Sanctions Lists","description3":""},{"description1":"Special Interest Entity (SIE)","description2":"Other Official Lists","description3":""}]},"nameDetails":{"Primary Name":["Shield AI, Inc.","护盾人工智能公司","護盾人工智能公司"],"Also Known As":["Shield AI,Inc."]},"sanctionsReferences":{"Sanctions Lists":[{"date":"05-Dec-2024 to ","value":"4755 Ministry of Foreign Affairs (China) - Countering Foreign Sanctions"}],"Other Official Lists":[{"date":"10-Apr-2025 to ","value":"5355 MOFCOM (China) Unreliable Entity List"},{"date":"04-Mar-2025 to ","value":"5983 MOFCOM (China) Export Control List"}]},"companyDetails":[],"vesselDetails":[],"countryDetails":{"Country of Affiliation":["United States"]},"profileNotes":"MOFCOM (CHINA) UNRELIABLE ENTITY LIST:\n\n来源：商务部新闻办公室 类型：原创 分类：新闻 2025-05-14 22:00\n \n商务部新闻发言人就暂停17家美国实体不可靠实体清单措施答记者问\n\n有记者问：中美日内瓦经贸会谈联合声明中提到中方将暂停或取消自2025年4月2日起针对美国的非关税反制措施，请问在不可靠实体清单方面有什么考虑？\n\n答： 根据《中华人民共和国反外国制裁法》《不可靠实体清单规定》及有关规定，不可靠实体清单工作机制于2025年4月4日和9日，将17家美国实体列入不可靠实体清单，禁止上述企业从事与中国有关的进出口活动，以及在中国境内新增投资。为落实中美经贸高层会谈共识，自2025年5月14日起，暂停4月4日公告（不可靠实体清单工作机制〔2025〕7号）相关措施90天，暂停4月9日公告（不可靠实体清单工作机制〔2025〕8号）相关措施。根据《不可靠实体清单规定》相关规定，国内企业可申请与上述实体进行交易，不可靠实体清单工作机制将依法进行审核，对符合条件的申请予以批准。\n\n不可靠实体清单工作机制关于将护盾人工智能公司等6家美国企业列入不可靠实体清单的公告\n【发布单位】安全与管制局\n【发布文号】不可靠实体清单工作机制〔2025〕8号\n【发文日期】2025年04月09日\n\n不可靠实体清单工作机制\n\n公 告\n\n2025年 第8号\n\n 为维护国家主权、安全和发展利益，根据《中华人民共和国对外贸易法》《中华人民共和国国家安全法》《中华人民共和国反外国制裁法》等有关法律，不可靠实体清单工作机制依据《不可靠实体清单规定》第二条、第八条和第十条等有关规定，决定将护盾人工智能公司（Shield AI,Inc.）、内华达山脉公司（Sierra Nevada Corporation）、赛博勒克斯公司（Cyberlux Corporation）、边缘自治运营公司（Edge Autonomy Operations LLC）、Group W公司（Group W）和哈德森技术公司（Hudson Technologies Co.）等6家实体列入不可靠实体清单，并采取以下处理措施：\n\n一、禁止上述企业从事与中国有关的进出口活动；\n\n二、禁止上述企业在中国境内新增投资。\n\n本公告未尽事宜，按《不可靠实体清单规定》执行。\n\n本公告自2025年4月10日12时01分起实施。\n\nMOFCOM (CHINA) EXPORT CONTROL LIST NOTES:\n\n商务部公告2025年第13号 公布将15家美国实体列入出口管制管控名单\n【发布单位】安全与管制局\n【发布文号】商务部公告2025年第13号\n【发文日期】2025年03月04日\n\n根据《中华人民共和国出口管制法》和《中华人民共和国两用物项出口管制条例》等法律法规有关规定，为维护国家安全和利益，履行防扩散等国际义务，决定将莱多斯公司等15家美国实体列入出口管制管控名单（见附件），并采取以下措施：\n\n一、禁止向上述15家美国实体出口两用物项；正在开展的相关出口活动应当立即停止。\n\n二、特殊情况下确需出口的，出口经营者应当向商务部提出申请。\n\n本公告自公布之日起正式实施。\n\n附件：出口管制管控名单（2025年3月4日）\n\n商务部 \n\n2025年3月4日\n\n附件\n\n出口管制管控名单\n\n （2025年3月4日）\n\n1. 莱多斯公司（Leidos）\n\n2. 吉布斯和考克斯公司（Gibbs&Cox, Inc.）\n\n3. 监控研究公司（IP Video Market Info, Inc.）\n\n4. SourceMap公司（Sourcemap, Inc.）\n\n5. 斯凯迪奥公司（Skydio, Inc.）\n\n6. 急速飞行公司（Rapid Flight LLC）\n\n7. 红色六方案公司（Red Six Solutions）\n\n8. 护盾人工智能公司（Shield AI, Inc.）\n\n9. 浩劫人工智能公司（HavocAI）\n\n10. 尼罗斯科技公司（Neros Technologies）\n\n11. Group W公司（Group W）\n\n12. 爱尔康公司（Aerkomm Inc.）\n\n13. 通用原子航空系统公司（General Atomics Aeronautical Systems, Inc.）\n\n14. 通用动力陆地系统公司（General Dynamics Land Systems）\n\n15. 宇航环境公司（Aero Vironment）\n\nCHINA MINISTRY OF FOREIGN AFFAIRS NOTES:\n\n关于对美国军工企业及高级管理人员采取反制措施的决定\n2024-12-05 15:00\n\n（2024年12月5日中华人民共和国外交部令第14号公布，自2024年12月5日起施行）\n\n美国近日再次宣布向中国台湾地区出售武器，严重违反一个中国原则和中美三个联合公报，严重干涉中国内政，严重损害中国主权和领土完整。依据《中华人民共和国反外国制裁法》第三条、第四条、第五条、第六条、第九条、第十五条规定，中方决定对以下美国军工企业及高级管理人员采取反制措施：\n\n一、对特励达·布朗工程公司、BRINC无人机公司、急速飞行公司、红色六方案公司、护盾人工智能公司、赛尼克斯公司、火风暴实验室公司、奎托斯无人机系统公司、浩劫人工智能公司、尼罗斯科技公司、赛博勒克斯公司、多莫战术通信公司、Group W公司等13家后附《反制清单》列明的企业，冻结在我国境内的动产、不动产和其他各类财产；禁止我国境内的组织、个人与其进行有关交易、合作等活动。\n\n二、对芭芭拉·博尔戈诺维（雷神公司海军力量战略业务部总裁）、杰拉德·许贝尔（雷神公司海军力量战略业务部副总裁）、查尔斯·伍德伯恩（贝宜陆上和武器系统公司首席执行官）、理查德·克劳福德（联合技术系统运营公司创始人、首席执行官）、贝丝·艾德勒（数据链路解决方案公司总裁）、布莱克·雷斯尼克（BRINC无人机公司创始人、首席执行官）等6名后附《反制清单》列明的企业高级管理人员，冻结在我国境内的动产、不动产和其他各类财产；禁止我国境内的组织、个人与其本人进行有关交易、合作等活动；对其本人不予签发签证、不准入境（包括香港、澳门）。\n\n本决定自2024年12月5日起施行。\n\n附件：反制清单\n\n外交部　　\n\n2024年12月5日\n\n附件\n\n反制清单\n\n　　一、企业\n\n　　（一）特励达·布朗工程公司（Teledyne Brown Engineering, Inc.）\n\n　　（二）BRINC无人机公司（BRINC Drones, Inc.）\n\n　　（三）急速飞行公司（Rapid Flight LLC）\n\n　　（四）红色六方案公司（Red Six Solutions）\n\n　　（五）护盾人工智能公司（Shield AI, Inc.）\n\n　　（六）赛尼克斯公司（SYNEXXUS, Inc.）\n\n　　（七）火风暴实验室公司（Firestorm Labs, Inc.）\n\n　　（八）奎托斯无人机系统公司（Kratos Unmanned Aerial Systems, Inc.）\n\n　　（九）浩劫人工智能公司（HavocAI）\n\n　　（十）尼罗斯科技公司（Neros Technologies）\n\n　　（十一）赛博勒克斯公司（Cyberlux Corporation）\n\n　　（十二）多莫战术通信公司（Domo Tactical Communications)\n\n　　（十三）Group W公司（Group W）\n\n　　二、高级管理人员\n\n　　（一）芭芭拉·博尔戈诺维（Barbara Borgonovi），女，雷神公司海军力量战略业务部总裁\n\n　　（二）杰拉德·许贝尔（Gerard Hueber），男，雷神公司海军力量战略业务部副总裁\n\n　　（三）查尔斯·伍德伯恩（Charles Woodburn），男，贝宜陆上和武器系统公司首席执行官\n\n　　（四）理查德·克劳福德（Richard D. Crawford），男，联合技术系统运营公司创始人、首席执行官\n\n　　（五）贝丝·艾德勒（Beth Edler），女，数据链路解决方案公司总裁\n\n　　（六）布莱克·雷斯尼克（Blake Resnick），男，BRINC无人机公司创始人、首席执行官","sourceDescription":["https://www.mfa.gov.cn/web/wjb_673085/zfxxgk_674865/gknrlb/fzcqdcs/202412/t20241205_11538936.shtml","https://www.fmprc.gov.cn/eng/xw/fyrbt/","https://www.mfa.gov.cn/web/wjb_673085/zfxxgk_674865/gknrlb/fzcqdcs/","https://aqygzj.mofcom.gov.cn/flzc/gzjgfxwj/art/2025/art_23aa2fcf1fca4e4c9edb6bec193acfe0.html","https://www.gov.cn/zhengce/content/202410/content_6981399.htm","http://aqygzj.mofcom.gov.cn/flzc/gzjgfxwj/index.html","http://www.mofcom.gov.cn/article/b/fwzl/202009/20200903002593.shtml","http://aqygzj.mofcom.gov.cn/flzc/gzjgfxwj/art/2025/art_81fd0e00d5aa4be39db90f2c183c809a.html","https://www.mofcom.gov.cn/xwfb/xwfyrth/art/2025/art_53ec1f591dba49a39b65fd89b6d73e6f.html"],"associate":[]}},{"hit":"Shield AI, Inc","hitlight":"Shield AI, Inc","similar":100,"hittype":"Primary Name","activestatus":"Active","d1":"法务与风险机构 Legal and Risk Entity","d2":["中远海运集团法务与风险机构 Legal and Risk Entity"],"d3":["禁止交易及交往 Prohibited transactions and interactions"],"countries":[null],"docid":"C00361","systemdate":"2025-05-20 15:04:01.751","details":{"date":"23-Apr-2025","descriptions":{"description":[{"description1":"法务与风险机构 Legal and Risk Entity","description2":"中远海运集团法务与风险机构 Legal and Risk Entity","description3":"禁止交易及交往 Prohibited transactions and interactions"}]},"nameDetails":{"Primary Name":["Shield AI, Inc"]},"idNumberTypes":{"":["唯一实体标识（UEI):DVEJNK717BB6,商业和政府实体代码（CAGE）7GVZ9"]},"companyDetails":[{"companyDetails":"注册地址：美国加利福尼亚州圣地亚哥百老汇大道，华盛顿特区办事处地址：2450 Crystal Dr, Ste. 200,Arlington, Virginia,22202。德克萨斯州达拉斯办事处地址：16240 Gateway Path,Ste 100,TX 75033 美国"}],"countryDetails":{"Country of Registration":[null]},"profileNotes":"","sourceDescription":[""],"associate":[]}}] + } + * @return List 风险信息列表 + */ + @GetMapping("/queryRiskInfo") + BaseResponse> queryRiskInfo(@RequestParam("supplierName") String supplierName){ + return rmFeignClient.queryRiskInfo(supplierName); + } + + +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java index 10a51ac..8f5e9be 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java @@ -1,6 +1,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -22,10 +25,10 @@ public interface CoscoMessageMapper { /** * 查询供应商业务处理消息推送列表 * - * @param coscoMessage 供应商业务处理消息推送 * @return 供应商业务处理消息推送集合 */ - public List selectCoscoMessageList(CoscoMessage coscoMessage); + IPage selectCoscoMessageList(IPage page, @Param("vo") CoscoMessage vo); + /** * 新增供应商业务处理消息推送 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java index 75c6e02..ed29d21 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierBaseMapper.java @@ -35,6 +35,11 @@ public interface CoscoSupplierBaseMapper { IPage selectPageList(IPage page, @Param("vo") CoscoSupplierBase vo); + //我准入的供应商 + IPage getMySupplierBasePage(IPage page, @Param("vo") CoscoSupplierBase vo); + + List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase); + /** * 新增中远海运_供应商_基本信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java index d9dc9c6..568bd5e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessWorkVo.java @@ -15,9 +15,13 @@ public class CoscoAccessWorkVo { private CoscoAccessWork coscoAccessWork; //准入申请关联品类id集合 + @NotNull(message = "准入品类不能为空") + @Valid private List categoryIds; //准入申请供应商id集合 + @NotNull(message = "准入供应商不能为空") + @Valid private List supplierIds; //评审人员 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java index 592d9c9..5853a88 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoMessage.java @@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 供应商业务处理消息推送对象 cosco_message * @@ -18,6 +20,7 @@ public class CoscoMessage extends CoscoBaseEntity { /** 接收人ID */ //@Excel(name = "接收人ID") + @NotBlank(message = "接收人id不能为空") private String receiverId; /** 内容 */ diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java index 4c44e9b..0dba31e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierBase.java @@ -2,9 +2,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity; import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoBaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -16,7 +19,7 @@ import javax.validation.constraints.NotBlank; * @date 2025-06-16 */ @Data -public class CoscoSupplierBase extends CoscoBaseEntity { +public class CoscoSupplierBase { private static final long serialVersionUID = 1L; /** 主键ID */ @@ -43,11 +46,13 @@ public class CoscoSupplierBase extends CoscoBaseEntity { /** 企业类型(数据字典code) */ @TableField("企业类型") + @ExcelProperty("企业类型") private String enterpriseType; /** 企业名称 */ @NotBlank(message = "企业名称不能为空") @TableField("企业名称") + @ExcelProperty("供应商名称") private String name; /** 企业英文名称 */ @@ -56,6 +61,7 @@ public class CoscoSupplierBase extends CoscoBaseEntity { /** 统一社会信用代码 */ @TableField("统一社会信用代码") + @ExcelProperty("统一社会信用代码") private String socialCreditCode; /** 经营范围 */ @@ -172,8 +178,50 @@ public class CoscoSupplierBase extends CoscoBaseEntity { private Date lastUpdateTime; @TableField("供应商身份类型中文") + @ExcelProperty("境内/境外") private String supplierTypeCn; @TableField("准入状态中文") private String accessStatusCn; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + @ExcelProperty("注册时间") + private Date createTime; + + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "修改时间") + @ExcelProperty("准入时间") + private Date updateTime; + + + + @ApiModelProperty("当前页") + private Integer pageNo; + @ApiModelProperty("每页显示条数") + private Integer pageSize; + + /** 搜索值 */ + @JsonIgnore + @ApiModelProperty(value = "搜索值") + private String searchValue; + + /** 创建者 */ + @ApiModelProperty(value = "创建人") + private String createBy; + + /** 更新者 */ + @ApiModelProperty(value = "修改人") + private String updateBy; + + + //搜索条件品类 + private String categoryId; + + @ExcelProperty("品类名称") + private String categoryName; + } \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java index 93bb5c8..9ac2f4d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoSupplierexitVo.java @@ -16,9 +16,13 @@ public class CoscoSupplierexitVo { public CoscoSupplierexit coscoSupplierexit; //供应商id集合 + @NotNull(message = "供应商id集合不能为空") + @Valid // 关键注解：启用嵌套验证 public List supplierIdList; //退出任务供应商关联品类表 + @NotNull(message = "供应商关联品类集合不能空") + @Valid // 关键注解：启用嵌套验证 public List coscoSupplierexitSupplierCategoryList; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java index d6ed0b0..0625553 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java @@ -1,6 +1,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; @@ -13,6 +15,10 @@ import java.util.List; * @date 2025-06-23 */ public interface ICoscoMessageService { + + + IPage getPage(CoscoMessage data); + /** * 查询供应商业务处理消息推送 * @@ -21,13 +27,6 @@ public interface ICoscoMessageService { */ public CoscoMessage selectCoscoMessageById(String id); - /** - * 查询供应商业务处理消息推送列表 - * - * @param coscoMessage 供应商业务处理消息推送 - * @return 供应商业务处理消息推送集合 - */ - public List selectCoscoMessageList(CoscoMessage coscoMessage); public int insertCoscoMessage(CoscoMessage coscoMessage); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java index 655b06f..4d3dcdb 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierBaseService.java @@ -17,8 +17,12 @@ public interface ICoscoSupplierBaseService { IPage getPage(CoscoSupplierBase coscoSupplierBase); + IPage getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase); + + IPage getZrCategoryPage(CoscoAccessSupplierCategory coscoSupplierBase); + public List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase); /** @@ -29,6 +33,15 @@ public interface ICoscoSupplierBaseService { */ public CoscoSupplierVo selectCoscoSupplierBaseById(String id); + /** + * 查询中远海运_供应商_基本信息 + * + * @param id 中远海运_供应商_基本信息主键 + * @return 中远海运_供应商_基本信息 + */ + public CoscoSupplierBase selectSocialCreditCodeById(String id); + + /** * 查询中远海运_供应商_基本信息列表 * diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java index 2af70c1..0648988 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoSupplierexitService.java @@ -28,7 +28,7 @@ public interface ICoscoSupplierexitService { * @param id 供应商退出_供应商退出任务主键 * @return 供应商退出_供应商退出任务 */ - public CoscoSupplierexit selectCoscoSupplierexitById(String id); + public CoscoSupplierexitVo selectCoscoSupplierexitById(String id); /** * 查询供应商退出_供应商退出任务列表 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index 5f95545..460e289 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -17,6 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierAccessWo import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.Date; @@ -177,7 +178,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg //先验证一下主任务表数据状态 CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId()); - if(coscoAccessWorkData == null){ + if (!ObjectUtils.isEmpty(coscoAccessWorkData)) { throw new IllegalArgumentException("任务信息不能为空"); } @@ -212,7 +213,6 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(vo.getId()); List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory); - List coscoAccessCategoryListAop = new ArrayList<>(); for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){ //验证该品类是否已经准入过了 CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); @@ -226,14 +226,13 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg coscoAccessSupplierCategory.setAccessWorkId(vo.getId()); coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId()); coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId()); - coscoAccessSupplierCategory.setCreateBy("1"); - coscoAccessSupplierCategory.setUpdateBy("1"); + coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy()); + coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } - coscoAccessCategoryListAop.add(coscoAccessCategory1); } - coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop); + coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryList); supplierIdList.add(coscoAccessSupplier1); } @@ -243,17 +242,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg CoscoAccessCategory coscoAccessCategory = new CoscoAccessCategory(); coscoAccessCategory.setAccessWorkId(vo.getId()); List coscoAccessCategoryList = coscoAccessCategoryMapper.selectCoscoAccessCategoryList(coscoAccessCategory); - List coscoAccessCategoryListAop = new ArrayList<>(); - for (CoscoAccessCategory coscoAccessCategory1 : coscoAccessCategoryList){ - //验证该品类是否已经准入过了 - CoscoAccessSupplierCategory coscoAccessSupplierCategory2 = new CoscoAccessSupplierCategory(); - coscoAccessSupplierCategory2.setSupplierId(coscoAccessSupplier1.getSupplierId()); - coscoAccessSupplierCategory2.setCategoryId(coscoAccessCategory1.getCategoryId()); - coscoAccessSupplierCategory2.setDeptId(coscoAccessWorkData.getDeptId()); - Integer num = coscoAccessSupplierCategoryMapper.selectBySupplierIdAndCategoryId(coscoAccessSupplierCategory2); - coscoAccessCategoryListAop.add(coscoAccessCategory1); - } - coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryListAop); + coscoAccessSupplier1.setCoscoAccessCategoryList(coscoAccessCategoryList); supplierIdList.add(coscoAccessSupplier1); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java index ffc1170..ee5722b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java @@ -18,6 +18,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; /** * 供应商准入_准入申请工作主Service业务层处理 @@ -309,10 +311,9 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { if(CoscoType.ACCESS_TYPE_ONLINE.equals(coscoAccessWork.getAccessType())){ String zuZhangId = "";//组长id //评审人员集合 - List coscoAccessUserls = vo.getCoscoAccessUserls(); - if(coscoAccessUserls.size() > 0){ + List coscoAccessUserls = vo.getCoscoAccessUserls(); + if (!CollectionUtils.isEmpty(coscoAccessUserls)) { for(CoscoAccessUser user: coscoAccessUserls){ - //判断是否是组长 if(CoscoType.IS_LEADER_SHI.equals(user.getIsLeader())){ zuZhangId = user.getUserId(); @@ -324,7 +325,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { } //评审项集合 - if(vo.getCoscoAccessItems().size() > 0){ + if (!CollectionUtils.isEmpty(vo.getCoscoAccessItems())) { //首先循环所有供应商 for(String sId : vo.getSupplierIds()){ @@ -394,12 +395,11 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //String userId = "USER001"; Date date = CoscoDateUtils.getNowDate(); String userId =vo.getUserId(); - if(vo.getCoscoAccessUserItemList() != null){ + if (!CollectionUtils.isEmpty(vo.getCoscoAccessUserItemList())) { for(CoscoAccessUserItem coscoAccessUserItem : vo.getCoscoAccessUserItemList()){ //修改评审项关联评审人员表 coscoAccessUserItemService.updateCoscoAccessUserItem(coscoAccessUserItem); - - if(coscoAccessUserItem.getCoscoAccessTtemAttachments() != null){ + if (!ObjectUtils.isEmpty(coscoAccessUserItem.getCoscoAccessTtemAttachments())) { //插入附件表 CoscoAccessItemAttachments coscoAccessTtemAttachments = coscoAccessUserItem.getCoscoAccessTtemAttachments(); coscoAccessTtemAttachments.setAccessWorkId(vo.getAccessWorkId()); @@ -537,7 +537,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //先验证一下主任务表数据状态 CoscoAccessWork coscoAccessWorkData = coscoAccessWorkMapper.selectCoscoAccessWorkById(vo.getId()); - if(coscoAccessWorkData == null){ + if (!ObjectUtils.isEmpty(coscoAccessWorkData)) { throw new IllegalArgumentException("任务信息不能为空"); } @@ -580,8 +580,8 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { coscoAccessSupplierCategory.setSupplierId(coscoAccessSupplier1.getSupplierId()); coscoAccessSupplierCategory.setCategoryId(coscoAccessCategory1.getCategoryId()); coscoAccessSupplierCategory.setDeptId(coscoAccessWorkData.getDeptId()); - coscoAccessSupplierCategory.setCreateBy("1"); - coscoAccessSupplierCategory.setUpdateBy("1"); + coscoAccessSupplierCategory.setCreateBy(coscoAccessWorkData.getCreateBy()); + coscoAccessSupplierCategory.setUpdateBy(coscoAccessWorkData.getUpdateBy()); coscoAccessSupplierCategoryService.insertCoscoAccessSupplierCategory(coscoAccessSupplierCategory); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java index f286f16..aaa8871 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java @@ -2,12 +2,16 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils; import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil; +import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType; import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoMessageMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessUser; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessWork; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoMessageService; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.UserItmeMessageVo; @@ -25,6 +29,12 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { @Autowired private CoscoMessageMapper coscoMessageMapper; + @Override + public IPage getPage(CoscoMessage data) { + IPage page = new Page<>(data.getPageNo(), data.getPageSize()); + return coscoMessageMapper.selectCoscoMessageList(page, data); + } + /** * 查询供应商业务处理消息推送 * @@ -36,16 +46,6 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { return coscoMessageMapper.selectCoscoMessageById(id); } - /** - * 查询供应商业务处理消息推送列表 - * - * @param coscoMessage 供应商业务处理消息推送 - * @return 供应商业务处理消息推送 - */ - @Override - public List selectCoscoMessageList(CoscoMessage coscoMessage) { - return coscoMessageMapper.selectCoscoMessageList(coscoMessage); - } /** * 消息保存接口 @@ -78,6 +78,7 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService { @Override public int updateCoscoMessage(CoscoMessage coscoMessage) { coscoMessage.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoMessage.setRead(1l);//已读 return coscoMessageMapper.updateCoscoMessage(coscoMessage); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java index d2fe237..08667f4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java @@ -8,7 +8,6 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,6 +25,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; /** * 中远海运_供应商_基本信息Service业务层处理 @@ -58,17 +59,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { private ICoscoSupplierBankService coscoSupplierBankService; - @Autowired - private CoscoSupplierSurveyMapper coscoSupplierSurveyMapper; @Autowired private ICoscoSupplierSurveyService coscoSupplierSurveyService; - - @Autowired - private CoscoSupplierSurveyQuestionReplyMapper coscoSupplierSurveyQuestionReplyMapper; - @Autowired private ICoscoSupplierSurveyQuestionReplyService coscoSupplierSurveyQuestionReplyService; @@ -88,15 +83,6 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { @Autowired private CoscoSupplierChangeBaseMapper coscoSupplierChangeBaseMapper; - @Autowired - private CoscoSupplierChangeQualificationsMapper coscoSupplierChangeQualificationsMapper; - - @Autowired - private CoscoSupplierChangeInvoiceMapper coscoSupplierChangeInvoiceMapper; - - @Autowired - private CoscoSupplierChangeBankMapper coscoSupplierChangeBankMapper; - //变更 @Autowired private CoscoSupplierChangeApplyMapper coscoSupplierChangeApplyMapper; @@ -111,6 +97,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase); } + @Override + public IPage getMySupplierBasePage(CoscoSupplierBase coscoSupplierBase) { + // 创建分页对象（当前页，每页大小） + IPage page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize()); + return coscoSupplierBaseMapper.getMySupplierBasePage(page, coscoSupplierBase); + } + @Override public IPage getZrCategoryPage(CoscoAccessSupplierCategory coscoAccessSupplierCategory) { // 创建分页对象（当前页，每页大小） @@ -118,6 +111,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return coscoAccessSupplierCategoryMapper.selectPageList(page, coscoAccessSupplierCategory); } + @Override + public List getMySupplierBaseList(CoscoSupplierBase coscoSupplierBase) { + return coscoSupplierBaseMapper.getMySupplierBaseList(coscoSupplierBase); + } + /** * 查询中远海运_供应商_基本信息 * @@ -153,6 +151,11 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { return vo; } + @Override + public CoscoSupplierBase selectSocialCreditCodeById(String id) { + return coscoSupplierBaseMapper.selectCoscoSupplierBaseById(id); + } + /** * 查询中远海运_供应商_基本信息列表 * @@ -175,8 +178,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { String supplierId = CoscoIdUtil.getId();//企业id Date date = new Date(); //基本信息新增 - CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); - if(coscoSupplierBase != null){ + if (!ObjectUtils.isEmpty(vo.getCoscoSupplierBase())) { + CoscoSupplierBase coscoSupplierBase = vo.getCoscoSupplierBase(); coscoSupplierBase.setId(supplierId); coscoSupplierBase.setCreateBy("1"); coscoSupplierBase.setCreateTime(date); @@ -194,8 +197,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { } } //发票信息 - CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice(); - if(coscoSupplierInvoice != null){ + if (!ObjectUtils.isEmpty(vo.getCoscoSupplierInvoice())) { + CoscoSupplierInvoice coscoSupplierInvoice = vo.getCoscoSupplierInvoice(); coscoSupplierInvoice.setSupplierId(supplierId); coscoSupplierInvoiceService.insertCoscoSupplierInvoice(coscoSupplierInvoice); } @@ -206,12 +209,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierBankService.insertCoscoSupplierBank(coscoSupplierBank); } } - //填写人信息 - CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey(); - if(coscoSupplierSurvey != null){ + if (!ObjectUtils.isEmpty(vo.getCoscoSupplierSurvey())) { + //填写人信息 + CoscoSupplierSurvey coscoSupplierSurvey = vo.getCoscoSupplierSurvey(); coscoSupplierSurvey.setSupplierId(supplierId); coscoSupplierSurveyService.insertCoscoSupplierSurvey(coscoSupplierSurvey); } + //问题回复 if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyQuestionReply())) { for(CoscoSupplierSurveyQuestionReply coscoSupplierSurveyQuestionReply : vo.getCoscoSupplierSurveyQuestionReply()){ @@ -241,7 +245,7 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { String appid = vo.getId();//任务主体id CoscoSupplierChangeApply coscoSupplierChangeApply = coscoSupplierChangeApplyMapper.selectCoscoSupplierChangeApplyById(appid); - if(coscoSupplierChangeApply == null){ + if (!ObjectUtils.isEmpty(coscoSupplierChangeApply)) { throw new IllegalArgumentException("任务信息不能为空"); } //先验证一下主任务表数据状态 @@ -249,13 +253,13 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { CoscoType.APPROVE_STATUS_BH.equals(coscoSupplierChangeApply.getApproveStatus()) ){ throw new IllegalArgumentException("任务已处理完成"); } - + Date date = CoscoDateUtils.getNowDate(); //修改主体审批状态，封装实体 CoscoSupplierChangeApply coscoSupplierChangeApply1 = new CoscoSupplierChangeApply(); //审批通过 if(CoscoType.APPROVE_STATUS_TG.equals(vo.getApproveStatus())){ - Date date = CoscoDateUtils.getNowDate(); + //新基本信息 CoscoSupplierChangeBase newCoscoSupplierBase = coscoSupplierChangeBaseMapper.selectBySupplierChangeApplyId(appid); @@ -276,8 +280,8 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { coscoSupplierChangeApply1.setId(coscoSupplierChangeApply.getId()); coscoSupplierChangeApply1.setApproveStatus(vo.getApproveStatus()); - coscoSupplierChangeApply1.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierChangeApply1.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierChangeApply1.setUpdateTime(date); + coscoSupplierChangeApply1.setLastUpdateTime(date); coscoSupplierChangeApplyMapper.updateCoscoSupplierChangeApply(coscoSupplierChangeApply1); @@ -401,18 +405,16 @@ public class CoscoSupplierBaseServiceImpl implements ICoscoSupplierBaseService { //变更证明附件 - if(vo.getCoscoSupplierSurveyAttachments() != null){ - if(vo.getCoscoSupplierSurveyAttachments().size() > 0){ - for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){ - coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId()); - coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId()); - coscoSupplierSurveyAttachments.setCreateBy("1"); - coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate()); - coscoSupplierSurveyAttachments.setUpdateBy("1"); - coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); - coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); - } + if (!CollectionUtils.isEmpty(vo.getCoscoSupplierSurveyAttachments())) { + for(CoscoSupplierSurveyAttachments coscoSupplierSurveyAttachments : vo.getCoscoSupplierSurveyAttachments()){ + coscoSupplierSurveyAttachments.setId(CoscoIdUtil.getId()); + coscoSupplierSurveyAttachments.setSupplierId(oldCoscoSupplierBase.getId()); + coscoSupplierSurveyAttachments.setCreateBy("1"); + coscoSupplierSurveyAttachments.setCreateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachments.setUpdateBy("1"); + coscoSupplierSurveyAttachments.setUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachments.setLastUpdateTime(CoscoDateUtils.getNowDate()); + coscoSupplierSurveyAttachmentsMapper.insertCoscoSupplierSurveyAttachments(coscoSupplierSurveyAttachments); } } //**************调用审批接口********************** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java index acfb371..805686e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java @@ -19,6 +19,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierExitSupp import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; /** * 供应商退出_供应商退出任务Service业务层处理 @@ -74,8 +75,15 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { * @return 供应商退出_供应商退出任务 */ @Override - public CoscoSupplierexit selectCoscoSupplierexitById(String id) { - return coscoSupplierexitMapper.selectCoscoSupplierexitById(id); + public CoscoSupplierexitVo selectCoscoSupplierexitById(String id) { + CoscoSupplierexitVo vo = new CoscoSupplierexitVo(); + CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(id); + CoscoSupplierexitSupplierCategory category = new CoscoSupplierexitSupplierCategory(); + category.setSupplierexitId(id); + List categoryList = coscoSupplierexitSupplierCategoryMapper.selectCoscoSupplierexitSupplierCategoryList(category); + vo.setCoscoSupplierexit(coscoSupplierexit); + vo.setCoscoSupplierexitSupplierCategoryList(categoryList); + return vo; } /** @@ -143,7 +151,7 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { //先验证一下主任务表数据状态 CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(vo.getId()); - if(coscoSupplierexit == null){ + if (!ObjectUtils.isEmpty(coscoSupplierexit)) { throw new IllegalArgumentException("任务信息不能为空"); } if(CoscoType.APPROVE_STATUS_TG.equals(coscoSupplierexit.getApproveStatus()) || @@ -198,7 +206,6 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); coscoSupplierBase.setId(coscoSupplierexitSupplier1.getSupplierId()); coscoSupplierBase.setAccessStatus(CoscoType.ACCESS_STATUS_WZR); - coscoSupplierBase.setUpdateBy("1"); coscoSupplierBase.setUpdateTime(date); coscoSupplierBase.setLastUpdateTime(date); coscoSupplierBaseMapper.updateCoscoSupplierBase(coscoSupplierBase); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java index 74eecb5..a2ef26e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/task/SupplierSyncTask.java @@ -52,6 +52,7 @@ public class SupplierSyncTask { @Transactional public void reportCurrentTimeYyzz(){ CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase(); + coscoSupplierBase.setSupplierType(CoscoType.SUPPLIER_TYPE_DVS); List suppliers = coscoSupplierBaseMapper.selectCoscoSupplierBaseList(coscoSupplierBase); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java index 6e7051e..c53345f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java @@ -40,6 +40,10 @@ public class SupplierPageVo { /** 最新评价时间 */ private Date evaluationTime; + + /** 最新评价时间 */ + private String supplierType; + /** * 黑名单部门list */ diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml index 9bb5e80..e8ba19b 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml @@ -75,6 +75,8 @@ END AS access_type_text, w.start_time, w.end_time, + w.review_status, + w.approve_status, CASE WHEN w.review_status = 0 THEN '未开始' WHEN w.review_status = 1 THEN '进行中' @@ -140,6 +142,8 @@ GROUP BY + w.review_status, + w.approve_status, w.id, w.access_work_name, w.dept_id, @@ -154,6 +158,7 @@ w.update_by, w.update_time, w.last_update_time + order by w.create_time desc @@ -196,6 +201,8 @@ GROUP BY + w.review_status, + w.approve_status, w.id, w.access_work_name, w.dept_id, @@ -210,6 +217,7 @@ w.update_by, w.update_time, w.last_update_time + order by w.create_time desc @@ -256,6 +264,8 @@ GROUP BY + w.review_status, + w.approve_status, w.id, w.access_work_name, w.dept_id, @@ -270,6 +280,7 @@ w.update_by, w.update_time, w.last_update_time + order by w.create_time desc diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml index 2f37504..9fc5b6b 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml @@ -15,32 +15,40 @@ - select id, receiver_id, content, read, type, create_time, update_time - from cosco_message + SELECT + m.id, + m.receiver_id, + m.content, + m.`read`, + m.type, + m.create_time, + m.update_time + FROM + cosco_message m @@ -81,7 +89,7 @@ content = #{content}, - read = + `read` = #{read}, type = @@ -94,7 +102,7 @@ #{updateTime}, - where id = #{id} + where receiver_id = #{receiverId} diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml index d308d17..c1d5c67 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml @@ -125,6 +125,32 @@ cosco_supplier_base + + + SELECT + GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName, + CASE supplier_type + WHEN 'dvs' THEN '境内企业' + WHEN 'ovs' THEN '境外企业' + WHEN 'pe' THEN '个人' + END AS supplier_type_cn, + csb.enterprise_type, + cas.id, + cas.access_work_id, + cas.supplier_id, + csb.`name`, + caw.update_time + FROM + cosco_access_supplier cas + LEFT JOIN cosco_access_work caw ON cas.access_work_id = caw.id + LEFT JOIN cosco_supplier_base csb ON cas.supplier_id = csb.id + left join cosco_access_supplier_category casc on csb.id = casc.supplier_id and casc.del_flag = 'normal' + left join cosco_category cc on casc.category_id = cc.id and cc.del_flag = 'normal' + + + + + + + + + + + +