Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.nacos.common.http.HttpUtils;
 import com.boman.common.core.utils.DateUtils;
+import com.boman.common.core.utils.IdUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.number.NumberUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -1065,7 +1066,7 @@ public class TaskService {
             accountingData.setId(mainKey);
             int result = mapper.selectById(mainKey);
             if (result == 0) {
-                accountingData.setId(mainKey);
+                accountingData.setId(IdUtils.simpleUUID());
                 mapper.insertAccountingData(accountingData);
             }
         }

boman-web-core/src/main/resources/mapper/AccountingDateMapper.xml

@@ -95,6 +95,7 @@
             and r.status = '1'
             <if test="zjhm != null  and zjhm != ''">and r.id_card = #{zjhm}</if>
             <if test="xm != null  and xm != ''">and r.user_name like concat(#{xm}, '%')</if>
+            <if test="lxdh != null  and lxdh != ''">and r.phone_num = #{lxdh}</if>
             <if test="params.startTime != null  and params.startTime != '' and params.startTime != 'null'">and
                 DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')
             </if>
@@ -139,6 +140,7 @@
         and cz.is_del = 'N'
         and cz.status = '1'
         <if test="zjhm != null  and zjhm != ''">and cz.id_card = #{zjhm}</if>
+        <if test="lxdh != null  and lxdh != ''">and cz.phone_num = #{lxdh}</if>
         <if test="xm != null  and xm != ''">and cz.user_name like concat(#{xm}, '%')</if>
         <if test="provinceId != null  and provinceId != ''">and cz.province_id = #{provinceId}</if>
         <if test="cityId != null  and cityId != ''">and cz.city_id = #{cityId}</if>
@@ -160,6 +162,7 @@
             r.is_del = 'N'
             and r.status = '1'
             <if test="zjhm != null  and zjhm != ''">and r.id_card = #{zjhm}</if>
+            <if test="lxdh != null  and lxdh != ''">and r.phone_num = #{lxdh}</if>
             <if test="xm != null  and xm != ''">and r.user_name like concat(#{xm}, '%')</if>
             <if test="params.startTime != null  and params.startTime != '' and params.startTime != 'null'">and
                 DATE_FORMAT(d.cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')
@@ -209,6 +212,7 @@
         and rz.is_del = 'N'
         and rz.status = '1'
         <if test="zjhm != null  and zjhm != ''">and rz.id_card = #{zjhm}</if>
+        <if test="lxdh != null  and lxdh != ''">and rz.phone_num = #{lxdh}</if>
         <if test="xm != null  and xm != ''">and rz.user_name like concat(#{xm}, '%')</if>
         <if test="provinceIdXjd != null and provinceIdXjd != ''">and zj.province_id = #{provinceIdXjd}</if>
         <if test="cityIdXjd != null and cityIdXjd != ''">and zj.city_id = #{cityIdXjd}</if>
@@ -460,36 +464,24 @@
         FROM accounting_data
     </select>
     <select id="thirdNucleicAcid" resultMap="AccountingDataResult">
-        select a.oid                 as main_key,
-               a.`name`              as xm,
-               a.id_card             as zjhm,
-               a.tel                 as lxdh,
-               a.collect_time        as cjsj,
-               c.dis_name_str        as cjssxq,
-               b.`name`              as cjdd,
-               a.verify_finish_time  as jcsj,
-               a.verify_result       as jcjg,
-               a.create_date         as create_date,
-               a.modify_date         as modify_date,
-               a.source              as source,
-               a.batch_number        as batch_number,
-               a.collector_name      as collector_name,
-               a.verify_point_name   as jcdd,
-               a.certificate_no_type as certificate_no_type,
-               a.focus_person        as focus_person,
-               a.from_city           as from_city,
-               a.to_city             as to_city,
-               a.address             as address,
-               a.transit             as transit
-        from t_sampling_822 a
-                 left join t_collect_verify_point b on a.collect_oid = b.oid
-                 left join t_sys_district c on b.district_oid = c.oid
-        where use_flag = 'Y'
-          and type = 'h'
-          and (c.dis_name_str like '%潜山%'
-            or left (a.id_card,6) in ('340824','340882'))
-          and (`a`.`collect_time` > #{startTime}
-            AND #{endTime} >= `a`.`collect_time`);
+        SELECT
+            sfzhm as zjhm
+             ,xm as xm
+             ,sjhm as lxdh
+             ,cjsj as cjsj
+             ,jgcjss as jcsj
+             ,jcdd as  jcdd
+             ,jcjg as jcjg
+             ,cjdd as cjdd
+             ,sjly as cjssxq
+        FROM
+            ods_qss_hsjcxx_all
+        WHERE
+            1 = 1
+          AND (
+                cjsj > #{startTime}
+                AND #{endTime} >= cjsj
+            )
     </select>
 
     <select id="tongjiHjZ" resultType="java.lang.Integer">