代码优化

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessItemController.java

@@ -2,10 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller;
 
 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.CoscoAccessCategory;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessItem;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBank;
-import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessCategoryService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,14 +20,14 @@ import java.util.List;
 @RequestMapping("/coscoAccessItem")
 public class CoscoAccessItemController extends BaseController {
     @Autowired
-    private ICoscoAccessCategoryService coscoAccessCategoryService;
+    private ICoscoAccessItemService coscoAccessItemService;
 
     /**
      * 分组查询工作任务下的评审项
      */
     @GetMapping("/groupByList")
-    public BaseResponse<List<CoscoAccessCategory>> groupByList(CoscoAccessCategory coscoAccessCategory) {
-        List<CoscoAccessCategory> list = coscoAccessCategoryService.selectCoscoAccessCategoryList(coscoAccessCategory);
+    public BaseResponse<List<CoscoAccessItem>> groupByList(CoscoAccessItem coscoAccessItem) {
+        List<CoscoAccessItem> list = coscoAccessItemService.selectGroupByItemList(coscoAccessItem);
         return BaseResponse.success(list);
     }
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoSupplierBaseController.java

@@ -286,6 +286,7 @@ public class CoscoSupplierBaseController extends BaseController {
     @ApiOperation("查询数据")
     @GetMapping("/{id}")
     public BaseResponse<CoscoSupplierVo> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){
+        id = "1944943451761344512";
         return BaseResponse.success(coscoSupplierBaseService.selectCoscoSupplierBaseById(id));
     }
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java

@@ -440,7 +440,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
     @Transactional
     public int updateCoscoAccessWork(CoscoAccessUserItemVo vo) {
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        String userId = "USER002";
+        String userId = currentUser.getUserId();
         Date date = CoscoDateUtils.getNowDate();
 
         //修改评审项关联评审人员表

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java

@@ -20,6 +20,8 @@ public class SupplierPageVo {
      */
     private String name;
 
+
+    private String nameEn;
     /**
      * 部门ID
      */
@@ -83,6 +85,11 @@ public class SupplierPageVo {
 
     private String socialCreditCode;
 
+    /**
+     * 三合一统一信用代码
+     */
+    private String unifiedCode;
+
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
 }