透视修改，添加条件查询

src/main/java/org/springblade/founder/tjfx/entity/DwTjParam.java

@@ -18,6 +18,7 @@ public class DwTjParam {
 	private int limit;
 	private int end;
 	private int begin;
-
+	private String larqQssj;
+	private String larqJssj;
 	private List<String> lbs;
 }

src/main/java/org/springblade/founder/tjfx/mapper/WcnrfzShrTjMapper.xml

@@ -162,7 +162,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -202,7 +207,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -243,7 +253,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -290,7 +305,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -363,7 +383,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -419,7 +444,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -469,7 +499,12 @@
         <if test="jssj != null and jssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>
@@ -511,7 +546,12 @@
         <if test="jssj != null and jssj != ''">
             AND asj.ASJFSSJ_ASJFSKSSJ <![CDATA[<]]> to_date(#{jssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
         </if>
-
+        <if test="larqQssj != null and larqQssj != ''">
+            AND ASJ.LARQ <![CDATA[>=]]> to_date(#{larqQssj, jdbcType=VARCHAR},'yyyy-mm-dd')
+        </if>
+        <if test="larqJssj != null and larqJssj != ''">
+            AND ASJ.LARQ <![CDATA[<]]> to_date(#{larqJssj, jdbcType=VARCHAR},'yyyy-mm-dd ') +1
+        </if>
         <if test="ajzt != null and ajzt != '' and ajzt == '1'.toString() ">
             and ASJ.ZCJDDM = '0400'
         </if>

src/main/java/org/springblade/founder/tjfx/service/impl/WcnrfzShrTjServiceImpl.java

@@ -41,8 +41,8 @@ public class WcnrfzShrTjServiceImpl implements WcnrfzShrTjService {
 		String ajzt=dwTjParam.getAjzt();
 		String ajlbdm=dwTjParam.getAjlbdm();
 		String xlajlbdm=dwTjParam.getXlajlbdm();
-
-
+		String larqQssj=dwTjParam.getLarqQssj();
+		String larqJssj=dwTjParam.getLarqJssj();
 
 
 		if (StringUtils.isEmpty(unitcode)) {
@@ -70,6 +70,9 @@ public class WcnrfzShrTjServiceImpl implements WcnrfzShrTjService {
 		paramMap.put("ajzt", ajzt);
 		paramMap.put("ajlbdm", ajlbdm);
 		paramMap.put("xlajlbdm", xlajlbdm);
+		paramMap.put("larqQssj", larqQssj);
+		paramMap.put("larqJssj", larqJssj);
+
 		dwLevMap.put("includeBdw","true");
 		List<DictitemXz> unitList = dwTjfxMapper.getXqdwList(dwLevMap);