提请逮捕统计暂时注释

src/main/java/org/springblade/founder/tjfx/controller/AjTjController.java

@@ -203,7 +203,7 @@ public class AjTjController {
 			return R.error(e.getMessage());
 		}
 	}
-	@PostMapping("/getAjZarsyuest")
+	@PostMapping("/getAjPbrsyuest")
 	@ApiOperation(value = "各月份作案人数分月走势图", notes = "各月份立破案分月走势图")
 	public R getAjZarsyuest(AjtjParam ajtjParam){
 		try {
@@ -214,10 +214,11 @@ public class AjTjController {
 			return R.error(e.getMessage());
 		}
 	}
-	@PostMapping("/getAjPbrsyuest")
+	@PostMapping("/getAjZarsyuest")
 	@ApiOperation(value = "各月份提请批捕人数分月走势图", notes = "各月份提请批捕人数分月走势图")
 	public R getAjPbrsyuest(AjtjParam ajtjParam){
 		try {
+			//暂时先计算抓捕犯罪嫌疑人为作案人数，提请审批为0
 			List<AjtjResult> result = ajtjService.getAjPbrsyuest(ajtjParam);
 			return R.ok().data("result",result);
 		} catch (Exception e) {

src/main/java/org/springblade/founder/tjfx/controller/TjfxController.java

@@ -106,7 +106,7 @@ public class TjfxController {
 	public R getQdpafyuest(AjtjParam ajtjParam) {
 		try {
 			ajtjService.setDwxx(ajtjParam);
-			return tjfxService.getPafyuest(ajtjParam,"ww");
+			return tjfxService.getPafyuest(ajtjParam,"qd");
 		} catch (Exception e) {
 			e.printStackTrace();
 			return R.error(e.getMessage());
@@ -125,7 +125,7 @@ public class TjfxController {
 		try {
 
 			ajtjService.setDwxx(ajtjParam);
-			List<LianTj> result = tjfxService.getPaqk(ajtjParam,"ww");
+			List<LianTj> result = tjfxService.getPaqk(ajtjParam,"qd");
 			return R.ok().data("result", result);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -132,7 +132,7 @@
         ) then 1 else 0 end) ]]> as dqcount,
     <![CDATA[ sum( case when asj.ajlbdm in (
         '05000300'
-        ) and asj.zatz_jyqk !='050003000200'  then 1 else 0 end)]]> as btzpcount,
+        ) and (asj.zatz_jyqk !='050003000200' or asj.zatz_jyqk is null )  then 1 else 0 end)]]> as btzpcount,
     <![CDATA[ sum(case when asj.ajlbdm in (
         '05000300'
 
@@ -178,7 +178,7 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
         ) then 1 else 0 end) ]]> as dqcount,
     <![CDATA[ sum( case when asj.ajlbdm in (
         '05000300'
-        ) and asj.zatz_jyqk !='050003000200'  then 1 else 0 end)]]> as btzpcount,
+        ) and (asj.zatz_jyqk !='050003000200' or asj.zatz_jyqk is null )  then 1 else 0 end)]]> as btzpcount,
     <![CDATA[ sum(case when asj.ajlbdm in (
         '05000300'
 
@@ -804,7 +804,7 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
         <if test="type!=null and type!='' and type == 'btzp'.toString()"><!--普通诈骗-->
             and asj.ajlbdm in (
             '05000300'
-            ) and asj.zatz_jyqk !='050003000200'
+            ) and (asj.zatz_jyqk !='050003000200' or asj.zatz_jyqk is null )
         </if>
         <if test="type!=null and type!='' and type == 'dxzp'.toString()"><!--电信诈骗-->
             and asj.ajlbdm in (

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

@@ -558,9 +558,9 @@ public class AjtjServiceImpl implements AjtjService {
 	@Override
 	public List<AjtjResult> getAjZarsyuest(AjtjParam ajtjParam) {
 
-		setDwxx(ajtjParam);
-		List<AjtjResult> poans = ajtjMapper.getAjZarsyuest(ajtjParam);
-		List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
+//		setDwxx(ajtjParam);
+//		List<AjtjResult> poans = ajtjMapper.getAjZarsyuest(ajtjParam);
+		List<AjtjResult> poan =NumberUtil.listToMap(null,ajtjParam);
 		try {
 			if (poan.size() >= 2) {
 				AjtjResult lastnum = poan.get(poan.size() - 1);
@@ -585,7 +585,8 @@ public class AjtjServiceImpl implements AjtjService {
 				String rq = lastnum.getMonthName();
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 				String qnrq = sdf.format(DateUtil.getDateBeforeToYear(sdf.parse(rq), 1));
-				Integer qnfa = ajtjMapper.getqnrqZarsCount(qnrq,ajtjParam.getUnitcodeList());
+//				Integer qnfa = ajtjMapper.getqnrqZarsCount(qnrq,ajtjParam.getUnitcodeList());
+				Integer qnfa =0;
 				//计算百分百
 				poan.get(poan.size() - 1).setTb("同比"+NumberUtil.getTbhb(lastfanum.intValue(),qnfa));
 //				if (qnfa > lastfanum) {
@@ -609,8 +610,8 @@ public class AjtjServiceImpl implements AjtjService {
 
 		setDwxx(ajtjParam);
 		//提请批捕暂时未知怎么计算先为0
-//		List<AjtjResult> poans = ajtjMapper.getAjPbrsyuest(ajtjParam);
-		List<AjtjResult> poan =NumberUtil.listToMap(null,ajtjParam);
+		List<AjtjResult> poans = ajtjMapper.getAjPbrsyuest(ajtjParam);
+		List<AjtjResult> poan =NumberUtil.listToMap(poans,ajtjParam);
 		try {
 			if (poan.size() >= 2) {
 				AjtjResult lastnum = poan.get(poan.size() - 1);