西藏主题研判提交(西藏)

service/publicapi/src/main/java/com/founder/publicapi/controller/KshService/KshSlServiceController.java

@@ -953,7 +953,7 @@ public class KshSlServiceController {
             }
         } else if (type.equals("04")) {
             try {
-                //手机号能够了查到身份证号还有车牌号
+                //手机号能够了查到身份证号
                 Query queryPhone = new Query();
                 queryPhone.addCriteria(Criteria.where("cote").is(value));
                 //设置分页
@@ -965,13 +965,6 @@ public class KshSlServiceController {
                         mobilereg.setFitm(getISODateStr(mobilereg.getFitm()));
                         mobilereg.setLatm(getISODateStr(mobilereg.getLatm()));
                         mobilereg.setImtm(getISODateStr(mobilereg.getImtm()));
-                    }
-                }
-                if (mobileregList != null && mobileregList.size() > 0) {
-                    for (Mobilereg mobilereg : mobileregList) {
-                        mobilereg.setFitm(getISODateStr(mobilereg.getFitm()));
-                        mobilereg.setLatm(getISODateStr(mobilereg.getLatm()));
-                        mobilereg.setImtm(getISODateStr(mobilereg.getImtm()));
                             HnTbStRygxDTO node = node(mobilereg.getCecoS(), mobilereg.getCecoS(), "idcard", null, null);
                             nodes.add(node);
                             sumup.add(mobilereg.getCecoS());

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ZtypMapper.java

@@ -12,9 +12,6 @@ import java.util.Map;
 @Mapper
 @Component
 public interface ZtypMapper{
-
-    ZpajxxEntity getZpAsjBshxx(String asjbh);
-
     String getZpAsjbzxx(String asjbh);
 
     List<ZpajxxEntity> getZpajxx(ZpajxxModel model);

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZtypMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.founder.publicapi.mapper.mysqlMapper.ZtypMapper">
-    <select id="getZpAsjBshxx" parameterType="java.lang.String"
-            resultType="com.founder.commonutils.model.newPublicEntity.ztypEntity.ZpajxxEntity">
-        select
-        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '01' then h.ASJXGFWBZH_FWBZH end) mobile,
-        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '04' then h.ASJXGFWBZH_FWBZH end) yhkh,
-        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '13' then h.ASJXGFWBZH_FWBZH end) wx,
-        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '16' then h.ASJXGFWBZH_FWBZH end) personid
-        from tb_xw_asjxgfwbzh h
-        where h.asjbh = #{ asjbh,jdbcType= VARCHAR }
-    </select>
     <select id="getZpAsjbzxx" parameterType="java.lang.String"
             resultType="java.lang.String">
         select
@@ -22,9 +12,14 @@
             resultType="com.founder.commonutils.model.newPublicEntity.ztypEntity.ZpajxxEntity">
         select a.asjbh asjbh,
         a.ajmc ajmc,
-        (select name from sys_dictitem where groupid = 'CODE_AJXZ' and code = a.ZATZ_JYQK) zatzJyqk
-        from tb_st_asj a
-        where a.AJLBDM = '05000300'
+        (select name from sys_dictitem where groupid = 'CODE_AJXZ' and code = a.ZATZ_JYQK) zatzJyqk,
+        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '01' then h.ASJXGFWBZH_FWBZH end) mobile,
+        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '04' then h.ASJXGFWBZH_FWBZH end) yhkh,
+        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '13' then h.ASJXGFWBZH_FWBZH end) wx,
+        group_concat(case ASJXGFWBZH_FWBZH_FWBZHLBDM when '16' then h.ASJXGFWBZH_FWBZH end) personid
+        from tb_st_asj a ,tb_xw_asjxgfwbzh h
+        where a.asjbh = h.asjbh
+        and a.AJLBDM = '05000300'
         and a.ZATZ_JYQK not like '0500030002%'
         and a.XXSC_PDBZ = 0
         <if test="asjbh != null and asjbh != '' ">
@@ -33,14 +28,16 @@
         <if test="ajmc != null and ajmc != '' ">
             and a.ajmc like concat('%', #{ajmc} ,'%')
         </if>
+        group by a.asjbh, a.ajmc, a.ZATZ_JYQK
         limit #{page}, #{limit}
     </select>
 
     <select id="getZpajxxTotal" parameterType="com.founder.commonutils.model.newPublicEntity.ztypEntity.ZpajxxModel"
             resultType="java.lang.Integer">
-        select count(*)
-        from tb_st_asj a
-        where a.AJLBDM = '05000300' and a.ZATZ_JYQK not like '0500030002%' and a.XXSC_PDBZ = 0
+        select count(distinct a.asjbh)
+        from tb_st_asj a ,tb_xw_asjxgfwbzh h
+        where a.asjbh = h.asjbh
+        and a.AJLBDM = '05000300' and a.ZATZ_JYQK not like '0500030002%' and a.XXSC_PDBZ = 0
         <if test="asjbh != null and asjbh != '' ">
             and a.asjbh like concat('%', #{asjbh} ,'%')
         </if>

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ZtypServiceImpl.java

@@ -38,38 +38,11 @@ public class ZtypServiceImpl implements ZtypService {
 
     @Override
     public List<ZpajxxEntity> getZpajxx(ZpajxxModel model) {
-
         // 取出分页的案件信息
         List<ZpajxxEntity> getZpajxx = ztypMapper.getZpajxx(model);
         getZpajxx.stream().forEach(p->{
             String ajxlb = ztypMapper.getZpAsjbzxx(p.getAsjbh());
-            if(null!=ajxlb){
             p.setAjxlb(ajxlb);
-            }
-            ZpajxxEntity zpajxxEntity = ztypMapper.getZpAsjBshxx(p.getAsjbh());
-            if(null!=zpajxxEntity){
-                String mobile = zpajxxEntity.getMobile();
-                String yhkh = zpajxxEntity.getYhkh();
-                String wx = zpajxxEntity.getWx();
-                String personid = zpajxxEntity.getPersonid();
-                if(null != mobile){
-                    p.setMobile(mobile);
-
-                }
-                if(null != yhkh){
-                    p.setYhkh(yhkh);
-
-                }
-                if(null != wx){
-                    p.setWx(wx);
-
-                }
-                if(null != personid){
-                    p.setPersonid(personid);
-
-                }
-            }
-
         });
         return getZpajxx;
     }