Skip to content

X
xzxt-qyxzpt-report
Commit c2eb9fc2 by liulianglang
Options

统计报表添加字段

parent caafdd21
Showing with 52 additions and 35 deletions
src/main/java/org/springblade/founder/tjfx/controller/DwTjfxController.java
......@@ -21,9 +21,10 @@ public class DwTjfxController {
@RequestParam(value = "kssj",defaultValue = "") String kssj,
@RequestParam(value = "jssj",defaultValue = "") String jssj,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "ajzt",defaultValue = "") String ajzt){
try {
Map<String, Object> rtMap = dwTjfxService.getDwTj(unitcode, kssj, jssj,ajzt,ajlbdm);
Map<String, Object> rtMap = dwTjfxService.getDwTj(unitcode, kssj, jssj,ajzt,ajlbdm,xlajlbdm);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -38,7 +39,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "limit", defaultValue = "0") int limit){
......@@ -48,7 +49,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getDwTjTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getDwTjTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -64,7 +65,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "limit", defaultValue = "0") int limit){
......@@ -74,7 +75,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getSswpslflTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getSswpslflTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -90,7 +91,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "limit", defaultValue = "0") int limit){
......@@ -100,7 +101,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getXyrhjTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getXyrhjTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -115,7 +116,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "limit", defaultValue = "0") int limit){
......@@ -125,7 +126,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getXyrNlTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getXyrNlTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -140,7 +141,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "limit", defaultValue = "0") int limit){
......@@ -150,7 +151,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getShrhjTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getShrhjTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -165,7 +166,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "limit", defaultValue = "0") int limit){
......@@ -175,7 +176,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getShrNlTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getShrNlTj(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -191,6 +192,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "xzqhdm",defaultValue = "") String xzqhdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
......@@ -201,7 +203,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getXyrHjorNlTjTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xzqhdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getXyrHjorNlTjTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,xzqhdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......@@ -217,6 +219,7 @@ public class DwTjfxController {
@RequestParam(value = "ajzt",defaultValue = "") String ajzt,
@RequestParam(value = "tjlb",defaultValue = "") String tjlb ,
@RequestParam(value = "ajlbdm",defaultValue = "") String ajlbdm ,
@RequestParam(value = "xlajlbdm",defaultValue = "") String xlajlbdm ,
@RequestParam(value = "xzqhdm",defaultValue = "") String xzqhdm ,
@RequestParam(value = "qryType",defaultValue = "") String qryType ,
@RequestParam(value = "page", defaultValue = "0") int page,
......@@ -227,7 +230,7 @@ public class DwTjfxController {
easyUIPage.setPageParaOracle(limit);
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
Map<String, Object> rtMap = dwTjfxService.getShrHjorNlTjTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xzqhdm,qryType,begin,end);
Map<String, Object> rtMap = dwTjfxService.getShrHjorNlTjTs(unitcode, kssj, jssj,ajzt,tjlb,ajlbdm,xlajlbdm,xzqhdm,qryType,begin,end);
return R.ok().data(rtMap);
} catch (Exception e) {
e.printStackTrace();
......
src/main/java/org/springblade/founder/tjfx/mapper/DwTjfxMapper.xml
......@@ -534,11 +534,17 @@
and ASJ.ZCJDDM = '0400'
</if>
<if test="ajzt != null and ajzt != '' and ajzt == '2'.toString() ">
and ASJ.ZCJDDM = '0600'
and asj.ZCJDDM in ('0600','0700','0800')
</if>
<if test="ajzt != null and ajzt != '' and ajzt == '3'.toString() ">
and asj.ZCJDDM in ('0100','0200','0300','0301','0302','0400','0500')
</if>
<if test="ajlbdm != null and ajlbdm != '' ">
and ASJ.ajlbdm = #{ajlbdm}
</if>
<if test="xlajlbdm != null and xlajlbdm != '' ">
and ASJ.zatz_jyqk = #{xlajlbdm}
</if>
<if test="qryType == 'bdw'">
and ASJ.LADW_GAJGJGDM = #{unitcode}
</if>
......
src/main/java/org/springblade/founder/tjfx/service/DwTjfxService.java
......@@ -3,24 +3,24 @@ package org.springblade.founder.tjfx.service;
import java.util.Map;
public interface DwTjfxService {
Map<String, Object> getDwTj(String unitcode, String kssj, String jssj,String ajzt,String ajlbdm);
Map<String, Object> getDwTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit);
Map<String, Object> getDwTj(String unitcode, String kssj, String jssj,String ajzt,String ajlbdm,String xlajlbdm);
Map<String, Object> getDwTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit);
Map<String, Object> getSswpslflTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit);
Map<String, Object> getSswpslflTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit);
Map<String, Object> getXyrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit);
Map<String, Object> getXyrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit);
Map<String, Object> getXyrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit);
Map<String, Object> getXyrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit);
Map<String, Object> getShrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit);
Map<String, Object> getShrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit);
Map<String, Object> getShrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit);
Map<String, Object> getShrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit);
Map<String, Object> getXyrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xzqhdm,String qryType,int page,int limit);
Map<String, Object> getShrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xzqhdm,String qryType,int page,int limit);
Map<String, Object> getXyrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String xzqhdm,String qryType,int page,int limit);
Map<String, Object> getShrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String xzqhdm,String qryType,int page,int limit);
}
src/main/java/org/springblade/founder/tjfx/service/impl/DwTjfxServiceImpl.java
......@@ -22,7 +22,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
private DwTjfxMapper dwTjfxMapper;
@Override
public Map<String, Object> getDwTj(String unitcode, String kssj, String jssj,String ajzt,String ajlbdm) {
public Map<String, Object> getDwTj(String unitcode, String kssj, String jssj,String ajzt,String ajlbdm,String xlajlbdm) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<DwXnpgTj> dataList = new ArrayList<>();
......@@ -43,7 +43,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("jssj", jssj);
paramMap.put("ajzt", ajzt);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
dwLevMap.put("includeBdw","true");
List<DictitemXz> unitList = dwTjfxMapper.getXqdwList(dwLevMap);
......@@ -131,7 +131,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getDwTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit) {
public Map<String, Object> getDwTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<TbStAsj> dataList = new ArrayList<>();
......@@ -148,6 +148,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
dataList=dwTjfxMapper.getDwTjTs(paramMap);
int count =dwTjfxMapper.getDwTjTsCount(paramMap);
......@@ -161,7 +162,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getSswpslflTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit) {
public Map<String, Object> getSswpslflTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<TbStAsj> dataList = new ArrayList<>();
......@@ -178,6 +179,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
Sswpfltj sswp =dwTjfxMapper.getSswpfltj(paramMap);
......@@ -189,7 +191,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getXyrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit) {
public Map<String, Object> getXyrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<AjtjResult> dataList = new ArrayList<>();
......@@ -206,6 +208,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
dataList =dwTjfxMapper.getXyrhjTj(paramMap);
......@@ -217,7 +220,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getXyrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit) {
public Map<String, Object> getXyrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<AjtjResult> dataList = new ArrayList<>();
......@@ -234,6 +237,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
XyrNltj nltj =dwTjfxMapper.getXyrNlTj(paramMap);
......@@ -244,7 +248,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
}
@Override
public Map<String, Object> getShrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit) {
public Map<String, Object> getShrhjTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<AjtjResult> dataList = new ArrayList<>();
......@@ -261,6 +265,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
dataList =dwTjfxMapper.getShrhjTj(paramMap);
......@@ -272,7 +277,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getShrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String qryType,int page,int limit) {
public Map<String, Object> getShrNlTj(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<AjtjResult> dataList = new ArrayList<>();
......@@ -289,6 +294,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
XyrNltj nltj =dwTjfxMapper.getShrNlTj(paramMap);
......@@ -300,7 +306,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getXyrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xzqhdm,String qryType,int page,int limit) {
public Map<String, Object> getXyrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String xzqhdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<AjtjResult> dataList = new ArrayList<>();
......@@ -317,6 +323,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
paramMap.put("xzqhdm", xzqhdm);
......@@ -332,7 +339,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
@Override
public Map<String, Object> getShrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xzqhdm,String qryType,int page,int limit) {
public Map<String, Object> getShrHjorNlTjTs(String unitcode, String kssj, String jssj,String ajzt,String tjlb,String ajlbdm,String xlajlbdm,String xzqhdm,String qryType,int page,int limit) {
Map<String, Object> rtMap = new HashMap<>();
Map<String, Object> paramMap=new HashMap<>();
List<AjtjResult> dataList = new ArrayList<>();
......@@ -349,6 +356,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("ajlbdm", ajlbdm);
paramMap.put("xlajlbdm", xlajlbdm);
paramMap.put("qryType", qryType);
paramMap.put("xzqhdm", xzqhdm);
......
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