diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java index aa246bb..2b9fd2e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessSupplierController.java @@ -3,7 +3,9 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.controller; import com.alibaba.excel.EasyExcelFactory; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.chinaunicom.mall.ebtp.common.base.controller.BaseController; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessSupplier; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierService; @@ -35,20 +37,18 @@ public class CoscoAccessSupplierController extends BaseController { @ApiOperation("查询分页数据") @PostMapping("/getPage") public BaseResponse getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessSupplier coscoAccessSupplier) { + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + coscoAccessSupplier.setOrgId(currentUser.getOrganizationId()); coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); - List deptIdList = new ArrayList<>(); - deptIdList.add("100"); - coscoAccessSupplier.setDeptIdList(deptIdList); return BaseResponse.success(coscoAccessSupplierService.selectCoscoAccessSupplierAndWorkPageList(coscoAccessSupplier)); } @GetMapping("/getPageExport") public void getPageExport(HttpServletResponse response, CoscoAccessSupplier coscoAccessSupplier){ try{ + BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + coscoAccessSupplier.setOrgId(currentUser.getOrganizationId()); coscoAccessSupplier.setAccessStatus(CoscoType.ACCESS_STATUS_YZR); - List deptIdList = new ArrayList<>(); - deptIdList.add("100"); - coscoAccessSupplier.setDeptIdList(deptIdList); List list = coscoAccessSupplierService.selectCoscoAccessSupplierAndWorkExecList(coscoAccessSupplier); // 动态设置导出字段(忽略未标注字段) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/HomeStatisticsController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/HomeStatisticsController.java new file mode 100644 index 0000000..7707ec4 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/HomeStatisticsController.java @@ -0,0 +1,56 @@ +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.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessSupplierMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessWorkMapper; +import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * 首页统计 + */ +@RestController +@RequestMapping("/homeStatistics") +public class HomeStatisticsController extends BaseController { + @Autowired + private CoscoAccessSupplierMapper coscoAccessSupplierMapper; + + @Autowired + private CoscoAccessWorkMapper coscoAccessWorkMapper; + + @Autowired + private CoscoSupplierBaseMapper coscoSupplierBaseMapper; + + + /** + * 统计每年注册的供应商数量 + * @return + */ + @GetMapping(value = "/getYearcountNum") + public BaseResponse selectUpdateYearcountNum() { + return BaseResponse.success(coscoAccessSupplierMapper.selectUpdateYearcountNum()); + } + + /** + * 统计准入类别数量 + * @return + */ + @GetMapping(value = "/getAccessTypeCountNum") + public BaseResponse selectAccessTypeCountNum() { + return BaseResponse.success(coscoAccessWorkMapper.selectAccessTypeCountNum()); + } + + /** + * 统计供应商身份类别数量 + * @return + */ + @GetMapping(value = "/getSupplierTypeCountNum") + public BaseResponse selectSupplierTypeCountNum() { + return BaseResponse.success(coscoSupplierBaseMapper.selectSupplierTypeCountNum()); + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java index b15af5e..5268a35 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessSupplierMapper.java @@ -22,6 +22,12 @@ public interface CoscoAccessSupplierMapper { */ public CoscoAccessSupplier selectCoscoAccessSupplierByAccessWorkId(String accessWorkId); + /** + * 年度统计准入数量 + * @return + */ + public CoscoAccessSupplier selectUpdateYearcountNum(); + /** diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java index 034568a..8cec9f7 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoAccessWorkMapper.java @@ -42,6 +42,14 @@ public interface CoscoAccessWorkMapper { */ public CoscoAccessWork selectCoscoAccessWorkById(String id); + /** + * 统计准入类别数量 + * @return + */ + public CoscoAccessWork selectAccessTypeCountNum(); + + + /** * 查询供应商准入_准入申请工作主列表 * 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 fdc19ac..4d8c0c0 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 @@ -33,6 +33,12 @@ public interface CoscoSupplierBaseMapper extends IBaseMapper */ public List selectCoscoSupplierBaseList(CoscoSupplierBase coscoSupplierBase); + /** + * 统计供应商身份列表数量 + * @return + */ + public CoscoSupplierBase selectSupplierTypeCountNum(); + IPage selectWzrPageList(IPage page, @Param("vo") CoscoSupplierBase vo); diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml index 75dcd15..50413d0 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessSupplierMapper.xml @@ -117,10 +117,9 @@ - and a.dept_id in - - #{item} - + + and a.org_id = #{orgId} + and a.access_status = #{accessStatus} @@ -177,7 +175,15 @@ where a.access_work_id = #{accessWorkId} - + insert into cosco_access_supplier 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 08603fc..c81a8a9 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 @@ -327,6 +327,25 @@ + + + + + + +