1 固定表头第一步

src/main/java/org/rcisoft/bus/jnsp7xtm/dao/Jnsp7xtmStatisticsRepository.java

@@ -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;
 
-import lombok.Getter;
-
-@Getter
 public enum ColTransitionEnum {
 
 
-    JNSP7XTM("jnsp_","j7xtm.");
+    JNSP7XTM("jnsp_", "j7xtm."),
 
-    ColTransitionEnum(String code, String value){
-      this.value = value;
+
+    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;
     }
-    private String value, code;
 }

src/main/resources/mapper/bus/jnsp7xtm/mapper/Jnsp7xtmRepository.xml

@@ -29,8 +29,12 @@
         <result column="L24" property="ltw"/>
     </resultMap>
     <select id="queryJnsp74tmByPaged" resultMap="BaseResultMap">
-        SELECT J7xtm.*
+        SELECT
+               J7xtm.*
         FROM Jnsp7xtm J7xtm
+        <if test="entity.joinSql != null and entity.joinSql != ''">
+            ${entity.joinSql}
+        </if>
         WHERE
         1=1
         <if test='entity.clickOneDimensionality and entity.type == "1"'>
@@ -115,6 +119,9 @@
         count(*)
         FROM
         Jnsp7xtm J7xtm
+        <if test="entity.joinSql != null and entity.joinSql != ''">
+            ${entity.joinSql}
+        </if>
         WHERE
         1=1
         <if test='entity.clickOneDimensionality and entity.type == "1"'>
@@ -196,6 +203,9 @@
     <select id="queryFindAllList" resultType="org.rcisoft.bus.jnsp7xtm.entity.Jnsp7xtm">
         SELECT J7xtm.*
         FROM Jnsp7xtm J7xtm
+        <if test="entity.joinSql != null and entity.joinSql != ''">
+            ${entity.joinSql}
+        </if>
         WHERE
         1=1
         <if test='entity.clickOneDimensionality and entity.type == "1"'>

src/main/resources/mapper/bus/jnsp7xtm/mapper/Jnsp7xtmStatisticsRepository.xml

@@ -99,6 +99,9 @@
                 j7xtm.nqy,
                 count(*) AS total
             FROM Jnsp7xtm j7xtm
+            <if test="joinSql != null and joinSql != ''">
+                ${joinSql}
+            </if>
             WHERE 1=1
         <if test="entity.nqy != null and entity.nqy!= ''">
             and j7xtm.nqy in
@@ -186,6 +189,9 @@
                 j7xtm.nqy ,
                 SUM(${computedColumn}) AS total
         FROM Jnsp7xtm j7xtm
+        <if test="joinSql != null and joinSql !=''">
+            ${joinSql}
+        </if>
             WHERE 1=1
         <if test="entity.nqy != null and entity.nqy!= ''">
             and j7xtm.nqy in
@@ -193,10 +199,10 @@
                 #{item}
             </foreach>
         </if>
-        <if test="entity.vagueKhdm != null and entity.vagueKhdm != null">
+        <if test="entity.vagueKhdm != null and entity.vagueKhdm != ''">
             and j7xtm.khdm like concat('%',#{entity.vagueKhdm },'%')
         </if>
-        <if test="entity.vaguekhm != null and entity.vaguekhm != null">
+        <if test="entity.vaguekhm != null and entity.vaguekhm != ''">
             and j7xtm.khm like concat('%',#{entity.vaguekhm },'%')
         </if>
         <if test="entity.jlpm != null and entity.jlpm != '' ">
@@ -298,6 +304,9 @@
         </if>
         FROM
         Jnsp7xtm J7xtm
+        <if test="entity.joinSql != null and entity.joinSql != ''">
+            ${entity.joinSql}
+        </if>
         WHERE
         1 = 1
         <if test="entity.nqy != null and entity.nqy!= ''">
@@ -306,10 +315,10 @@
                 #{item}
             </foreach>
         </if>
-        <if test="entity.vagueKhdm != null and entity.vagueKhdm != null">
+        <if test="entity.vagueKhdm != null and entity.vagueKhdm != ''">
             and J7xtm.khdm like concat('%',#{entity.vagueKhdm },'%')
         </if>
-        <if test="entity.vaguekhm != null and entity.vaguekhm != null">
+        <if test="entity.vaguekhm != null and entity.vaguekhm != ''">
             and J7xtm.khm like concat('%',#{entity.vaguekhm },'%')
         </if>
         <if test="entity.jlpm != null and entity.jlpm != '' ">