Commit 196afb83 by liulianglang

透视修改,添加条件查询

parent dc5d64ca
......@@ -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;
}
......@@ -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>
......
......@@ -172,22 +172,23 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
System.out.println(unitcode);
dwTjParam.setUnitcode(unitcode);
// dwTjParam.setQryType("bxq");
List<String> lbs=new ArrayList<>();
if(!StringUtils.isEmpty(dwTjParam.getAjlbdm())) {
List<String> lbs = new ArrayList<>();
List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
lbs.add(dwTjParam.getAjlbdm());
for(DictitemXz xz:unitList){
for (DictitemXz xz : unitList) {
if("yxj".equals(xz.getLev())){
if ("yxj".equals(xz.getLev())) {
List<DictitemXz> xjajlbs = ajlbSysDictMapper.getAjlbByCode(xz.getCode());
for(DictitemXz xjs:xjajlbs){
if("yxj".equals(xjs.getLev())){
for (DictitemXz xjs : xjajlbs) {
if ("yxj".equals(xjs.getLev())) {
List<DictitemXz> xxjajlbs = ajlbSysDictMapper.getAjlbByCode(xjs.getCode());
for(DictitemXz xxjs:xxjajlbs){
for (DictitemXz xxjs : xxjajlbs) {
lbs.add(xxjs.getCode());
}
lbs.add(xjs.getCode());
}else {
} else {
lbs.add(xjs.getCode());
}
......@@ -195,15 +196,15 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
}
lbs.add(xz.getCode());
}else{
} else {
lbs.add(xz.getCode());
}
}
dwTjParam.setLbs(lbs);
}
List<TbStAsj> dalist = wcnrfzTjMapper.getAjlbTjTs(dwTjParam);
int count =wcnrfzTjMapper.getAjlbTjTsCount(dwTjParam);
rtMap.put("rows",dalist);
......@@ -224,6 +225,7 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
System.out.println(unitcode);
dwTjParam.setUnitcode(unitcode);
// dwTjParam.setQryType("bxq");
if(!StringUtils.isEmpty(dwTjParam.getAjlbdm())){
List<String> lbs=new ArrayList<>();
List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
lbs.add(dwTjParam.getAjlbdm());
......@@ -256,6 +258,8 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
dwTjParam.setLbs(lbs);
}
List<TbStAsj> dalist = wcnrfzShrTjMapper.getAjlbTjTs(dwTjParam);
int count =wcnrfzShrTjMapper.getAjlbTjTsCount(dwTjParam);
rtMap.put("rows",dalist);
......@@ -329,22 +333,23 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
System.out.println(unitcode);
dwTjParam.setUnitcode(unitcode);
// dwTjParam.setQryType("bxq");
List<String> lbs=new ArrayList<>();
if(!StringUtils.isEmpty(dwTjParam.getAjlbdm())) {
List<String> lbs = new ArrayList<>();
List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
lbs.add(dwTjParam.getAjlbdm());
for(DictitemXz xz:unitList){
for (DictitemXz xz : unitList) {
if("yxj".equals(xz.getLev())){
if ("yxj".equals(xz.getLev())) {
List<DictitemXz> xjajlbs = ajlbSysDictMapper.getAjlbByCode(xz.getCode());
for(DictitemXz xjs:xjajlbs){
if("yxj".equals(xjs.getLev())){
for (DictitemXz xjs : xjajlbs) {
if ("yxj".equals(xjs.getLev())) {
List<DictitemXz> xxjajlbs = ajlbSysDictMapper.getAjlbByCode(xjs.getCode());
for(DictitemXz xxjs:xxjajlbs){
for (DictitemXz xxjs : xxjajlbs) {
lbs.add(xxjs.getCode());
}
lbs.add(xjs.getCode());
}else {
} else {
lbs.add(xjs.getCode());
}
......@@ -352,15 +357,15 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
}
lbs.add(xz.getCode());
}else{
} else {
lbs.add(xz.getCode());
}
}
dwTjParam.setLbs(lbs);
}
List<TbXwZbfzxyr> dalist = wcnrfzTjMapper.getRyTjTs(dwTjParam);
int count =wcnrfzTjMapper.getRyTjTsCount(dwTjParam);
rtMap.put("rows",dalist);
......@@ -381,22 +386,23 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
System.out.println(unitcode);
dwTjParam.setUnitcode(unitcode);
// dwTjParam.setQryType("bxq");
List<String> lbs=new ArrayList<>();
if(!StringUtils.isEmpty(dwTjParam.getAjlbdm())) {
List<String> lbs = new ArrayList<>();
List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
lbs.add(dwTjParam.getAjlbdm());
for(DictitemXz xz:unitList){
for (DictitemXz xz : unitList) {
if("yxj".equals(xz.getLev())){
if ("yxj".equals(xz.getLev())) {
List<DictitemXz> xjajlbs = ajlbSysDictMapper.getAjlbByCode(xz.getCode());
for(DictitemXz xjs:xjajlbs){
if("yxj".equals(xjs.getLev())){
for (DictitemXz xjs : xjajlbs) {
if ("yxj".equals(xjs.getLev())) {
List<DictitemXz> xxjajlbs = ajlbSysDictMapper.getAjlbByCode(xjs.getCode());
for(DictitemXz xxjs:xxjajlbs){
for (DictitemXz xxjs : xxjajlbs) {
lbs.add(xxjs.getCode());
}
lbs.add(xjs.getCode());
}else {
} else {
lbs.add(xjs.getCode());
}
......@@ -404,15 +410,15 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
}
lbs.add(xz.getCode());
}else{
} else {
lbs.add(xz.getCode());
}
}
dwTjParam.setLbs(lbs);
}
List<TbXwZbfzxyr> dalist = wcnrfzShrTjMapper.getRyTjTs(dwTjParam);
int count =wcnrfzShrTjMapper.getRyTjTsCount(dwTjParam);
rtMap.put("rows",dalist);
......@@ -432,22 +438,23 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
System.out.println(unitcode);
dwTjParam.setUnitcode(unitcode);
// dwTjParam.setQryType("bxq");
List<String> lbs=new ArrayList<>();
if(!StringUtils.isEmpty(dwTjParam.getAjlbdm())) {
List<String> lbs = new ArrayList<>();
List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
lbs.add(dwTjParam.getAjlbdm());
for(DictitemXz xz:unitList){
for (DictitemXz xz : unitList) {
if("yxj".equals(xz.getLev())){
if ("yxj".equals(xz.getLev())) {
List<DictitemXz> xjajlbs = ajlbSysDictMapper.getAjlbByCode(xz.getCode());
for(DictitemXz xjs:xjajlbs){
if("yxj".equals(xjs.getLev())){
for (DictitemXz xjs : xjajlbs) {
if ("yxj".equals(xjs.getLev())) {
List<DictitemXz> xxjajlbs = ajlbSysDictMapper.getAjlbByCode(xjs.getCode());
for(DictitemXz xxjs:xxjajlbs){
for (DictitemXz xxjs : xxjajlbs) {
lbs.add(xxjs.getCode());
}
lbs.add(xjs.getCode());
}else {
} else {
lbs.add(xjs.getCode());
}
......@@ -455,15 +462,15 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
}
lbs.add(xz.getCode());
}else{
} else {
lbs.add(xz.getCode());
}
}
dwTjParam.setLbs(lbs);
}
List<WcnrEntity> dalist = wcnrfzTjMapper.ExportRyTjTs(dwTjParam);
rtMap.put("rows",dalist);
......@@ -484,22 +491,23 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
System.out.println(unitcode);
dwTjParam.setUnitcode(unitcode);
// dwTjParam.setQryType("bxq");
List<String> lbs=new ArrayList<>();
if(!StringUtils.isEmpty(dwTjParam.getAjlbdm())) {
List<String> lbs = new ArrayList<>();
List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
lbs.add(dwTjParam.getAjlbdm());
for(DictitemXz xz:unitList){
for (DictitemXz xz : unitList) {
if("yxj".equals(xz.getLev())){
if ("yxj".equals(xz.getLev())) {
List<DictitemXz> xjajlbs = ajlbSysDictMapper.getAjlbByCode(xz.getCode());
for(DictitemXz xjs:xjajlbs){
if("yxj".equals(xjs.getLev())){
for (DictitemXz xjs : xjajlbs) {
if ("yxj".equals(xjs.getLev())) {
List<DictitemXz> xxjajlbs = ajlbSysDictMapper.getAjlbByCode(xjs.getCode());
for(DictitemXz xxjs:xxjajlbs){
for (DictitemXz xxjs : xxjajlbs) {
lbs.add(xxjs.getCode());
}
lbs.add(xjs.getCode());
}else {
} else {
lbs.add(xjs.getCode());
}
......@@ -507,15 +515,15 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
}
lbs.add(xz.getCode());
}else{
} else {
lbs.add(xz.getCode());
}
}
dwTjParam.setLbs(lbs);
}
List<WcnrEntity> dalist = wcnrfzShrTjMapper.ExportRyTjTs(dwTjParam);
rtMap.put("rows",dalist);
......
......@@ -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);
......
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