Skip to content

D
dataC_api
Commit 656b39f5 authored by hubaoshan's avatar hubaoshan
Browse files
Options

导入

parent 50a709a3
Show whitespace changes
Inline Side-by-side
Showing with 1219 additions and 142 deletions
src/main/java/org/rcisoft/bus/jnP7sj/controller/jnP7sjController.java
View file @ 656b39f5
......@@ -110,11 +110,19 @@ public class jnP7sjController extends CyPaginationController<jnP7sj> {
List<jnP7sj> jnP7sjList = jnP7sjServiceImpl.export(jnP7sj);
ExportToExcelUtil.exportExcel(jnP7sjList, "jnP7sj信息", "jnP7sj信息", jnP7sj.class, excelName, response);
}
@CyOpeLogAnno(title = "system-jnP7sj管理-查询月份下拉框", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "查询月份下拉框", notes = "查询月份下拉框")
@GetMapping(value = "/getMonth")
public CyResult getMonth() {
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
jnP7sjServiceImpl.getMonth());
}
@CyOpeLogAnno(title = "system-jnP7sj管理-下载空模板", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value = "下载空模板", notes = "下载空模板")
@GetMapping(value = "/jnP7sjDownEmptyTemplate")
public void jnsp7xtmDqsjDownEmptyTemplate(jnP7sjPageHandleDto jnP7sjPageHandleDto, HttpServletResponse response) {
public void jnP7sjDownEmptyTemplate(jnP7sjPageHandleDto jnP7sjPageHandleDto, HttpServletResponse response) {
jnP7sjServiceImpl.jnP7sjDownEmptyTemplate(jnP7sjPageHandleDto,response);
}
......
src/main/java/org/rcisoft/bus/jnP7sj/dao/jnP7sjRepository.java
View file @ 656b39f5
......@@ -2,7 +2,10 @@ package org.rcisoft.bus.jnP7sj.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.ResultHandler;
import org.rcisoft.bus.jnP7sj.dto.jnP7sjPageHandleDto;
import org.rcisoft.bus.jnP7sj.entity.jnP7sj;
import org.rcisoft.bus.jnsp7xtm.vo.Jnsp7xtmVo;
import org.rcisoft.core.mapper.CyBaseMapper;
import org.rcisoft.core.model.CyPageInfo;
......@@ -20,11 +23,12 @@ public interface jnP7sjRepository extends CyBaseMapper<jnP7sj> {
* 根据cc 查询客户有关的信息
* **/
List<jnP7sj> queryCustomer(@Param("cc") String cc);
Integer queryTotaljnP7sj();
/**
* 根据pn 查询sypn的值
* **/
List<String> querySypnByPn(@Param("pn") String pn);
void streamQuery(ResultHandler<Jnsp7xtmVo> handler, @Param("entity") jnP7sjPageHandleDto jnsp7xtmDqsjPageHandleDto );
}
src/main/java/org/rcisoft/bus/jnP7sj/dto/jnP7sjExportTemplateDto.java
View file @ 656b39f5
......@@ -9,6 +9,7 @@ import lombok.Data;
public class jnP7sjExportTemplateDto {
@Excel(name = "term", orderNum = "0", width = 20)
private String term;
......@@ -16,44 +17,45 @@ public class jnP7sjExportTemplateDto {
@Excel(name = "month", orderNum = "1", width = 20)
private String month;
@Excel(name = "half", orderNum = "2", width = 20)
private String half;
@Excel(name = "quarter", orderNum = "3", width = 20)
private String quarter;
@Excel(name="io", orderNum = "4",width = 20)
private String io;
@Excel(name = "cc", orderNum = "5", width = 20)
@Excel(name = "cc", orderNum = "2", width = 20)
private String cc;
@Excel(name = "cn", orderNum = "6", width = 20)
private String cn;
@Excel(name = "route", orderNum = "7", width = 20)
@Excel(name = "route", orderNum = "4", width = 20)
private String route;
@Excel(name = "pc", orderNum = "8", width = 20)
@Excel(name = "pc", orderNum = "5", width = 20)
private String pc;
@Excel(name = "factory", orderNum = "9", width = 20)
@Excel(name = "factory", orderNum = "6", width = 20)
private String factory;
@Excel(name = "size", orderNum = "10", width = 20)
@Excel(name = "size", orderNum = "7", width = 20)
private String size;
@Excel(name = "pn", orderNum = "11", width = 20)
@Excel(name = "pn", orderNum = "8", width = 20)
private String pn;
@Excel(name = "po", orderNum = "12", width = 20)
@Excel(name = "po", orderNum = "9", width = 20)
private String po;
@Excel(name = "fc", orderNum = "13", width = 20)
@Excel(name = "fc", orderNum = "10", width = 20)
private String fc;
@Excel(name = "qty", orderNum = "14", width = 20)
@Excel(name = "qty", orderNum = "11", width = 20)
private String qty;
@Excel(name = "sypn", orderNum = "15", width = 20)
@Excel(name = "sypn", orderNum = "12", width = 20)
private String sypn;
@Excel(name = "currency", orderNum = "13", width = 20)
private String currency;
@Excel(name = "rate", orderNum = "14", width = 20)
private String rate;
}
@Excel(name = "amt", orderNum = "15", width = 20)
private String amt;
@Excel(name = "up", orderNum = "16", width = 20)
private String up;
}
src/main/java/org/rcisoft/bus/jnP7sj/entity/jnP7sj.java
View file @ 656b39f5
......@@ -4,7 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.rcisoft.bus.jnP7sj.dto.jnP7sjExportTemplateDto;
import org.rcisoft.bus.jnsp7xtm.vo.Jnsp7xtmVo;
import org.rcisoft.core.entity.CyIdIncreEntity;
import java.math.BigDecimal;
......@@ -12,45 +14,283 @@ import java.math.BigDecimal;
@Data
@TableName("jnsp7xtm_dqsj")
public class jnP7sj extends CyIdIncreEntity<jnP7sj> {
@Excel(name = "businessId", orderNum = "0", width = 20)
private Integer businessId;
@Excel(name = "term", orderNum = "1", width = 20)
@Excel(name = "term", orderNum = "0", width = 20)
private String term;
@Excel(name = "half", orderNum = "2", width = 20)
@Excel(name = "half", orderNum = "1", width = 20)
private String half;
@Excel(name = "quarter", orderNum = "3", width = 20)
@Excel(name = "quarter", orderNum = "2", width = 20)
private String quarter;
@Excel(name = "month", orderNum = "4", width = 20)
@Excel(name = "month", orderNum = "3", width = 20)
private String month;
@Excel(name = "cc", orderNum = "5", width = 20)
@Excel(name = "cc", orderNum = "4", width = 20)
private String cc;
@Excel(name="cn", orderNum = "6",width = 20)
@Excel(name = "cn", orderNum = "5", width = 20)
private String cn;
@Excel(name="io", orderNum = "7",width = 20)
@Excel(name = "io", orderNum = "6", width = 20)
private String io;
@Excel(name="route", orderNum = "8",width = 20)
@Excel(name = "route", orderNum = "7", width = 20)
private String route;
@Excel(name="pc", orderNum = "9",width = 20)
@Excel(name = "pc", orderNum = "8", width = 20)
private String pc;
@Excel(name="factory", orderNum = "10",width = 20)
@Excel(name = "sypn", orderNum = "8", width = 20)
private String sypn;
@Excel(name = "factory", orderNum = "9", width = 20)
private String factory;
@Excel(name="size", orderNum = "11",width = 20)
@Excel(name = "size", orderNum = "10", width = 20)
private String size;
@Excel(name="pn", orderNum = "12",width = 20)
@Excel(name = "pn", orderNum = "11", width = 20)
private String pn;
@Excel(name="sypn", orderNum = "13",width = 20)
private String sypn;
@Excel(name="po", orderNum = "14",width = 20)
@Excel(name = "po", orderNum = "12", width = 20)
private BigDecimal po;
@Excel(name="fc", orderNum = "15",width = 20)
@Excel(name = "fc", orderNum = "13", width = 20)
private BigDecimal fc;
@Excel(name="qty", orderNum = "16",width = 20)
@Excel(name = "qty", orderNum = "14", width = 20)
private BigDecimal qty;
public static jnP7sj generatejnP7sj(jnP7sjExportTemplateDto jnP7sjExportTemplateDto, jnP7sj jnP7sj) {
BeanUtil.copyProperties(jnP7sjExportTemplateDto, jnP7sj);
@Excel(name = "up", orderNum = "15", width = 20)
private BigDecimal up;
@Excel(name = "currency", orderNum = "16", width = 20)
private String currency;
@Excel(name = "rate", orderNum = "17", width = 20)
private BigDecimal rate;
@Excel(name = "amt", orderNum = "18", width = 20)
private BigDecimal amt;
@Excel(name = "custGroup", orderNum = "19", width = 20)
private String custGroup;
@Excel(name = "custGroup2", orderNum = "20", width = 20)
private String custGroup2;
@Excel(name = "custRt1", orderNum = "21", width = 20)
private String custRt1;
@Excel(name = "custIo", orderNum = "22", width = 20)
private String custIo;
@Excel(name = "custNewpic", orderNum = "23", width = 20)
private String custNewpic;
@Excel(name = "custGroup1", orderNum = "24", width = 20)
private String custGroup1;
@Excel(name = "custRt2", orderNum = "25", width = 20)
private String custRt2;
@Excel(name = "custRout", orderNum = "26", width = 20)
private String custRout;
@Excel(name = "custAddr", orderNum = "27", width = 20)
private String custAddr;
@Excel(name = "custG0", orderNum = "28", width = 20)
private String custG0;
@Excel(name = "custG20", orderNum = "29", width = 20)
private String custG20;
@Excel(name = "custG30", orderNum = "30", width = 20)
private String custG30;
@Excel(name = "custG201", orderNum = "31", width = 20)
private String custG201;
@Excel(name = "custSave", orderNum = "32", width = 20)
private String custSave;
@Excel(name = "custStype", orderNum = "33", width = 20)
private String custStype;
@Excel(name = "custG1", orderNum = "34", width = 20)
private String custG1;
@Excel(name = "custYj", orderNum = "35", width = 20)
private String custYj;
@Excel(name = "custYj2", orderNum = "36", width = 20)
private String custYj2;
@Excel(name = "custYj3", orderNum = "37", width = 20)
private String custYj3;
@Excel(name = "custGc", orderNum = "38", width = 20)
private String custGc;
public static final String TERM_C = "C";
public static final String TERM_L = "L";
public static jnP7sj generatejnP7sj(Jnsp7xtmVo jnsp7xtmVo){
jnP7sj jnP7sj = new jnP7sj();
// y.cust_group - cust_gc 20项
BeanUtil.copyProperties(jnsp7xtmVo,jnP7sj);
jnP7sj.setTerm(TERM_C);
jnP7sj.setMonth(jnsp7xtmVo.getNqy());
/*
if(x.nqy = xxxx04 ... 09) y.half = 1H
if(x.nqy = xxxx10 ... 03) y.half = 2H
*/
String lastTwoNqy = "";
if (StringUtils.isNotBlank(jnsp7xtmVo.getNqy()) && jnsp7xtmVo.getNqy().length() > 2) {
lastTwoNqy = jnsp7xtmVo.getNqy().substring(jnsp7xtmVo.getNqy().length() - 2);
if (lastTwoNqy.equals("04") || lastTwoNqy.equals("05") || lastTwoNqy.equals("06") || lastTwoNqy.equals("07") || lastTwoNqy.equals("08") || lastTwoNqy.equals("09")) {
jnP7sj.setHalf("1H");
} else {
jnP7sj.setHalf("2H");
}
/*
if(x.nqy = xxxx04 ... 06) y.quarter = Q1
if(x.nqy = xxxx07 ... 09) y.quarter = Q2
if(x.nqy = xxxx10 ... 12) y.quarter = Q3
if(x.nqy = xxxx01 ... 03) y.quarter = Q4
*/
if (lastTwoNqy.equals("01") || lastTwoNqy.equals("02") || lastTwoNqy.equals("03")) {
jnP7sj.setQuarter("Q4");
} else if (lastTwoNqy.equals("04") || lastTwoNqy.equals("05") || lastTwoNqy.equals("06")) {
jnP7sj.setQuarter("Q1");
} else if (lastTwoNqy.equals("07") || lastTwoNqy.equals("08") || lastTwoNqy.equals("09")) {
jnP7sj.setQuarter("Q2");
} else if (lastTwoNqy.equals("10") || lastTwoNqy.equals("11") || lastTwoNqy.equals("12")) {
jnP7sj.setQuarter("Q3");
}
jnP7sj.setCc(jnsp7xtmVo.getKhdm());
jnP7sj.setCn(jnsp7xtmVo.getKhm());
// if(x.xslj == "W0") ? y.io = I: y.io = O
if (StringUtils.isNotBlank(jnsp7xtmVo.getXslj())) {
if (jnsp7xtmVo.getXslj().equals("W0"))
jnP7sj.setIo("I");
else
jnP7sj.setIo("o");
}
jnP7sj.setRoute(jnsp7xtmVo.getXslj());
jnP7sj.setPc(jnsp7xtmVo.getZd());
// if(x.zd == "CR" || WR || MP) ? y.factory = "CC1" : y.factory = "CC2"
if (StringUtils.isNotBlank(jnsp7xtmVo.getZd())) {
if (jnsp7xtmVo.getZd().equals("CR") || jnsp7xtmVo.getZd().equals("WR") || jnsp7xtmVo.getZd().equals("MP"))
jnP7sj.setFactory("CC1");
else
jnP7sj.setFactory("CC2");
}
jnP7sj.setSize(jnsp7xtmVo.getJlpm());
jnP7sj.setPn(jnsp7xtmVo.getPn());
jnP7sj.setSypn(jnsp7xtmVo.getSypn());
jnP7sj.setPo(new BigDecimal(jnsp7xtmVo.getZzc()));
// y.qty = y.po + y.fc (BigDecimal)
if (jnP7sj.getPo() != null && jnP7sj.getFc() != null) {
jnP7sj.setQty(jnP7sj.getPo().add(jnP7sj.getFc()) );
}
jnP7sj.setUp(new BigDecimal(jnsp7xtmVo.getXsjg()));
jnP7sj.setCurrency(jnsp7xtmVo.getBz());
jnP7sj.setAmt(new BigDecimal(jnsp7xtmVo.getRmb()));
}
return jnP7sj;
}
public static jnP7sj generatejnP7sj(jnP7sjExportTemplateDto jnP7sjExportTemplateDto,jnP7sj jnP7sj) {
BeanUtil.copyProperties(jnP7sjExportTemplateDto,jnP7sj);
if (StringUtils.isEmpty(jnP7sjExportTemplateDto.getTerm()))
jnP7sj.setTerm(TERM_L);
String lastTwoNqy = "";
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getMonth()) &&jnP7sjExportTemplateDto.getMonth().length() > 2 ) {
lastTwoNqy = jnP7sjExportTemplateDto.getMonth().substring(jnP7sjExportTemplateDto.getMonth().length() - 2);
if (lastTwoNqy.equals("04") || lastTwoNqy.equals("05") || lastTwoNqy.equals("06") || lastTwoNqy.equals("07") || lastTwoNqy.equals("08") || lastTwoNqy.equals("09")) {
jnP7sj.setHalf("1H");
} else {
jnP7sj.setHalf("2H");
}
if (lastTwoNqy.equals("01") || lastTwoNqy.equals("02") || lastTwoNqy.equals("03")) {
jnP7sj.setQuarter("Q4");
} else if (lastTwoNqy.equals("04") || lastTwoNqy.equals("05") || lastTwoNqy.equals("06")) {
jnP7sj.setQuarter("Q1");
} else if (lastTwoNqy.equals("07") || lastTwoNqy.equals("08") || lastTwoNqy.equals("09")) {
jnP7sj.setQuarter("Q2");
} else if (lastTwoNqy.equals("10") || lastTwoNqy.equals("11") || lastTwoNqy.equals("12")) {
jnP7sj.setQuarter("Q3");
}
if (StringUtils.isNotBlank(jnP7sjExportTemplateDto.getRoute())) {
if (jnP7sjExportTemplateDto.getRoute().equals("W0"))
jnP7sj.setIo("I");
else
jnP7sj.setIo("o");
}
if (StringUtils.isNotBlank(jnP7sjExportTemplateDto.getPc())) {
if (jnP7sjExportTemplateDto.getPc().equals("CR") || jnP7sjExportTemplateDto.getPc().equals("WR") || jnP7sjExportTemplateDto.getPc().equals("MP"))
jnP7sj.setFactory("CC1");
else
jnP7sj.setFactory("CC2");
}
/**
* 将string 转换成 BigDecimal类型
* **/
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getAmt())) {
jnP7sj.setAmt(new BigDecimal(jnP7sjExportTemplateDto.getAmt()));
}
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getRate())) {
jnP7sj.setRate(new BigDecimal(jnP7sjExportTemplateDto.getRate()));
}
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getUp())) {
jnP7sj.setUp(new BigDecimal(jnP7sjExportTemplateDto.getUp()));
}
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getFc())) {
jnP7sj.setFc(new BigDecimal(jnP7sjExportTemplateDto.getFc()));
jnP7sj.setQty(jnP7sj.getFc());
}
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getPo())) {
jnP7sj.setPo(new BigDecimal(jnP7sjExportTemplateDto.getPo()));
jnP7sj.setQty(jnP7sj.getPo());
}
// y.qty = y.po + y.fc (BigDecimal)
if (StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getPo()) && StringUtils.isNotEmpty(jnP7sjExportTemplateDto.getFc())) {
jnP7sj.setQty(new BigDecimal(jnP7sjExportTemplateDto.getPo()).add(new BigDecimal(jnP7sjExportTemplateDto.getFc())));
}
}
return jnP7sj;
}
}
src/main/java/org/rcisoft/bus/jnP7sj/service/impl/jnP7sjServiceImpl.java
View file @ 656b39f5
......@@ -17,6 +17,7 @@ import org.rcisoft.bus.jnP7sj.dto.jnP7sjImportDto;
import org.rcisoft.bus.jnP7sj.dto.jnP7sjPageHandleDto;
import org.rcisoft.bus.jnP7sj.entity.jnP7sj;
import org.rcisoft.bus.jnP7sj.service.jnP7sjService;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmOptionDto;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
......@@ -52,6 +53,15 @@ public class jnP7sjServiceImpl extends ServiceImpl<jnP7sjRepository, jnP7sj> imp
//
private static Lock finallyButtonLockLock = new ReentrantLock();
@Value("${jnP7sj.batchAddPagesize}")
private Integer batchInsertSize;
@Value("${jnP7sj.pageQuestSize}")
private Integer pageQuerySize;
@Value("${jnP7sj.shema}")
private String shema;
@Value("${jnP7sj.importBatchAddSize}")
private Integer importBatchAddSize;
......@@ -101,7 +111,14 @@ public class jnP7sjServiceImpl extends ServiceImpl<jnP7sjRepository, jnP7sj> imp
return baseMapper.queryjnP7sjPaged(paginationUtility, jnP7sj);
}
@Override
public Jnsp7xtmOptionDto getMonth() {
Jnsp7xtmOptionDto jnsp7xtmOptionDto = new Jnsp7xtmOptionDto();
List<String> monthList = baseMapper.getMonthList();
jnsp7xtmOptionDto.setLabel("month");
jnsp7xtmOptionDto.setPullDownList(monthList);
return jnsp7xtmOptionDto;
}
@Override
public List<jnP7sj> findAll(jnP7sj jnP7sj) {
return baseMapper.queryjnP7sj(jnP7sj);
......@@ -113,6 +130,7 @@ public class jnP7sjServiceImpl extends ServiceImpl<jnP7sjRepository, jnP7sj> imp
return jnP7sjList;
}
@Override
public void jnP7sjDownEmptyTemplate(jnP7sjPageHandleDto jnsp7xtmDqsjPageHandleDto, HttpServletResponse response) {
// 导出空模板
......@@ -127,7 +145,7 @@ public class jnP7sjServiceImpl extends ServiceImpl<jnP7sjRepository, jnP7sj> imp
List<jnP7sjExportTemplateDto> exportList = new ArrayList<>();
workbook = ExcelExportUtil.exportExcel(exportParams, jnP7sjExportTemplateDto.class, exportList);
Sheet sheet = workbook.getSheetAt(0);
String[] termList = new String[]{"L","c"};
String[] termList = new String[]{"L", "c"};
ExportToExcelUtil.XSSFSetDropDownAndHidden(termList, workbook, sheet, 1, 100000, 0, 0);
outputStream = response.getOutputStream();
workbook.write(outputStream);
......@@ -192,6 +210,7 @@ public class jnP7sjServiceImpl extends ServiceImpl<jnP7sjRepository, jnP7sj> imp
jnP7sj = dqsjList.get(0);
}
}
jnP7sj finallyjnP7sj = jnP7sj.generatejnP7sj(dataList.get(i), jnP7sj);
if (StringUtils.isNotEmpty(dataList.get(i).getPn())) {
List<String> list = baseMapper.querySypnByPn(dataList.get(i).getPn());
......@@ -210,7 +229,6 @@ public class jnP7sjServiceImpl extends ServiceImpl<jnP7sjRepository, jnP7sj> imp
if (CollectionUtil.isNotEmpty(jnP7sjList)) {
baseMapper.batchAddjnP7sj(jnP7sjList);
}
jnP7sjImportDto.setTotal(dataList.size());
jnP7sjImportDto.setRows(rows);
return jnP7sjImportDto;
......
src/main/java/org/rcisoft/bus/jnP7sj/service/jnP7sjService.java
View file @ 656b39f5
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.rcisoft.bus.jnP7sj.dto.jnP7sjImportDto;
import org.rcisoft.bus.jnP7sj.dto.jnP7sjPageHandleDto;
import org.rcisoft.bus.jnP7sj.entity.jnP7sj;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmOptionDto;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
import org.springframework.web.multipart.MultipartFile;
......@@ -23,7 +24,7 @@ public interface jnP7sjService {
jnP7sj findById(int id);
IPage<jnP7sj> findAllByPagination(CyPageInfo<jnP7sj> paginationUtility, jnP7sj jnP7sj);
Jnsp7xtmOptionDto getMonth();
List<jnP7sj> findAll(jnP7sj jnP7sj);
List<jnP7sj> export(jnP7sj jnP7sj);
......
src/main/java/org/rcisoft/bus/jnsp7xtm/dao/Jnsp7xtmStatisticsRepository.java
View file @ 656b39f5
......@@ -2,8 +2,8 @@ package org.rcisoft.bus.jnsp7xtm.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import java.util.List;
......@@ -25,7 +25,7 @@ public interface Jnsp7xtmStatisticsRepository {
List<String> getMonths();
// 4.获取统计总条数
List<Map<String,Object>> queryStatisticsCount(@Param("entity") Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, @Param("monthList") String months, @Param("statistics") String statistics,@Param("orderColumn")String orderColumn);
List<Map<String,Object>> queryStatisticsCount(@Param("entity") Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, @Param("monthList") String months, @Param("statistics") String statistics,@Param("orderColumn")String orderColumn,@Param("joinSql") String joinSql);
/**
* @description: 5.获取统计list
......@@ -38,7 +38,7 @@ public interface Jnsp7xtmStatisticsRepository {
* @param: computedColumn - 计算列
* @return:
**/
List<Map<String,Object>> queryList(@Param("entity") Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, @Param("monthList") String months, @Param("pageNo") int pageNo, @Param("pageSize") int pageSize, @Param("isPage") String isPage, @Param("computedColumn") String computedColumn, @Param("statistics") String statistics,@Param("orderColumn")String orderColumn);
List<Map<String,Object>> queryList(@Param("entity") Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, @Param("monthList") String months, @Param("pageNo") int pageNo, @Param("pageSize") int pageSize, @Param("isPage") String isPage, @Param("computedColumn") String computedColumn, @Param("statistics") String statistics,@Param("orderColumn")String orderColumn,@Param("joinSql") String joinSql);
// 6 查询合计接口
List<Jnsp7xtmDto> queryTotal(@Param("entity") Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto);
......
src/main/java/org/rcisoft/bus/jnsp7xtm/dto/Jnsp7xtmPageRequestDto.java
View file @ 656b39f5
......@@ -117,4 +117,8 @@ public class Jnsp7xtmPageRequestDto {
// 导出类型 1:弹出框查询 2:明细查询
private String type;
private String joinSql;
private String querySql;
}
src/main/java/org/rcisoft/bus/jnsp7xtm/enums/ColTransitionEnum.java 0 → 100644
View file @ 656b39f5
package org.rcisoft.bus.jnsp7xtm.enums;
public enum ColTransitionEnum {
JNSP7XTM("jnsp_", "j7xtm."),
CUSTOMER("cus_", "cust.");
private final String code;
private final String value;
ColTransitionEnum(String code, String value) {
this.code = code;
this.value = value;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
}
src/main/java/org/rcisoft/bus/jnsp7xtm/enums/Jnsp7xtmDqsjType.java 0 → 100644
View file @ 656b39f5
package org.rcisoft.bus.jnsp7xtm.enums;
public enum Jnsp7xtmDqsjType {
JNSP7XTMDDQS("1");
private final String code;
Jnsp7xtmDqsjType(String code) {
this.code = code;
}
public String getCode() {
return code;
}
}
src/main/java/org/rcisoft/bus/jnsp7xtm/service/Jnsp7xtmService.java
View file @ 656b39f5
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import org.rcisoft.core.model.CyPageInfo;
import javax.servlet.http.HttpServletResponse;
public interface Jnsp7xtmService {
......
src/main/java/org/rcisoft/bus/jnsp7xtm/service/Jnsp7xtmStatisticService.java
View file @ 656b39f5
package org.rcisoft.bus.jnsp7xtm.service;
import org.rcisoft.bus.jnsp7xtm.dto.*;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmOptionDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageListDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmTotalDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import java.util.List;
......
src/main/java/org/rcisoft/bus/jnsp7xtm/service/impl/Jnsp7xtmServiceImpl.java
View file @ 656b39f5
......@@ -12,11 +12,12 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.rcisoft.bus.jnsp7xtm.dao.Jnsp7xtmRepository;
import org.rcisoft.bus.jnsp7xtm.dao.Jnsp7xtmStatisticsRepository;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmExportTotalDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmTableHeaderDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmExportTotalDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmPageRequestDto;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmTableHeaderDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import org.rcisoft.bus.jnsp7xtm.enums.ColTransitionEnum;
import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmService;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo;
......@@ -56,7 +57,7 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
private Jnsp7xtmStatisticServiceImpl jnsp74tmStatisticService;
// 获取每次写入excel的长度
@Value("${export.size}")
@Value("${jnsp7xtm.export.pageSize}")
private Integer size;
// 静态锁
......@@ -79,15 +80,47 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
}
jnsp74tmPageRequestDto.setType("1");
// 获取总值
// 获取关联表语句
List<String> joinSqlList = new ArrayList<>();
String joinSql = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality());
String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setOneDimensionality(originalOneDime);
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
jnsp74tmPageRequestDto.setTwoDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getTwoDimensionality());
String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setTwoDimensionality(originalTwoDime);
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setThreeDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getThreeDimensionality());
String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setThreeDimensionality(originalthreeDime);
}
if (!joinSqlList.isEmpty()) {
joinSql = joinSqlList.stream().distinct().collect(Collectors.joining(" "));
}
jnsp74tmPageRequestDto.setJoinSql(joinSql);
IPage<Jnsp7xtm> jnsp74tmIPage = jnsp74tmRepository.queryJnsp74tmByPaged(paginationUtility, jnsp74tmPageRequestDto);
return jnsp74tmIPage;
}
......@@ -108,15 +141,45 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
}
jnsp74tmPageRequestDto.setType("1");
// 获取总值
List<String> joinSqlList = new ArrayList<>();
String joinSql = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality());
String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setOneDimensionality(originalOneDime);
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
jnsp74tmPageRequestDto.setTwoDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getTwoDimensionality());
String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setTwoDimensionality(originalTwoDime);
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setThreeDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getThreeDimensionality());
String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setThreeDimensionality(originalthreeDime);
}
if (!joinSqlList.isEmpty()) {
joinSql = joinSqlList.stream().distinct().collect(Collectors.joining(" "));
}
jnsp74tmPageRequestDto.setJoinSql(joinSql);
Integer total = jnsp74tmRepository.queryAllJnsp74tm(jnsp74tmPageRequestDto);
if (total > 0) {
int pageNumber = 1;
......@@ -155,16 +218,45 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
}
jnsp74tmPageRequestDto.setType("2");
// 获取总值
// 获取总值
List<String> joinSqlList = new ArrayList<>();
String joinSql = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality());
String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setOneDimensionality(originalOneDime);
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
jnsp74tmPageRequestDto.setTwoDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getTwoDimensionality());
String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setTwoDimensionality(originalTwoDime);
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setThreeDimensionality("J7xtm."+ jnsp74tmPageRequestDto.getThreeDimensionality());
String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replaceAll(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
jnsp74tmPageRequestDto.setThreeDimensionality(originalthreeDime);
}
if (!joinSqlList.isEmpty()) {
joinSql = joinSqlList.stream().distinct().collect(Collectors.joining(" "));
}
jnsp74tmPageRequestDto.setJoinSql(joinSql);
Integer total = jnsp74tmRepository.queryAllJnsp74tm(jnsp74tmPageRequestDto);
if (total > 0) {
int pageNumber = 1;
......@@ -185,6 +277,8 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
List<Jnsp7xtm> records = new ArrayList<>();
ExportToExcelUtil.exportExcel(records, "详细信息", "详细信息", Jnsp7xtm.class, excelName, response);
}
} catch (Exception e) {
e.printStackTrace();
} finally {
lock.unlock();
}
......@@ -257,6 +351,30 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
chzsTableHeaders.add(item);
});
Jnsp7xtmDto emptyJnsp74xmDto = jnsp74tmStatisticService.getEmptyJnsp74xmDto(jnsp74tmPageRequestDto);
// 获取关联表语句
List<String> joinSqlList = new ArrayList<>();
String joinSql = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionalityValue())) {
if (jnsp74tmPageRequestDto.getTwoDimensionalityValue().contains(ColTransitionEnum.CUSTOMER.getCode())) {
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionalityValue())) {
if (jnsp74tmPageRequestDto.getThreeDimensionalityValue().contains(ColTransitionEnum.CUSTOMER.getCode())) {
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
}
if (!joinSqlList.isEmpty()) {
joinSql = joinSqlList.stream().distinct().collect(Collectors.joining(" "));
}
jnsp74tmPageRequestDto.setJoinSql(joinSql);
List<Jnsp7xtmDto> tempjnsp74TmDtoList = jnsp74tmStatisticsRepository.queryTotal(jnsp74tmPageRequestDto);
if (!tempjnsp74TmDtoList.isEmpty()) {
// 过滤出没有对应合计值年份
......@@ -318,48 +436,100 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
// 获取排序列
String orderColumn = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getOneDimensionality();
orderColumn = jnsp74tmPageRequestDto.getOneDimensionality();
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) {
statistics = statistics +","+ "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality();
orderColumn = orderColumn +","+ jnsp74tmPageRequestDto.getTwoDimensionality();
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
statistics = statistics +","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," + orderOneOneDimensionality;
} else {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality();
orderColumn = jnsp74tmPageRequestDto.getTwoDimensionality();
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) {
statistics = statistics + ","+ "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality();
orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getThreeDimensionality();
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
statistics = statistics + ","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," +orderOneOneDimensionality;
} else {
statistics = "j7xtm," + jnsp74tmPageRequestDto.getThreeDimensionality();
orderColumn = jnsp74tmPageRequestDto.getThreeDimensionality();
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
}
List<Map<String, Object>> exportListCount = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,1,10,"2","xsjg",statistics,orderColumn);
List<Map<String, Object>> exportListCount = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,1,10,"2","xsjg",statistics,orderColumn,joinSql);
if (!exportListCount.isEmpty()) {
for (int i=0; i<exportListCount.size(); i++) {
HashMap<String, Object> contentMap = new HashMap<>();
if (jnsp74tmPageRequestDto.isChzs()) {
getMap("j7xtm.chzsa+j7xtm.chzsb", statistics, i, chzsTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn);
getMap("j7xtm.chzsa+j7xtm.chzsb", statistics, i, chzsTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn,joinSql);
}
if (jnsp74tmPageRequestDto.isRmb()) {
getMap("j7xtm.rmb", statistics, i, rmbTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn);
getMap("j7xtm.rmb", statistics, i, rmbTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn,joinSql);
}
if (jnsp74tmPageRequestDto.isChzsa()) {
getMap("j7xtm.chzsa", statistics, i, chzsaTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn);
getMap("j7xtm.chzsa", statistics, i, chzsaTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn,joinSql);
}
if (jnsp74tmPageRequestDto.isChzsb()) {
getMap("j7xtm.chzsb", statistics, i, chzsbTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn);
getMap("j7xtm.chzsb", statistics, i, chzsbTableHeaders, months, jnsp74tmPageRequestDto,contentMap,orderColumn,joinSql);
}
dataList.add(contentMap);
......@@ -385,8 +555,8 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
/**
* 获取处理好的数据
* **/
private void getMap(String dynamicColumn, String statistics, int i, List<Jnsp7xtmTableHeaderDto> oneTable, String months, Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, HashMap<String, Object> contentMap,String orderColumn) {
List<Map<String, Object>> maps = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto, months, 1, 10, "2", dynamicColumn, statistics,orderColumn);
private void getMap(String dynamicColumn, String statistics, int i, List<Jnsp7xtmTableHeaderDto> oneTable, String months, Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, HashMap<String, Object> contentMap,String orderColumn, String joinSql) {
List<Map<String, Object>> maps = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto, months, 1, 10, "2", dynamicColumn, statistics,orderColumn,joinSql);
for (int j = 0; j < oneTable.size(); j++) {
for (Map.Entry<String, Object> objectEntry :maps.get(i).entrySet()) {
if (objectEntry.getKey().equals(oneTable.get(j).getOldKey())) {
......@@ -409,29 +579,52 @@ public class Jnsp7xtmServiceImpl extends ServiceImpl<Jnsp7xtmRepository, Jnsp7xt
fixedTable.put("jypn","jypn");
fixedTable.put("jlpm","jlpm");
fixedTable.put("xslj","xslj");
fixedTable.put("cust_io","custIo");
fixedTable.put("cust_g0","custG0");
List<Jnsp7xtmTableHeaderDto> list = new ArrayList<>();
// 维度一
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(),"");
}
Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto();
oneTableHeader.setName(fixedTable.get(jnsp74tmPageRequestDto.getOneDimensionality()));
oneTableHeader.setKey(jnsp74tmPageRequestDto.getOneDimensionality());
oneTableHeader.setOldKey(jnsp74tmPageRequestDto.getOneDimensionality());
oneTableHeader.setName(fixedTable.get(originalOneDime));
oneTableHeader.setKey(originalOneDime);
oneTableHeader.setOldKey(originalOneDime);
list.add(oneTableHeader);
}
// 维度二
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(),"");
}
Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto();
oneTableHeader.setName(fixedTable.get(jnsp74tmPageRequestDto.getTwoDimensionality()));
oneTableHeader.setKey(jnsp74tmPageRequestDto.getTwoDimensionality());
oneTableHeader.setOldKey(jnsp74tmPageRequestDto.getTwoDimensionality());
oneTableHeader.setName(fixedTable.get(originalTwoDime));
oneTableHeader.setKey(originalTwoDime);
oneTableHeader.setOldKey(originalTwoDime);
list.add(oneTableHeader);
}
// 维度三
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
String originalThreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalThreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalThreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(),"");
}
Jnsp7xtmTableHeaderDto oneTableHeader = new Jnsp7xtmTableHeaderDto();
oneTableHeader.setName(fixedTable.get(jnsp74tmPageRequestDto.getThreeDimensionality()));
oneTableHeader.setKey(jnsp74tmPageRequestDto.getThreeDimensionality());
oneTableHeader.setOldKey(jnsp74tmPageRequestDto.getThreeDimensionality());
oneTableHeader.setName(fixedTable.get(originalThreeDime));
oneTableHeader.setKey(originalThreeDime);
oneTableHeader.setOldKey(originalThreeDime);
list.add(oneTableHeader);
}
return list;
......
src/main/java/org/rcisoft/bus/jnsp7xtm/service/impl/Jnsp7xtmStatisticServiceImpl.java
View file @ 656b39f5
......@@ -4,8 +4,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.rcisoft.bus.jnsp7xtm.dao.Jnsp7xtmStatisticsRepository;
import org.rcisoft.bus.jnsp7xtm.dto.*;
import org.rcisoft.bus.jnsp7xtm.dto.Jnsp7xtmDto;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
import org.rcisoft.bus.jnsp7xtm.enums.ColTransitionEnum;
import org.rcisoft.bus.jnsp7xtm.service.Jnsp7xtmStatisticService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -88,50 +88,113 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
Jnsp7xtmPageListDto jnsp74tmPageListDto = new Jnsp7xtmPageListDto();
if (!StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality()) && !StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
jnsp74tmPageRequestDto.setOneDimensionality("khdm");
jnsp74tmPageRequestDto.setTwoDimensionality("khm");
jnsp74tmPageRequestDto.setOneDimensionality(ColTransitionEnum.JNSP7XTM.getCode() + "khdm");
jnsp74tmPageRequestDto.setTwoDimensionality(ColTransitionEnum.JNSP7XTM.getCode() + "khm");
}
// 获取统计列
String statistics = "";
// 获取排序列
String orderColumn = "";
// 获取关联表语句
List<String> joinSqlList = new ArrayList<>();
String joinSql = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
statistics = "j7xtm."+ jnsp74tmPageRequestDto.getOneDimensionality();
orderColumn = jnsp74tmPageRequestDto.getOneDimensionality();
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) {
statistics = statistics +","+ "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality();
orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getTwoDimensionality();
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
statistics = statistics +","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," + orderOneOneDimensionality;
} else {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getTwoDimensionality();
orderColumn = jnsp74tmPageRequestDto.getTwoDimensionality();
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
String statisticsOneOneDimensionality = "";
String orderOneOneDimensionality = "";
if (!"".equals(statistics)) {
statistics = statistics + ","+ "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality();
orderColumn = orderColumn + "," + jnsp74tmPageRequestDto.getThreeDimensionality();
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
statistics = statistics + ","+ statisticsOneOneDimensionality;
orderColumn = orderColumn + "," +orderOneOneDimensionality;
} else {
statistics = "j7xtm." + jnsp74tmPageRequestDto.getThreeDimensionality();
orderColumn = jnsp74tmPageRequestDto.getThreeDimensionality();
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),ColTransitionEnum.JNSP7XTM.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(),"");
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
statisticsOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), ColTransitionEnum.CUSTOMER.getValue());
orderOneOneDimensionality = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
statistics = statisticsOneOneDimensionality;
orderColumn = orderOneOneDimensionality;
}
}
if (!joinSqlList.isEmpty()) {
joinSql = joinSqlList.stream().distinct().collect(Collectors.joining(" "));
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getKhdm())) {
jnsp74tmPageRequestDto.setVagueKhdm("");
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getKhm())) {
jnsp74tmPageRequestDto.setVaguekhm("");
}
List<Map<String, Object>> maps = jnsp74tmStatisticsRepository.queryStatisticsCount(jnsp74tmPageRequestDto, months,statistics,orderColumn);
List<Map<String, Object>> maps = jnsp74tmStatisticsRepository.queryStatisticsCount(jnsp74tmPageRequestDto, months,statistics,orderColumn,joinSql);
jnsp74tmPageListDto.setTotal(maps.size());
// 获取list
List<Jnsp7xtmPageDto> list = getList(jnsp74tmPageRequestDto, months, monthsList,statistics,orderColumn);
List<Jnsp7xtmPageDto> list = getList(jnsp74tmPageRequestDto, months, monthsList,statistics,orderColumn,joinSql);
jnsp74tmPageListDto.setUserDtoList(list);
return jnsp74tmPageListDto;
}
......@@ -158,6 +221,30 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
// 设置空Jnsp74tm
Jnsp7xtmDto jnsp74TmDto = getEmptyJnsp74xmDto(jnsp74tmPageRequestDto);
// 根据条件查询数据每个年份对应的合计值
// 获取关联表语句
List<String> joinSqlList = new ArrayList<>();
String joinSql = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionalityValue())) {
if (jnsp74tmPageRequestDto.getTwoDimensionalityValue().contains(ColTransitionEnum.CUSTOMER.getCode())) {
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionalityValue())) {
if (jnsp74tmPageRequestDto.getThreeDimensionalityValue().contains(ColTransitionEnum.CUSTOMER.getCode())) {
joinSqlList.add("left join b_customer cust on cust.cust_code = j7xtm.khdm and cust.del_flag = '0'");
}
}
if (!joinSqlList.isEmpty()) {
joinSql = joinSqlList.stream().distinct().collect(Collectors.joining(" "));
}
jnsp74tmPageRequestDto.setJoinSql(joinSql);
List<Jnsp7xtmDto> jnsp74TmDtoList = jnsp74tmStatisticsRepository.queryTotal(jnsp74tmPageRequestDto);
if (!jnsp74TmDtoList.isEmpty()) {
// 过滤出没有对应合计值年份
......@@ -180,7 +267,7 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
// 获取统计的list
private List<Jnsp7xtmPageDto> getList(Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, String months, List<String> monthsList, String statistics,String orderColumn) {
private List<Jnsp7xtmPageDto> getList(Jnsp7xtmPageRequestDto jnsp74tmPageRequestDto, String months, List<String> monthsList, String statistics,String orderColumn,String joinSql) {
// 初始化 listrmb 和 listxsjg 的值
List<Map<String,Object>> listrmb = null;
List<Map<String,Object>> listxsjg = null;
......@@ -195,22 +282,22 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
Integer pageSize = jnsp74tmPageRequestDto.getPageSize();
boolean[] flag = new boolean[]{jnsp74tmPageRequestDto.isXsjg(), jnsp74tmPageRequestDto.isRmb(), jnsp74tmPageRequestDto.isChzs(), jnsp74tmPageRequestDto.isChzsa(), jnsp74tmPageRequestDto.isChzsb(), jnsp74tmPageRequestDto.isZzc(), jnsp74tmPageRequestDto.isZzcg()};
if (jnsp74tmPageRequestDto.isXsjg())
listxsjg = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.xsjg",statistics,orderColumn);
listxsjg = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.xsjg",statistics,orderColumn,joinSql);
if (jnsp74tmPageRequestDto.isRmb())
listrmb = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.rmb",statistics,orderColumn);
listrmb = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.rmb",statistics,orderColumn,joinSql);
if (jnsp74tmPageRequestDto.isChzs())
listChzs = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.chzsa+j7xtm.chzsb",statistics,orderColumn);
listChzs = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.chzsa+j7xtm.chzsb",statistics,orderColumn,joinSql);
if (jnsp74tmPageRequestDto.isChzsa())
listChzsA = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.chzsa",statistics,orderColumn);
listChzsA = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.chzsa",statistics,orderColumn,joinSql);
if (jnsp74tmPageRequestDto.isChzsb())
listChzsB = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.chzsb",statistics,orderColumn);
listChzsB = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.chzsb",statistics,orderColumn,joinSql);
if (jnsp74tmPageRequestDto.isZzc())
listzzc = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.zzc",statistics,orderColumn);
listzzc = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.zzc",statistics,orderColumn,joinSql);
if (jnsp74tmPageRequestDto.isZzcg())
listzzcg = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.zzcg",statistics,orderColumn);
listzzcg = jnsp74tmStatisticsRepository.queryList(jnsp74tmPageRequestDto,months,pageNo,pageSize,"1","j7xtm.zzcg",statistics,orderColumn,joinSql);
//获取对应关系
Map<String, Jnsp7xtmPageDto> map = new HashMap();
//创建填充数据
......@@ -296,26 +383,49 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
String dimensionalityThree = "";
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getOneDimensionality())) {
if (listMap.containsKey(jnsp74tmPageRequestDto.getOneDimensionality())) {
key = key + listMap.get(jnsp74tmPageRequestDto.getOneDimensionality()) + "::";
dimensionalityOne = (String) listMap.get(jnsp74tmPageRequestDto.getOneDimensionality());
listMap.remove(jnsp74tmPageRequestDto.getOneDimensionality());
String originalOneDime = "";
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getOneDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())){
originalOneDime = jnsp74tmPageRequestDto.getOneDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
if (listMap.containsKey(originalOneDime)) {
key = key + listMap.get(originalOneDime) + "::";
dimensionalityOne = (String) listMap.get(originalOneDime);
listMap.remove(originalOneDime);
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getTwoDimensionality())) {
if (listMap.containsKey(jnsp74tmPageRequestDto.getTwoDimensionality())) {
key = key + listMap.get(jnsp74tmPageRequestDto.getTwoDimensionality()) + "::";
dimensionalityTwo = (String) listMap.get(jnsp74tmPageRequestDto.getTwoDimensionality());
listMap.remove(jnsp74tmPageRequestDto.getTwoDimensionality());
String originalTwoDime = "";
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getTwoDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalTwoDime = jnsp74tmPageRequestDto.getTwoDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
if (listMap.containsKey(originalTwoDime)) {
key = key + listMap.get(originalTwoDime) + "::";
dimensionalityTwo = (String) listMap.get(originalTwoDime);
listMap.remove(originalTwoDime);
}
}
if (StringUtils.isNotBlank(jnsp74tmPageRequestDto.getThreeDimensionality())) {
if (listMap.containsKey(jnsp74tmPageRequestDto.getThreeDimensionality())) {
key = key + listMap.get(jnsp74tmPageRequestDto.getThreeDimensionality()) + "::";
dimensionalityThree = (String) listMap.get(jnsp74tmPageRequestDto.getThreeDimensionality());
listMap.remove(jnsp74tmPageRequestDto.getThreeDimensionality());
String originalthreeDime = "";
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.JNSP7XTM.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.JNSP7XTM.getCode(), "");
}
if (jnsp74tmPageRequestDto.getThreeDimensionality().contains(ColTransitionEnum.CUSTOMER.getCode())) {
originalthreeDime = jnsp74tmPageRequestDto.getThreeDimensionality().replace(ColTransitionEnum.CUSTOMER.getCode(), "");
}
if (listMap.containsKey(originalthreeDime)) {
key = key + listMap.get(originalthreeDime) + "::";
dimensionalityThree = (String) listMap.get(originalthreeDime);
listMap.remove(originalthreeDime);
}
}
/**
......@@ -423,4 +533,5 @@ public class Jnsp7xtmStatisticServiceImpl implements Jnsp7xtmStatisticService {
}
return jnsp74TmDto;
}
}
src/main/java/org/rcisoft/bus/jnsp7xtm/vo/Jnsp7xtmVo.java 0 → 100644
View file @ 656b39f5
package org.rcisoft.bus.jnsp7xtm.vo;
import lombok.Data;
import org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm;
/**
* @Author: gy
* @Date: 2024/5/14 13:43
* @Description:
*/
@Data
public class Jnsp7xtmVo extends Jnsp7xtm {
/**
* sypn
* **/
private String sypn;
/**
* @desc
* @column cust_code
* @default
*/
private String custCode;
/**
* @desc
* @column cust_name
* @default
*/
private String custName;
/**
* @desc
* @column cust_group
* @default
*/
private String custGroup;
/**
* @desc
* @column cust_group2
* @default
*/
private String custGroup2;
/**
* @desc
* @column cust_rt1
* @default
*/
private String custRt1;
/**
* @desc
* @column cust_io
* @default
*/
private String custIo;
/**
* @desc
* @column cust_newpic
* @default
*/
private String custNewpic;
/**
* @desc
* @column cust_group1
* @default
*/
private String custGroup1;
/**
* @desc
* @column cust_rt2
* @default
*/
private String custRt2;
/**
* @desc
* @column cust_rout
* @default
*/
private String custRout;
/**
* @desc
* @column cust_addr
* @default
*/
private String custAddr;
/**
* @desc
* @column cust_g0
* @default
*/
private String custG0;
/**
* @desc
* @column cust_g20
* @default
*/
private String custG20;
/**
* @desc
* @column cust_g30
* @default
*/
private String custG30;
/**
* @desc
* @column cust_g201
* @default
*/
private String custG201;
/**
* @desc
* @column cust_save
* @default
*/
private String custSave;
/**
* @desc
* @column cust_stype
* @default
*/
private String custStype;
/**
* @desc
* @column cust_g1
* @default
*/
private String custG1;
/**
* @desc
* @column cust_yj
* @default
*/
private String custYj;
/**
* @desc
* @column cust_yj2
* @default
*/
private String custYj2;
/**
* @desc
* @column cust_yj3
* @default
*/
private String custYj3;
/**
* @desc
* @column cust_gc
* @default
*/
private String custGc;
}
src/main/java/org/rcisoft/util/ExportToExcelUtil.java
View file @ 656b39f5
......@@ -136,10 +136,11 @@ public class ExportToExcelUtil extends CyEpExcelUtil {
// 导出动态列
/**
* entityList 表头
* dataList 数据集合
* **/
**/
public static void exportExcel(HttpServletResponse response, List<ExcelExportEntity> entityList, List<Map<String, Object>> dataList) {
// 1、创建一个Workbook（XSSFWorkbook）
Workbook workbook = new XSSFWorkbook();
......@@ -150,7 +151,7 @@ public class ExportToExcelUtil extends CyEpExcelUtil {
exportParams.setType(ExcelType.XSSF);
ExcelExportService service = new ExcelExportService();
service.createSheetForMap(workbook, exportParams, entityList, dataList);
downLoadExcel("导出统计",response,workbook);
downLoadExcel("导出统计", response, workbook);
}
......@@ -161,7 +162,6 @@ public class ExportToExcelUtil extends CyEpExcelUtil {
if (format[1].equals("xlsx")) {
exportParams.setType(ExcelType.XSSF);
}
defaultExport(list, pojoClass, fileName, response, exportParams);
}
......@@ -193,8 +193,6 @@ public class ExportToExcelUtil extends CyEpExcelUtil {
} catch (IOException var11) {
log.info("context:" + var11);
}
}
}
}
src/main/resources/mapper/bus/jnP7sj/mapper/jnP7sjRepository.xml
View file @ 656b39f5
......@@ -18,18 +18,104 @@
<result column="po" jdbcType="DECIMAL" property="po"/>
<result column="fc" jdbcType="DECIMAL" property="fc"/>
<result column="qty" jdbcType="DECIMAL" property="qty"/>
<result column="up" jdbcType="DECIMAL" property="up"/>
<result column="currency" jdbcType="VARCHAR" property="currency"/>
<result column="rate" jdbcType="DECIMAL" property="rate"/>
<result column="amt" jdbcType="DECIMAL" property="amt"/>
<result column="cust_group" jdbcType="VARCHAR" property="custGroup"/>
<result column="cust_group2" jdbcType="VARCHAR" property="custGroup2"/>
<result column="cust_rt1" jdbcType="VARCHAR" property="custRt1"/>
<result column="cust_io" jdbcType="VARCHAR" property="custIo"/>
<result column="cust_newpic" jdbcType="VARCHAR" property="custNewpic"/>
<result column="cust_group1" jdbcType="VARCHAR" property="custGroup1"/>
<result column="cust_rt2" jdbcType="VARCHAR" property="custRt2"/>
<result column="cust_rout" jdbcType="VARCHAR" property="custRout"/>
<result column="cust_addr" jdbcType="VARCHAR" property="custAddr"/>
<result column="cust_g0" jdbcType="VARCHAR" property="custG0"/>
<result column="cust_g20" jdbcType="VARCHAR" property="custG20"/>
<result column="cust_g30" jdbcType="VARCHAR" property="custG30"/>
<result column="cust_g201" jdbcType="VARCHAR" property="custG201"/>
<result column="cust_save" jdbcType="VARCHAR" property="custSave"/>
<result column="cust_stype" jdbcType="VARCHAR" property="custStype"/>
<result column="cust_g1" jdbcType="VARCHAR" property="custG1"/>
<result column="cust_yj" jdbcType="VARCHAR" property="custYj"/>
<result column="cust_yj2" jdbcType="VARCHAR" property="custYj2"/>
<result column="cust_yj3" jdbcType="VARCHAR" property="custYj3"/>
<result column="cust_gc" jdbcType="VARCHAR" property="custGc"/>
<result column="sypn" jdbcType="VARCHAR" property="sypn"/>
<result column="flag" jdbcType="NCHAR" property="flag"/>
<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
<result column="remarks" jdbcType="VARCHAR" property="remarks"/>
<result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
</resultMap>
<resultMap id="Jnsp7xtmVoResultMap" type="org.rcisoft.bus.jnsp7xtm.vo.Jnsp7xtmVo">
<result column="zd" property="zd"/>
<result column="nqy" property="nqy"/>
<result column="ddh" property="ddh"/>
<result column="khdm" property="khdm"/>
<result column="khm" property="khm"/>
<result column="khqf" property="khqf"/>
<result column="mksqf" property="mksqf"/>
<result column="jlpm" property="jlpm"/>
<result column="xslj" property="xslj"/>
<result column="pn" property="pn"/>
<result column="fzdm" property="fzdm"/>
<result column="jypn" property="jypn"/>
<result column="bz" property="bz"/>
<result column="xsjg" property="xsjg"/>
<result column="fnq" property="fnq"/>
<result column="szzt" property="szzt"/>
<result column="zzc" property="zzc"/>
<result column="zzcg" property="zzcg"/>
<result column="rmb" property="rmb"/>
<result column="chzsa" property="chzsa"/>
<result column="chzsb" property="chzsb"/>
<result column="ddjsr" property="ddjsr"/>
<result column="ddzdnq" property="ddzdnq"/>
<result column="yydd" property="yydd"/>
<result column="L24" property="ltw"/>
<result column="pn" jdbcType="VARCHAR" property="pn"/>
<result column="sypn" jdbcType="VARCHAR" property="sypn"/>
<result column="cust_code" jdbcType="VARCHAR" property="custCode"/>
<result column="cust_name" jdbcType="VARCHAR" property="custName"/>
<result column="cust_group" jdbcType="VARCHAR" property="custGroup"/>
<result column="cust_group2" jdbcType="VARCHAR" property="custGroup2"/>
<result column="cust_rt1" jdbcType="VARCHAR" property="custRt1"/>
<result column="cust_io" jdbcType="VARCHAR" property="custIo"/>
<result column="cust_newpic" jdbcType="VARCHAR" property="custNewpic"/>
<result column="cust_group1" jdbcType="VARCHAR" property="custGroup1"/>
<result column="cust_rt2" jdbcType="VARCHAR" property="custRt2"/>
<result column="cust_rout" jdbcType="VARCHAR" property="custRout"/>
<result column="cust_addr" jdbcType="VARCHAR" property="custAddr"/>
<result column="cust_g0" jdbcType="VARCHAR" property="custG0"/>
<result column="cust_g20" jdbcType="VARCHAR" property="custG20"/>
<result column="cust_g30" jdbcType="VARCHAR" property="custG30"/>
<result column="cust_g201" jdbcType="VARCHAR" property="custG201"/>
<result column="cust_save" jdbcType="VARCHAR" property="custSave"/>
<result column="cust_stype" jdbcType="VARCHAR" property="custStype"/>
<result column="cust_g1" jdbcType="VARCHAR" property="custG1"/>
<result column="cust_yj" jdbcType="VARCHAR" property="custYj"/>
<result column="cust_yj2" jdbcType="VARCHAR" property="custYj2"/>
<result column="cust_yj3" jdbcType="VARCHAR" property="custYj3"/>
<result column="cust_gc" jdbcType="VARCHAR" property="custGc"/>
</resultMap>
<insert id="batchAddjnP7sj" parameterType="java.util.List">
INSERT into jnsp7xtm_dqsj(term,half,quarter,month,cc,cn,io,route,pc,factory,size,pn,po,fc,qty) values
INSERT into jnsp7xtm_dqsj(term,half,quarter,month,cc,cn,io,route,pc,factory,size,pn,po,fc,qty,up,currency,rate,amt,cust_group,cust_group2,cust_rt1,cust_io,cust_newpic,cust_group1,cust_rt2,cust_rout,cust_addr,cust_g0,cust_g20,cust_g30,cust_g201,cust_save,cust_stype,cust_g1,cust_yj,cust_yj2,cust_yj3,cust_gc,sypn,flag,create_date,update_date,remarks,del_flag) values
<foreach collection="list" item="item" separator=",">
(#{item.term}, #{item.half},#{item.quarter},#{item.month},#{item.cc},#{item.cn},#{item.io},#{item.route},#{item.pc},#{item.factory},#{item.size},#{item.pn},#{item.po},#{item.fc},#{item.qty})
(#{item.term}, #{item.half},#{item.quarter},#{item.month},#{item.cc},#{item.cn},#{item.io},#{item.route},#{item.pc},#{item.factory},#{item.size},#{item.pn},#{item.po},#{item.fc},#{item.qty},#{item.up},#{item.currency},#{item.rate},#{item.amt},#{item.custGroup},#{item.custGroup2},#{item.custRt1},#{item.custIo},#{item.custNewpic},#{item.custGroup1},#{item.custRt2},#{item.custRout},#{item.custAddr},#{item.custG0},#{item.custG20},#{item.custG30},#{item.custG201},#{item.custSave},#{item.custStype},#{item.custG1},#{item.custYj},#{item.custYj2},#{item.custYj3},#{item.custGc},#{item.sypn},#{item.flag},#{item.createDate},#{item.updateDate},#{item.remarks},#{item.delFlag})
</foreach>
</insert>
<select id="queryjnP7sj" resultMap="BaseResultMap">
select * from jnsp7xtm_dqsj
where 1=1
where del_flag = '0'
<if test="entity.term !=null and entity.term != '' ">
and term = #{entity.term}
</if>
......@@ -78,12 +164,84 @@
<if test="entity.qty !=null and entity.qty != '' ">
and qty = #{entity.qty}
</if>
<if test="entity.up !=null and entity.up != '' ">
and up = #{entity.up}
</if>
<if test="entity.currency !=null and entity.currency != '' ">
and currency like concat('%',#{entity.currency},'%')
</if>
<if test="entity.rate !=null and entity.rate != '' ">
and rate = #{entity.rate}
</if>
<if test="entity.amt !=null and entity.amt != '' ">
and amt = #{entity.amt}
</if>
<if test="entity.custGroup !=null and entity.custGroup != '' ">
and cust_group like concat('%',#{entity.custGroup},'%')
</if>
<if test="entity.custGroup2 !=null and entity.custGroup2 != '' ">
and cust_group2 like concat('%',#{entity.custGroup2},'%')
</if>
<if test="entity.custRt1 !=null and entity.custRt1 != '' ">
and cust_rt1 like concat('%',#{entity.custRt1},'%')
</if>
<if test="entity.custIo !=null and entity.custIo != '' ">
and cust_io like concat('%',#{entity.custIo},'%')
</if>
<if test="entity.custNewpic !=null and entity.custNewpic != '' ">
and cust_newpic like concat('%',#{entity.custNewpic},'%')
</if>
<if test="entity.custGroup1 !=null and entity.custGroup1 != '' ">
and cust_group1 like concat('%',#{entity.custGroup1},'%')
</if>
<if test="entity.custRt2 !=null and entity.custRt2 != '' ">
and cust_rt2 like concat('%',#{entity.custRt2},'%')
</if>
<if test="entity.custRout !=null and entity.custRout != '' ">
and cust_rout like concat('%',#{entity.custRout},'%')
</if>
<if test="entity.custAddr !=null and entity.custAddr != '' ">
and cust_addr like concat('%',#{entity.custAddr},'%')
</if>
<if test="entity.custG0 !=null and entity.custG0 != '' ">
and cust_g0 like concat('%',#{entity.custG0},'%')
</if>
<if test="entity.custG20 !=null and entity.custG20 != '' ">
and cust_g20 like concat('%',#{entity.custG20},'%')
</if>
<if test="entity.custG30 !=null and entity.custG30 != '' ">
and cust_g30 like concat('%',#{entity.custG30},'%')
</if>
<if test="entity.custG201 !=null and entity.custG201 != '' ">
and cust_g201 like concat('%',#{entity.custG201},'%')
</if>
<if test="entity.custSave !=null and entity.custSave != '' ">
and cust_save like concat('%',#{entity.custSave},'%')
</if>
<if test="entity.custStype !=null and entity.custStype != '' ">
and cust_stype like concat('%',#{entity.custStype},'%')
</if>
<if test="entity.custG1 !=null and entity.custG1 != '' ">
and cust_g1 like concat('%',#{entity.custG1},'%')
</if>
<if test="entity.custYj !=null and entity.custYj != '' ">
and cust_yj like concat('%',#{entity.custYj},'%')
</if>
<if test="entity.custYj2 !=null and entity.custYj2 != '' ">
and cust_yj2 like concat('%',#{entity.custYj2},'%')
</if>
<if test="entity.custYj3 !=null and entity.custYj3 != '' ">
and cust_yj3 like concat('%',#{entity.custYj3},'%')
</if>
<if test="entity.custGc !=null and entity.custGc != '' ">
and cust_gc like concat('%',#{entity.custGc},'%')
</if>
ORDER BY business_id DESC
</select>
<select id="queryjnP7sjPaged" resultMap="BaseResultMap">
select * from jnsp7xtm_dqsj
where 1=1
where del_flag = '0'
<if test="entity.term !=null and entity.term != '' ">
and term like concat('%',#{entity.term},'%')
</if>
......@@ -132,11 +290,82 @@
<if test="entity.qty !=null and entity.qty != '' ">
and qty = #{entity.qty}
</if>
<if test="entity.up !=null and entity.up != '' ">
and up = #{entity.up}
</if>
<if test="entity.currency !=null and entity.currency != '' ">
and currency like concat('%',#{entity.currency},'%')
</if>
<if test="entity.rate !=null and entity.rate != '' ">
and rate = #{entity.rate}
</if>
<if test="entity.amt !=null and entity.amt != '' ">
and amt = #{entity.amt}
</if>
<if test="entity.custGroup !=null and entity.custGroup != '' ">
and cust_group like concat('%',#{entity.custGroup},'%')
</if>
<if test="entity.custGroup2 !=null and entity.custGroup2 != '' ">
and cust_group2 like concat('%',#{entity.custGroup2},'%')
</if>
<if test="entity.custRt1 !=null and entity.custRt1 != '' ">
and cust_rt1 like concat('%',#{entity.custRt1},'%')
</if>
<if test="entity.custIo !=null and entity.custIo != '' ">
and cust_io like concat('%',#{entity.custIo},'%')
</if>
<if test="entity.custNewpic !=null and entity.custNewpic != '' ">
and cust_newpic like concat('%',#{entity.custNewpic},'%')
</if>
<if test="entity.custGroup1 !=null and entity.custGroup1 != '' ">
and cust_group1 like concat('%',#{entity.custGroup1},'%')
</if>
<if test="entity.custRt2 !=null and entity.custRt2 != '' ">
and cust_rt2 like concat('%',#{entity.custRt2},'%')
</if>
<if test="entity.custRout !=null and entity.custRout != '' ">
and cust_rout like concat('%',#{entity.custRout},'%')
</if>
<if test="entity.custAddr !=null and entity.custAddr != '' ">
and cust_addr like concat('%',#{entity.custAddr},'%')
</if>
<if test="entity.custG0 !=null and entity.custG0 != '' ">
and cust_g0 like concat('%',#{entity.custG0},'%')
</if>
<if test="entity.custG20 !=null and entity.custG20 != '' ">
and cust_g20 like concat('%',#{entity.custG20},'%')
</if>
<if test="entity.custG30 !=null and entity.custG30 != '' ">
and cust_g30 like concat('%',#{entity.custG30},'%')
</if>
<if test="entity.custG201 !=null and entity.custG201 != '' ">
and cust_g201 like concat('%',#{entity.custG201},'%')
</if>
<if test="entity.custSave !=null and entity.custSave != '' ">
and cust_save like concat('%',#{entity.custSave},'%')
</if>
<if test="entity.custStype !=null and entity.custStype != '' ">
and cust_stype like concat('%',#{entity.custStype},'%')
</if>
<if test="entity.custG1 !=null and entity.custG1 != '' ">
and cust_g1 like concat('%',#{entity.custG1},'%')
</if>
<if test="entity.custYj !=null and entity.custYj != '' ">
and cust_yj like concat('%',#{entity.custYj},'%')
</if>
<if test="entity.custYj2 !=null and entity.custYj2 != '' ">
and cust_yj2 like concat('%',#{entity.custYj2},'%')
</if>
<if test="entity.custYj3 !=null and entity.custYj3 != '' ">
and cust_yj3 like concat('%',#{entity.custYj3},'%')
</if>
<if test="entity.custGc !=null and entity.custGc != '' ">
and cust_gc like concat('%',#{entity.custGc},'%')
</if>
ORDER BY business_id DESC
</select>
<select id="getMonthList" resultMap="BaseResultMap">
<select id="getMonthList" resultType="java.lang.String">
SELECT
DISTINCT month
FROM
......@@ -181,4 +410,52 @@
del_flag = '0'
and pn = #{pn}
</select>
<select id="streamQuery" resultMap="Jnsp7xtmVoResultMap" fetchSize="1000">
SELECT
jnsp.*,
cust.cust_code,
cust.cust_name,
cust.cust_group,
cust.cust_group2,
cust.cust_rt1,
cust.cust_io,
cust.cust_newpic,
cust.cust_group1,
cust.cust_rt2,
cust.cust_rout,
cust.cust_addr,
cust.cust_g0,
cust.cust_g20,
cust.cust_g30,
cust.cust_g201,
cust.cust_save,
cust.cust_stype,
cust.cust_g1,
cust.cust_yj,
cust.cust_yj2,
cust.cust_yj3,
cust.cust_gc,
bps.pn,
bps.sypn
FROM
jnsp7xtm jnsp left JOIN b_customer cust on jnsp.khdm = cust.cust_code and cust.del_flag = '0'
left join b_pn_sypn bps on bps.pn = jnsp.pn and bps.del_flag = '0'
where
jnsp.khdm is not null
and jnsp.pn is not null
ORDER BY jnsp.khdm
OFFSET (#{entity.page} - 1) * #{entity.rows} ROWS
FETCH NEXT #{entity.rows} ROWS ONLY
</select>
<select id="queryTotaljnP7sj" resultType="java.lang.Integer">
SELECT
count(*)
FROM
jnsp7xtm jnsp left JOIN b_customer cust on jnsp.khdm = cust.cust_code and cust.del_flag = '0'
left join b_pn_sypn bps on bps.pn = jnsp.pn and bps.del_flag = '0'
where
jnsp.khdm is not null
and jnsp.pn is not null
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment