Commit 1e6dce08 by wangyang

海南侦查指令查询联络员不显示下级联络员bug修改,字典树bug修复

parent e18a5b17
......@@ -6,6 +6,7 @@ import com.founder.model.*;
import com.founder.seq.service.AnjianSeqService;
import com.founder.util.*;
import com.founder.zczl.service.IZczlService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
......@@ -1094,7 +1095,20 @@ public class ZczlController {
int end = easyUIPage.getEnd();
tbYwZczlLly.setBegin(begin);
tbYwZczlLly.setEnd(end);
String unitcode = tbYwZczlLly.getUnitcode();
if(StringUtils.isNotBlank(unitcode)){
if (unitcode.endsWith("0000000000")){
tbYwZczlLly.setUnitcode(unitcode.substring(0,2));
}else if(unitcode.endsWith("00000000")){
tbYwZczlLly.setUnitcode(unitcode.substring(0,4));
}else if(unitcode.endsWith("000000")){
tbYwZczlLly.setUnitcode(unitcode.substring(0,6));
}else if(unitcode.endsWith("0000")){
tbYwZczlLly.setUnitcode(unitcode.substring(0,8));
}else if(unitcode.endsWith("00")){
tbYwZczlLly.setUnitcode(unitcode.substring(0,10));
}
}
List<TbYwZczlLly> tbYwZczlLlyList = zczlService.toQueryAllLly(tbYwZczlLly);
Integer totalCount = 0;
totalCount = zczlService.toQueryAllLlyForTotal(tbYwZczlLly);
......
......@@ -702,7 +702,7 @@
(select name from sys_dictitem where groupid='CODE_UNIT' and code=XXDJDWGAJGJGDM) as xxdjdwgajgjgdm,
to_char(DJSJ,'yyyy-MM-dd hh24:mi:ss') as djsj
from TB_YW_ZCZL_LLY where 1=1 and XXSCPDBZ = '0'
<if test="unitcode!=null and unitcode!=''"> and UNITCODE = #{unitcode, jdbcType=VARCHAR}</if>
<if test="unitcode!=null and unitcode!=''"> and UNITCODE like #{unitcode, jdbcType=VARCHAR} ||'%'</if>
<if test="truename!=null and truename!=''"> and TRUENAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
order by UNITCODE
......@@ -713,7 +713,7 @@
<select id="toQueryAllLlyForTotal" parameterType="com.founder.model.TbYwZczlLly" resultType="java.lang.Integer">
select count(*) from TB_YW_ZCZL_LLY where 1=1 and XXSCPDBZ = '0'
<if test="unitcode!=null and unitcode!=''"> and UNITCODE = #{unitcode, jdbcType=VARCHAR}</if>
<if test="unitcode!=null and unitcode!=''"> and UNITCODE like #{unitcode, jdbcType=VARCHAR} ||'%'</if>
<if test="truename!=null and truename!=''"> and TRUENAME like '%'||#{truename, jdbcType=VARCHAR}||'%'</if>
<if test="policemanid!=null and policemanid!=''"> and POLICEMANID = #{policemanid, jdbcType=VARCHAR}</if>
</select>
......
......@@ -142,7 +142,7 @@
<td class="ar" width="13.3%">单位:</td>
<td width="20%">
<span class="textbox">
<input type="text" id="unitcode" name="unitcode" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_XZUNIT&startId=<%=unitcode %>',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<input type="text" id="unitcode" name="unitcode" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span>
</td>
<td class="ar" width="13.3%">姓名:</td>
......
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