字段调整

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

@@ -171,7 +171,8 @@ public class TbXwZbfzxyr extends BaseModel {
     private String yshrgx; // 与受害人关系0：非亲属 1：亲属
     private String daztdmStr; //到案状态代码
     //抓获日期
-    private String zhrq_str;
+    private String zhrqstr;
+
     //发现犯罪嫌疑人主键编号
     private String fxfzxyrId;
 

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

@@ -744,7 +744,7 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
         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')  zhrq_str
+        to_char(xyr.ZHRQ,'yyyy-mm-dd')  zhrqstr
         FROM tb_st_asj asj left  join tb_xw_zbfzxyr xyr on xyr.asjbh=asj.asjbh
         where asj.xxsc_pdbz='0' and xyr.xxsc_pdbz='0'
         <if test="larqQssj!=null and larqQssj!=''"><!--时间不为空 根据立案日期选择查询-->
@@ -851,10 +851,10 @@ from tb_st_asj asj where asj.xxsc_pdbz='0'
         </if>
 
         <if test="type!=null and type!='' and type == 'xxma'.toString()"><!--现行命案-->
-            and asj.ajlbdm in ('04000100') and asj.zatz_jyqk in (
+            and (asj.ajlbdm in ('04000100') or asj.zatz_jyqk in (
               '040003000100','040001000100','040001000200','040001000201','040001000202','040001000299','040001000300','040001000400','040001000500'
               ,'040001000600' ,'040001009900'
-                  )
+                  )  )
         </if>
         <if test="type!=null and type!='' and type == 'sqaj'.toString()"><!--涉枪案件-->
             and   asj.ajlbdm in (

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

@@ -340,10 +340,10 @@ public class AjtjServiceImpl implements AjtjService {
 
 	@Override
 	public List<AjtjResult> getXxmaFapafyuest(AjtjParam ajtjParam) {
-		String ajlbsql=" and asj.ajlbdm in ('04000100') and asj.zatz_jyqk in (\n" +
+		String ajlbsql=" and (asj.ajlbdm in ('04000100') or asj.zatz_jyqk in (\n" +
 			"        '040003000100','040001000100','040001000200','040001000201','040001000202','040001000299','040001000300','040001000400','040001000500'\n" +
 			"    ,'040001000600' ,'040001009900'   \n" +
-			"        ) ";
+			"        ) ) ";
 		ajtjParam.setAjlbsql(ajlbsql);
 		setDwxx(ajtjParam);
 		List<AjtjResult> faans = ajtjMapper.getGmrsqlFapafyuest(ajtjParam);
@@ -395,10 +395,10 @@ public class AjtjServiceImpl implements AjtjService {
 
 	@Override
 	public List<AjtjResult> getXxmaPayuest(AjtjParam ajtjParam) {
-		String ajlbsql=" and asj.ajlbdm in ('04000100') and asj.zatz_jyqk in (\n" +
+		String ajlbsql=" and (asj.ajlbdm in ('04000100') or asj.zatz_jyqk in (\n" +
 			"        '040003000100','040001000100','040001000200','040001000201','040001000202','040001000299','040001000300','040001000400','040001000500'\n" +
 			"    ,'040001000600' ,'040001009900'   \n" +
-			"        ) ";
+			"        ) ) ";
 		ajtjParam.setAjlbsql(ajlbsql);
 		setDwxx(ajtjParam);
 		List<AjtjResult> poans = ajtjMapper.getGmrsqlPayuest(ajtjParam);
@@ -904,10 +904,10 @@ public class AjtjServiceImpl implements AjtjService {
 		jntj.setType("jn");
 		LianTj qntj = new LianTj();
 		qntj.setType("qn");
-		String ajlbsql=" and asj.ajlbdm in ('04000100') and asj.zatz_jyqk in (\n" +
+		String ajlbsql=" and ( asj.ajlbdm in ('04000100') or asj.zatz_jyqk in (\n" +
 			"        '040003000100','040001000100','040001000200','040001000201','040001000202','040001000299','040001000300','040001000400','040001000500'\n" +
 			"    ,'040001000600' ,'040001009900'   \n" +
-			"        ) ";
+			"        )  ) ";
 		ajtjParam.setAjlbsql(ajlbsql);
 		setDwxx(ajtjParam);
 		Integer lian = ajtjMapper.getGmrsqlFaCount(ajtjParam);