Skip to content

B
bigdatainterservice
Commit 1c3cc395 by chentian
Options

区域碰撞和时空回溯是否本市统计修改

parent 2ca3cd87
Showing with 18 additions and 18 deletions
src/main/java/com/founder/interservice/regionalanalysis/service/impl/RegionalAnalysisServiceImpl.java
......@@ -308,11 +308,11 @@ public class RegionalAnalysisServiceImpl implements RegionalAnalysisService {
//本市非两种情况，本市，和非本市
vo.setSqlStr(" count(*) counts,'本市人员' names,1 vals ");
vo.setIsNullField(" (b.zjhm is not null and substr(b.zjhm,1,2)='50') ");
vo.setIsNullField(" (b.zjhm is not null) ");
vo.setGroupByField("");
list=regionalTaskResultDetailMapper.getFldhBzhCountList(vo);
vo.setSqlStr(" count(*) counts,'非本市人员' names,0 vals ");
vo.setIsNullField(" (b.zjhm is null or substr(b.zjhm,1,2)!='50') ");
vo.setIsNullField(" (b.zjhm is null ) ");
vo.setGroupByField("");
list.addAll(regionalTaskResultDetailMapper.getFldhBzhCountList(vo));
......
src/main/java/com/founder/interservice/spatiotemporalBackTrack/service/impl/SpatiotemporalBackTrackServiceImpl.java
......@@ -131,11 +131,11 @@ public class SpatiotemporalBackTrackServiceImpl implements SpatiotemporalBackTra
}else if("SFBS".equals(checkVal)){
//本市非两种情况，本市，和非本市
vo.setSqlStr(" count(*) counts,'本市人员' names,1 vals ");
vo.setIsNullField(" (b.zjhm is not null and substr(b.zjhm,1,2)='50') ");
vo.setIsNullField(" (b.zjhm is not null ) ");
vo.setGroupByField("");
list=sBTResultDetailMapper.getFldhBzhCountList(vo);
vo.setSqlStr(" count(*) counts,'非本市人员' names,0 vals ");
vo.setIsNullField(" (b.zjhm is null or substr(b.zjhm,1,2)!='50') ");
vo.setIsNullField(" (b.zjhm is null ) ");
vo.setGroupByField("");
list.addAll(sBTResultDetailMapper.getFldhBzhCountList(vo));
}else if("BZHLX".equals(checkVal)){
......
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml
......@@ -124,8 +124,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'>and (td.ZJHM is null ) </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
</select>
<select id="findRegionalTaskResultNewDetailList" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
......@@ -171,8 +171,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'>and (td.ZJHM is null ) </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
order by td.name desc nulls last,t.DJSJ desc
) t1
......@@ -214,8 +214,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'>and (td.ZJHM is null) </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
</select>
<!--多区域碰撞新表 end-->
......@@ -240,8 +240,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'> and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'> and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'> and (td.ZJHM is null ) </if>
<if test='sfbs =="1"'> and (td.ZJHM is not null ) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
<if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
</select>
......@@ -290,8 +290,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'> and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'> and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'> and (td.ZJHM is null ) </if>
<if test='sfbs =="1"'> and (td.ZJHM is not null ) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
<if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
order by t.COUNT desc
......
src/main/resources/mybatis/mapper/xzxt/SBTResultDetailMapper.xml
......@@ -213,8 +213,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'>and (td.ZJHM is null ) </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
</select>
......@@ -262,8 +262,8 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and (td.ZJHM is null or substr(td.zjhm,1,2)!='50') </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null and substr(td.zjhm,1,2)='50') </if>
<if test='sfbs =="0"'>and (td.ZJHM is null ) </if>
<if test='sfbs =="1"'>and (td.ZJHM is not null) </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
order by td.name desc nulls LAST,t.djsj desc
) t1
......
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