导入

src/main/java/org/rcisoft/bus/jnP7sj/controller/jnP7sjController.java

@@ -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

@@ -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

@@ -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/service/impl/jnP7sjServiceImpl.java

@@ -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

@@ -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

@@ -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

@@ -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

+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

+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

@@ -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

 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/vo/Jnsp7xtmVo.java

+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

@@ -31,7 +31,7 @@ import java.util.Map;
  * @Description: 动态列导出（非注解形式）
  */
 @Slf4j
-public class ExportToExcelUtil  extends CyEpExcelUtil {
+public class ExportToExcelUtil extends CyEpExcelUtil {
 
     public static <T> List<T> importExcelNotTitle(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass) {
         if (file == null) {
@@ -75,7 +75,7 @@ public class ExportToExcelUtil  extends CyEpExcelUtil {
             // 当总选项字节数大于 255 时创建隐藏工作表用于存放下拉选项
             // 创建sheet，写入枚举项
             //判断当前sheet不存在则创建
-            Sheet hideSheet  = workbook.getSheet("hiddenSheet");
+            Sheet hideSheet = workbook.getSheet("hiddenSheet");
             if (workbook.getSheet("hiddenSheet") == null) {
                 hideSheet = workbook.createSheet("hiddenSheet");
             }
@@ -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);
             }
-
         }
-
     }
 }