zxc 3 years ago
parent
commit
cdd85d9346
  1. 84
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java
  2. 13
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java
  3. 13
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcCustomerReportDao.java
  4. 9
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java
  5. 24
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java
  6. 11
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcCustomerReportDao.xml

84
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java

@ -0,0 +1,84 @@
package com.epmet.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2022/8/8 10:29
* @DESC
*/
@Data
public class ReportResultDTO implements Serializable {
private static final long serialVersionUID = -5798816843431200300L;
/**
* 报表名字
*/
private String reportName;
/**
* 报表ID
*/
private String reportId;
/**
* 客户ID
*/
@JsonIgnore
private String customerId;
/**
* 客户名字
*/
@JsonIgnore
private String customerName;
/**
* 分类名字
*/
@JsonIgnore
private String categoryName;
/**
* 分类key
*/
@JsonIgnore
private String categoryKey;
/**
* 客户信息集合
*/
private List<CustomerList> customerList;
@Data
static class CustomerList implements Serializable{
private static final long serialVersionUID = 7146198312265513418L;
/**
* 客户ID
*/
private String customerId;
/**
* 客户名字
*/
private String customerName;
/**
* 分类名字
*/
private String categoryName;
/**
* 分类key
*/
private String categoryKey;
}
}

13
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcCustomerReportController.java

@ -9,10 +9,12 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IcCustomerReportDTO;
import com.epmet.dto.result.ReportResultDTO;
import com.epmet.service.IcCustomerReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@ -67,4 +69,15 @@ public class IcCustomerReportController {
return new Result();
}
/**
* Desc: 报表集合
* @param
* @author zxc
* @date 2022/8/8 10:38
*/
@PostMapping("list")
public Result<List<ReportResultDTO>> reportList(){
return new Result<List<ReportResultDTO>>().ok(icCustomerReportService.reportList());
}
}

13
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcCustomerReportDao.java

@ -1,9 +1,12 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.ReportResultDTO;
import com.epmet.entity.IcCustomerReportEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 客户报表关系表
*
@ -12,5 +15,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface IcCustomerReportDao extends BaseDao<IcCustomerReportEntity> {
/**
* Desc: 报表集合
* @param
* @author zxc
* @date 2022/8/8 10:38
*/
List<ReportResultDTO> reportList();
}

9
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcCustomerReportService.java

@ -3,6 +3,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IcCustomerReportDTO;
import com.epmet.dto.result.ReportResultDTO;
import com.epmet.entity.IcCustomerReportEntity;
import java.util.List;
@ -75,4 +76,12 @@ public interface IcCustomerReportService extends BaseService<IcCustomerReportEnt
* @date 2022-08-08
*/
void delete(String[] ids);
/**
* Desc: 报表集合
* @param
* @author zxc
* @date 2022/8/8 10:38
*/
List<ReportResultDTO> reportList();
}

24
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java

@ -8,12 +8,17 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dao.IcCustomerReportDao;
import com.epmet.dto.IcCustomerReportDTO;
import com.epmet.dto.result.ReportResultDTO;
import com.epmet.entity.IcCustomerReportEntity;
import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.service.IcCustomerReportService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -27,6 +32,9 @@ import java.util.Map;
@Service
public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerReportDao, IcCustomerReportEntity> implements IcCustomerReportService {
@Autowired
private EpmetAdminOpenFeignClient adminOpenFeignClient;
@Override
public PageData<IcCustomerReportDTO> page(Map<String, Object> params) {
IPage<IcCustomerReportEntity> page = baseDao.selectPage(
@ -79,4 +87,20 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* Desc: 报表集合
* @param
* @author zxc
* @date 2022/8/8 10:38
*/
@Override
public List<ReportResultDTO> reportList() {
List<ReportResultDTO> reportList = baseDao.reportList();
if (CollectionUtils.isEmpty(reportList)){
return new ArrayList<>();
}
return null;
}
}

11
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcCustomerReportDao.xml

@ -3,4 +3,15 @@
<mapper namespace="com.epmet.dao.IcCustomerReportDao">
<!-- 报表集合 -->
<select id="reportList" resultType="com.epmet.dto.result.ReportResultDTO">
SELECT
cr.REPORT_ID,
cr.CUSTOMER_ID,
rf.FUN_CATEGORY_KEY AS categoryKey
FROM ic_customer_report cr
INNER JOIN ic_report_fun rf ON rf.CUSTOMER_REPORT_ID = cr.REPORT_ID AND rf.DEL_FLAG = 0
WHERE cr.DEL_FLAG = 0
ORDER BY cr.CREATED_TIME DESC
</select>
</mapper>
Loading…
Cancel
Save