统计报表

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

@@ -512,5 +512,5 @@ public class TbXwZbfzxyr extends BaseModel {
     //抓获犯罪嫌疑人发现时间
     private Date zhfzxyrFxsj;
 
-
+	private String fznl;
 }

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

@@ -272,7 +272,7 @@
             </foreach>
 
         </if>
-        order by asj.larq desc
+        order by asj.ASJFSSJ_ASJFSKSSJ desc
         <include refid="pagination-tail" />
 
     </select>
@@ -336,10 +336,11 @@
         xyr.ASJBH,
         (select name from sys_dictitem d where d.groupid = 'CODE_DAZT' and
         xyr.ZHFZXYR_FZXYRDAZTDM=d.code) zhfzxyrFzxyrdaztdm,
-        to_char(xyr.ZHRQ,'yyyy-mm-dd')  zhrqstr
+        to_char(xyr.ZHRQ,'yyyy-mm-dd')  zhrqstr,
+        trunc(months_between(asj.ASJFSSJ_ASJFSKSSJ,xyr.ZHFZXYR_CSRQ_RQGZXX) /12) fznl
         from tb_xw_zbfzxyr xyr left join tb_st_asj ASJ on xyr.asjbh = ASJ.asjbh
         where asj.xxsc_pdbz='0' and xyr.xxsc_pdbz='0'
-        and trunc(months_between(asj.ASJFSSJ_ASJFSKSSJ,xyr.ZHFZXYR_CSRQ_RQGZXX) /12)<![CDATA[<]]>18  and xyr.asjbh= asj.asjbh)  >0 )
+        and trunc(months_between(asj.ASJFSSJ_ASJFSKSSJ,xyr.ZHFZXYR_CSRQ_RQGZXX) /12)<![CDATA[<]]>18
         <if test="kssj != null and kssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]> to_date(#{kssj, jdbcType=VARCHAR},'yyyy-mm-dd')
         </if>
@@ -399,7 +400,7 @@
         to_char(xyr.ZHRQ,'yyyy-mm-dd')  zhrqstr
         from tb_xw_zbfzxyr xyr left join tb_st_asj ASJ on xyr.asjbh = ASJ.asjbh
         where asj.xxsc_pdbz='0' and xyr.xxsc_pdbz='0'
-        and trunc(months_between(asj.ASJFSSJ_ASJFSKSSJ,xyr.ZHFZXYR_CSRQ_RQGZXX) /12)<![CDATA[<]]>18  and xyr.asjbh= asj.asjbh)  >0 )
+        and trunc(months_between(asj.ASJFSSJ_ASJFSKSSJ,xyr.ZHFZXYR_CSRQ_RQGZXX) /12)<![CDATA[<]]>18
         <if test="kssj != null and kssj != ''">
             AND ASJ.ASJFSSJ_ASJFSKSSJ <![CDATA[>=]]> to_date(#{kssj, jdbcType=VARCHAR},'yyyy-mm-dd')
         </if>

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

@@ -166,7 +166,7 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
 		}
 		System.out.println(unitcode);
 		dwTjParam.setUnitcode(unitcode);
-		dwTjParam.setQryType("bxq");
+//		dwTjParam.setQryType("bxq");
 		List<String> lbs=new ArrayList<>();
 		List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
 		lbs.add(dwTjParam.getAjlbdm());
@@ -218,7 +218,7 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
 		}
 		System.out.println(unitcode);
 		dwTjParam.setUnitcode(unitcode);
-		dwTjParam.setQryType("bxq");
+//		dwTjParam.setQryType("bxq");
 		List<String> lbs=new ArrayList<>();
 		List<DictitemXz> unitList = ajlbSysDictMapper.getAjlbByCode(dwTjParam.getAjlbdm());
 		lbs.add(dwTjParam.getAjlbdm());
@@ -265,7 +265,7 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
 		Map<String, Object> rtMap = new HashMap<>();
 		Map<String, Object> paramMap=new HashMap<>();
 		List<DwXnpgTj> dataList = new ArrayList<>();
-		List<DwXnpgTj> res = new ArrayList<>();
+		List<DictitemXz> res = new ArrayList<>();
 		String unitcode=dwTjParam.getUnitcode();
 		String kssj=dwTjParam.getKssj();
 		String jssj=dwTjParam.getJssj();
@@ -336,10 +336,11 @@ public class AjlbSysDictServiceImpl implements AjlbSysDictService {
 
 
 
+		res = unitList.stream().sorted(Comparator.comparing(DictitemXz::getRys).reversed())
+			.collect(Collectors.toList());
 
 
-
-		rtMap.put("rows",unitList);
+		rtMap.put("rows",res);
 		return rtMap;
 	}
 

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

@@ -163,9 +163,10 @@ public class WcnrfzTjServiceImpl implements WcnrfzTjService {
 		if(StringUtils.isBlank(dwTjParam.getUnitcode())){
 			rtMap.put("rows",new ArrayList<>());
 			return rtMap;
-		}else {
-			dwTjParam.setQryType("bxq");
 		}
+//		else {
+//			dwTjParam.setQryType("bxq");
+//		}
 
 		List<AjtjResult> dalist =wcnrfzTjMapper.getAjlbTj(dwTjParam);
 		rtMap.put("rows",dalist);
@@ -177,9 +178,10 @@ public class WcnrfzTjServiceImpl implements WcnrfzTjService {
 		if(StringUtils.isBlank(dwTjParam.getUnitcode())){
 			rtMap.put("rows",new ArrayList<>());
 			return rtMap;
-		}else {
-			dwTjParam.setQryType("bxq");
 		}
+//		else {
+//			dwTjParam.setQryType("bxq");
+//		}
 
 		List<AjtjResult> dalist =wcnrfzTjMapper.getAjlbrysTj(dwTjParam);
 		rtMap.put("rows",dalist);