From 757f840d1dea8837d26e58cdc290183ac5f89d88 Mon Sep 17 00:00:00 2001
From: hcc <han_chen301@163.com>
Date: Fri, 12 Jul 2024 17:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=80=81=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/mapper/TbChryxxbMapper.java       | 43 +++++++++--
 .../mybatis/mapper/TbChryxxbMapper.xml        | 47 ++++++++++--
 .../mybatis/mapper/TbMdjfjxxxbMapper.xml      |  7 +-
 .../mybatis/mapper/TbXjxdzhxxbMapper.xml      |  7 +-
 .../manager/service/ITbChryxxbService.java    | 51 ++++++++++---
 .../manager/service/ITbMdjfjxxxbService.java  |  2 +
 .../java/basepro/manager/pojo/TbChryxxb.java  | 17 ++++-
 .../service/impl/TbChryxxbServiceImpl.java    | 71 ++++++++++++++++---
 .../service/impl/TbMdjfjxxxbServiceImpl.java  | 12 ++++
 .../manager/BaseProWebApplicationStarter.java |  2 +
 .../manager/controller/InsertChryTask.java    | 44 ++++++++++++
 .../controller/TbChryxxbController.java       | 29 ++++++--
 .../controller/TbMdjfjxxxbController.java     |  9 ++-
 .../main/resources/templates/chry/add.html    |  6 +-
 .../resources/templates/chry/chryxxb.html     | 12 ++--
 .../main/resources/templates/chry/edit.html   |  9 +--
 16 files changed, 312 insertions(+), 56 deletions(-)
 create mode 100644 basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java

diff --git a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java
index a510097..3dc4b5f 100644
--- a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java
+++ b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbChryxxbMapper.java
@@ -14,11 +14,18 @@ public interface TbChryxxbMapper
 {
     /**
      * 查询检查站查获人员信息
-     * 
-     * @param HCRYBH 检查站查获人员信息ID
+     *
+     * @param id 检查站查获人员信息ID
      * @return 检查站查获人员信息
      */
-    public TbChryxxb selectTbChryxxbById(String HCRYBH);
+    public TbChryxxb selectTbChryxxbById(Integer id);
+    /**
+     * 查询检查站查获人员信息
+     *
+     * @param HCRYBH 检查站查获人员信息编号
+     * @return 检查站查获人员信息
+     */
+    public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH);
 
     /**
      * 查询检查站查获人员信息列表
@@ -50,7 +57,7 @@ public interface TbChryxxbMapper
      * @param HCRYBH 检查站查获人员信息ID
      * @return 结果
      */
-    public int deleteTbChryxxbById(String HCRYBH);
+    public int deleteTbChryxxbByHcrybh(String HCRYBH);
 
     /**
      * 批量删除检查站查获人员信息
@@ -58,5 +65,31 @@ public interface TbChryxxbMapper
      * @param HCRYBHs 需要删除的数据ID
      * @return 结果
      */
-    public int deleteTbChryxxbByIds(String[] HCRYBHs);
+    public int deleteTbChryxxbByHcrybhs(String[] HCRYBHs);
+
+
+    /**
+     * 删除检查站查获人员信息
+     *
+     * @param id 检查站查获人员信息ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbById(Integer id);
+
+    /**
+     * 批量删除检查站查获人员信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbByIds(Integer[] ids);
+
+    /**
+     * 从人车物核查表及卡点表获取查货人员信息
+     *
+     * @param date 盘查日期
+     * @return 检查站查获人员信息集合
+     */
+    public List<TbChryxxb> selectTbChryxxbListFromTbCheckPerson(String date);
+
 }
diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml
index 29dba13..efd0026 100644
--- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml
+++ b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbChryxxbMapper.xml
@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="basepro.manager.mapper.TbChryxxbMapper">
     
     <resultMap type="basepro.manager.pojo.TbChryxxb" id="TbChryxxbResult">
+        <result property="id"    column="id"    />
         <result property="HCRYBH"    column="HCRYBH"    />
         <result property="XZQHDM"    column="XZQHDM"    />
         <result property="XZQHMC"    column="XZQHMC"    />
@@ -19,12 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTbChryxxbVo">
-        select HCRYBH, XZQHDM, XZQHMC, GAJGDM, GAJGMC, JCZDM, JCZMC, jcsj, DATE_FORMAT(jcsj, '%Y-%m-%d') AS jcsjStr, ZJHM, HCRYLB from tb_chryxxb
+        select id, HCRYBH, XZQHDM, XZQHMC, GAJGDM, GAJGMC, JCZDM, JCZMC, jcsj, DATE_FORMAT(jcsj, '%Y-%m-%d %H:%i:%s') AS jcsjStr, ZJHM, HCRYLB from tb_chryxxb
     </sql>
 
     <select id="selectTbChryxxbList" parameterType="basepro.manager.pojo.TbChryxxb" resultMap="TbChryxxbResult">
         <include refid="selectTbChryxxbVo"/>
-        <where>  
+        <where>
+            <if test="id != null  and id != 0"> and id = #{id}</if>
             <if test="XZQHDM != null  and XZQHDM != ''"> and XZQHDM = #{XZQHDM}</if>
             <if test="XZQHMC != null  and XZQHMC != ''"> and XZQHMC like concat('%',#{XZQHMC},'%')</if>
             <if test="GAJGDM != null  and GAJGDM != ''"> and GAJGDM = #{GAJGDM}</if>
@@ -42,10 +44,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectTbChryxxbById" parameterType="String" resultMap="TbChryxxbResult">
+    <select id="selectTbChryxxbByHcrybh" parameterType="String" resultMap="TbChryxxbResult">
         <include refid="selectTbChryxxbVo"/>
         where HCRYBH = #{HCRYBH}
     </select>
+
+
+    <select id="selectTbChryxxbListFromTbCheckPerson" parameterType="String" resultMap="TbChryxxbResult">
+        SELECT HCRYBH, XZQHDM, GAJGDM, GAJGMC, JCZDM, JCZMC, JCSJ, ZJHM,HCRYLB FROM (
+            SELECT t.sfz as ZJHM,LEFT(s.dept_id,4) as XZQHDM,
+                (CASE WHEN t.people_status = '3' THEN '1'
+                WHEN t.people_status = '7' THEN '2'
+                ELSE '3'
+                END)  as HCRYLB,t.check_time as JCSJ,t.police_id_card as HCRYBH,CONCAT('JCZ',LEFT(s.dept_id,6),(s.id+1000)) as JCZDM,
+                s.name as JCZMC,s.id,s.dept_id as GAJGDM,s.dept_name as GAJGMC FROM (
+                select p.sfz,p.people_status,p.check_time,p.police_id_card,p.point_x,p.point_y from `tb_check_person` p where p.point_x is not null and p.point_x != ''
+                and p.people_status != 0
+                and  DATE_FORMAT(p.check_time, '%Y-%m-%d') = DATE_FORMAT(#{date}, '%Y-%m-%d')
+                ) t  inner join `tb_stuck` s   on (s.point_x = t.point_x and s.point_y = t.point_y)
+        ) n order by n.JCSJ asc;
+    </select>
+
+    <select id="selectTbChryxxbById" parameterType="Integer" resultMap="TbChryxxbResult">
+        <include refid="selectTbChryxxbVo"/>
+        where id = #{id}
+    </select>
         
     <insert id="insertTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb"  useGeneratedKeys="true" keyProperty="HCRYBH">
         insert into tb_chryxxb
@@ -78,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTbChryxxb" parameterType="basepro.manager.pojo.TbChryxxb">
         update tb_chryxxb
         <trim prefix="SET" suffixOverrides=",">
+            <if test="HCRYBH != null  and HCRYBH != ''">HCRYBH = #{HCRYBH},</if>
             <if test="XZQHDM != null  and XZQHDM != ''">XZQHDM = #{XZQHDM},</if>
             <if test="XZQHMC != null  and XZQHMC != ''">XZQHMC = #{XZQHMC},</if>
             <if test="GAJGDM != null  and GAJGDM != ''">GAJGDM = #{GAJGDM},</if>
@@ -88,18 +112,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZJHM != null  and ZJHM != ''">ZJHM = #{ZJHM},</if>
             <if test="HCRYLB != null  and HCRYLB != ''">HCRYLB = #{HCRYLB},</if>
         </trim>
-        where HCRYBH = #{HCRYBH}
+        where id = #{id}
     </update>
 
-    <delete id="deleteTbChryxxbById" parameterType="String">
+    <delete id="deleteTbChryxxbByHcrybh" parameterType="String">
+        delete from tb_chryxxb where HCRYBH = #{HCRYBH}
+    </delete>
+    <delete id="deleteTbChryxxbById" parameterType="Integer">
         delete from tb_chryxxb where HCRYBH = #{HCRYBH}
     </delete>
 
-    <delete id="deleteTbChryxxbByIds" parameterType="String">
-        delete from tb_chryxxb where HCRYBH in 
+    <delete id="deleteTbChryxxbByHcrybhs" parameterType="String">
+        delete from tb_chryxxb where HCRYBH in
         <foreach item="HCRYBH" collection="array" open="(" separator="," close=")">
             #{HCRYBH}
         </foreach>
     </delete>
+    <delete id="deleteTbChryxxbByIds" parameterType="Integer">
+        delete from tb_chryxxb where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
     
 </mapper>
\ No newline at end of file
diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml
index 2ca2abf..7452ef2 100644
--- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml
+++ b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml
@@ -47,7 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="djsj != null "> and DJSJ = #{djsj}</if>
             <if test="zrdwdm != null  and zrdwdm != ''"> and ZRDWDM = #{zrdwdm}</if>
             <if test="zrdwmc != null  and zrdwmc != ''"> and ZRDWMC = #{zrdwmc}</if>
-            <if test="tcsj != null "> and TCSJ = #{tcsj}</if>
+            <if test="params.beginTCSJ != null and params.beginTCSJ != ''"><!-- 开始时间检索 -->
+                AND date_format(TCSJ,'%y%m%d') &gt;= date_format(#{params.beginTCSJ},'%y%m%d')
+            </if>
+            <if test="params.endTCSJ != null and params.endTCSJ != ''"><!-- 结束时间检索 -->
+                AND date_format(TCSJ,'%y%m%d') &lt;= date_format(#{params.endTCSJ},'%y%m%d')
+            </if>
             <if test="tcgcjs != null  and tcgcjs != ''"> and TCGCJS = #{tcgcjs}</if>
             <if test="tcjg != null  and tcjg != ''"> and TCJG = #{tcjg}</if>
             <if test="jlgxsj != null "> and JLGXSJ = #{jlgxsj}</if>
diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml
index 37953c8..8fe83de 100644
--- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml
+++ b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml
@@ -70,7 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) ))
             </if>
             <if test="GAJGMC != null  and GAJGMC != ''"> and GAJGMC = #{GAJGMC}</if>
-            <if test="ZAFKRQ != null "> and ZAFKRQ = #{ZAFKRQ}</if>
+            <if test="params.beginZAFKRQ != null and params.beginZAFKRQ != ''"><!-- 开始时间检索 -->
+                AND date_format(d.ZAFKRQ,'%y%m%d') &gt;= date_format(#{params.beginZAFKRQ},'%y%m%d')
+            </if>
+            <if test="params.endZAFKRQ != null and params.endZAFKRQ != ''"><!-- 结束时间检索 -->
+                AND date_format(d.ZAFKRQ,'%y%m%d') &lt;= date_format(#{params.endZAFKRQ},'%y%m%d')
+            </if>
             <if test="TRXFJLSL != null "> and TRXFJLSL = #{TRXFJLSL}</if>
             <if test="TRXFCLSL != null "> and TRXFCLSL = #{TRXFCLSL}</if>
             <if test="QFQZSL != null "> and QFQZSL = #{QFQZSL}</if>
diff --git a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java
index 739cfae..1ad0a57 100644
--- a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java
+++ b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbChryxxbService.java
@@ -1,6 +1,7 @@
 package basepro.manager.service;
 
 import basepro.manager.pojo.TbChryxxb;
+import guo.ping.e3mall.common.page.TableDataInfo;
 
 import java.util.List;
 
@@ -14,11 +15,18 @@ public interface ITbChryxxbService
 {
     /**
      * 查询检查站查获人员信息
-     * 
-     * @param HCRYBH 检查站查获人员信息ID
+     *
+     * @param id 检查站查获人员信息ID
      * @return 检查站查获人员信息
      */
-    public TbChryxxb selectTbChryxxbById(String HCRYBH);
+    public TbChryxxb selectTbChryxxbById(Integer id);
+    /**
+     * 查询检查站查获人员信息
+     *
+     * @param HCRYBH 检查站查获人员信息编号
+     * @return 检查站查获人员信息
+     */
+    public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH);
 
     /**
      * 查询检查站查获人员信息列表
@@ -26,6 +34,7 @@ public interface ITbChryxxbService
      * @param tbChryxxb 检查站查获人员信息
      * @return 检查站查获人员信息集合
      */
+    public TableDataInfo selectTbChryxxbList(TbChryxxb tbChryxxb, Integer pageNum, Integer pageSize);
     public List<TbChryxxb> selectTbChryxxbList(TbChryxxb tbChryxxb);
 
     /**
@@ -44,19 +53,43 @@ public interface ITbChryxxbService
      */
     public int updateTbChryxxb(TbChryxxb tbChryxxb);
 
+    /**
+     * 删除检查站查获人员信息
+     *
+     * @param HCRYBH 检查站查获人员信息ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbByHcrybh(String HCRYBH);
+
     /**
      * 批量删除检查站查获人员信息
-     * 
+     *
+     * @param HCRYBHs 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbByHcrybhs(String HCRYBHs);
+    /**
+     * 删除检查站查获人员信息
+     *
+     * @param id 检查站查获人员信息ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbById(Integer id);
+
+    /**
+     * 批量删除检查站查获人员信息
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     public int deleteTbChryxxbByIds(String ids);
 
     /**
-     * 删除检查站查获人员信息信息
-     * 
-     * @param HCRYBH 检查站查获人员信息ID
-     * @return 结果
+     * 从人车物核查表及卡点表获取查货人员信息
+     *
+     * @param date 盘查日期
+     * @return 检查站查获人员信息集合
      */
-    public int deleteTbChryxxbById(String HCRYBH);
+    public List<TbChryxxb> selectTbChryxxbListFromTbCheckPerson(String date);
+
 }
diff --git a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
index 669b830..54b9f76 100644
--- a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
+++ b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbMdjfjxxxbService.java
@@ -1,6 +1,7 @@
 package basepro.manager.service;
 
 import basepro.manager.pojo.TbMdjfjxxxb;
+import guo.ping.e3mall.common.page.TableDataInfo;
 
 import java.util.List;
 
@@ -27,6 +28,7 @@ public interface ITbMdjfjxxxbService
      * @return 矛盾纠纷简项信息集合
      */
     public List<TbMdjfjxxxb> selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb);
+    public TableDataInfo selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb, Integer pageNum, Integer pageSize);
 
     /**
      * 新增矛盾纠纷简项信息
diff --git a/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java b/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java
index 564bf24..95ba7ac 100644
--- a/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java
+++ b/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbChryxxb.java
@@ -18,7 +18,9 @@ public class TbChryxxb extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
     /** 检查站核查人员编号 */
+    @Excel(name = "检查站核查人员编号")
     private String HCRYBH;
 
     /** 检查站所属行政区划代码 */
@@ -46,8 +48,8 @@ public class TbChryxxb extends BaseEntity
     private String JCZMC;
 
     /** 检查时间 */
-    @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date jcsj;
 
     public String getJcsjStr() {
@@ -71,7 +73,15 @@ public class TbChryxxb extends BaseEntity
     @Excel(name = "查获人员类别(1：抓获在逃人员，2：劝返涉访人员，3：其他)",readConverterExp = "1=抓获在逃人员,2=劝返涉访人员,3=其他")
     private String HCRYLB;
 
-    public void setHCRYBH(String HCRYBH) 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setHCRYBH(String HCRYBH)
     {
         this.HCRYBH = HCRYBH;
     }
@@ -166,6 +176,7 @@ public class TbChryxxb extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
             .append("HCRYBH", getHCRYBH())
             .append("XZQHDM", getXZQHDM())
             .append("XZQHMC", getXZQHMC())
diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java
index f7f7501..a5fb618 100644
--- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java
+++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java
@@ -5,10 +5,14 @@ import java.util.List;
 import basepro.manager.mapper.TbChryxxbMapper;
 import basepro.manager.pojo.TbChryxxb;
 import basepro.manager.service.ITbChryxxbService;
+import com.github.pagehelper.PageHelper;
+import guo.ping.e3mall.common.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.dubbo.config.annotation.Service;
 import basepro.manager.common.core.text.Convert;
 
+import static guo.ping.e3mall.common.page.TablePageUtils.getDataTable;
+
 /**
  * 检查站查获人员信息Service业务层处理
  * 
@@ -23,14 +27,23 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
 
     /**
      * 查询检查站查获人员信息
-     * 
-     * @param HCRYBH 检查站查获人员信息ID
+     *
+     * @param id 检查站查获人员信息ID
+     * @return 检查站查获人员信息
+     */
+    public TbChryxxb selectTbChryxxbById(Integer id){
+        return tbChryxxbMapper.selectTbChryxxbById(id);
+    }
+    /**
+     * 查询检查站查获人员信息
+     *
+     * @param HCRYBH 检查站查获人员信息编号
      * @return 检查站查获人员信息
      */
     @Override
-    public TbChryxxb selectTbChryxxbById(String HCRYBH)
+    public TbChryxxb selectTbChryxxbByHcrybh(String HCRYBH)
     {
-        return tbChryxxbMapper.selectTbChryxxbById(HCRYBH);
+        return tbChryxxbMapper.selectTbChryxxbByHcrybh(HCRYBH);
     }
 
     /**
@@ -42,7 +55,14 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
     @Override
     public List<TbChryxxb> selectTbChryxxbList(TbChryxxb tbChryxxb)
     {
-        return tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
+        List<TbChryxxb> chryxxbList = tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
+        return chryxxbList;
+    }
+    public TableDataInfo selectTbChryxxbList(TbChryxxb tbChryxxb, Integer pageNum, Integer pageSize)
+    {
+        PageHelper.startPage(pageNum,pageSize);
+        List<TbChryxxb> chryxxbList = tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
+        return getDataTable(chryxxbList);
     }
 
     /**
@@ -72,13 +92,13 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
     /**
      * 删除检查站查获人员信息对象
      * 
-     * @param ids 需要删除的数据ID
+     * @param HCRYBHs 需要删除的数据ID
      * @return 结果
      */
     @Override
-    public int deleteTbChryxxbByIds(String ids)
+    public int deleteTbChryxxbByHcrybhs(String HCRYBHs)
     {
-        return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toStrArray(ids));
+        return tbChryxxbMapper.deleteTbChryxxbByHcrybhs(Convert.toStrArray(HCRYBHs));
     }
 
     /**
@@ -88,8 +108,39 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
      * @return 结果
      */
     @Override
-    public int deleteTbChryxxbById(String HCRYBH)
+    public int deleteTbChryxxbByHcrybh(String HCRYBH)
     {
-        return tbChryxxbMapper.deleteTbChryxxbById(HCRYBH);
+        return tbChryxxbMapper.deleteTbChryxxbByHcrybh(HCRYBH);
+    }
+
+    /**
+     * 删除检查站查获人员信息
+     *
+     * @param id 检查站查获人员信息ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbById(Integer id){
+        return tbChryxxbMapper.deleteTbChryxxbById(id);
+    }
+
+    /**
+     * 批量删除检查站查获人员信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTbChryxxbByIds(String ids){
+        return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toIntArray(ids));
+    }
+
+
+    /**
+     * 从人车物核查表及卡点表获取查货人员信息
+     *
+     * @param date 盘查日期
+     * @return 检查站查获人员信息集合
+     */
+    public List<TbChryxxb> selectTbChryxxbListFromTbCheckPerson(String date){
+        return tbChryxxbMapper.selectTbChryxxbListFromTbCheckPerson(date);
     }
 }
diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
index a001e32..de0a661 100644
--- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
+++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java
@@ -6,11 +6,16 @@ import java.util.UUID;
 import basepro.manager.common.utils.DateUtils;
 import basepro.manager.mapper.TbMdjfjxxxbMapper;
 import basepro.manager.pojo.TbMdjfjxxxb;
+import basepro.manager.pojo.TbXjxdzhxxb;
 import basepro.manager.service.ITbMdjfjxxxbService;
 import com.alibaba.dubbo.config.annotation.Service;
+import com.github.pagehelper.PageHelper;
+import guo.ping.e3mall.common.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import basepro.manager.common.core.text.Convert;
 
+import static guo.ping.e3mall.common.page.TablePageUtils.getDataTable;
+
 /**
  * 矛盾纠纷简项信息Service业务层处理
  * 
@@ -47,6 +52,13 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService
         return tbMdjfjxxxbMapper.selectTbMdjfjxxxbList(tbMdjfjxxxb);
     }
 
+    @Override
+    public TableDataInfo selectTbMdjfjxxxbList(TbMdjfjxxxb tbMdjfjxxxb, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        List<TbMdjfjxxxb> list = tbMdjfjxxxbMapper.selectTbMdjfjxxxbList(tbMdjfjxxxb);
+        return getDataTable(list);
+    }
+
     /**
      * 新增矛盾纠纷简项信息
      * 
diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/BaseProWebApplicationStarter.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/BaseProWebApplicationStarter.java
index 313c744..6261f95 100644
--- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/BaseProWebApplicationStarter.java
+++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/BaseProWebApplicationStarter.java
@@ -7,9 +7,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableAsync
+@EnableScheduling
 public class BaseProWebApplicationStarter extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java
new file mode 100644
index 0000000..42f16ef
--- /dev/null
+++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/InsertChryTask.java
@@ -0,0 +1,44 @@
+package basepro.manager.controller;
+
+import basepro.manager.pojo.TbChryxxb;
+import basepro.manager.service.ISysDictDataService;
+import basepro.manager.service.ITbChryxxbService;
+import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class InsertChryTask {
+
+    @Reference
+    private ITbChryxxbService tbChryxxbService;
+    @Reference
+    private ISysDictDataService sysDictDataService;
+
+//    @Scheduled(cron = "0 * * * * *") // 每分钟执行一次
+    @Scheduled(cron = "0 0 1 * * ?") // 每天凌晨1点执行异一次
+    public void executeEveryMinute() {
+        /**
+         * 获取前一天的日期 LocalDate.now()——今天  minusDays(1)——减1天 默认格式：yyyy-MM-dd
+         */
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+//        2021-03-07
+//        LocalDate specificDate = LocalDate.of(2021, Month.MARCH, 7);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String now = formatter.format(new Date());
+        System.out.println("抽取查获人员信息任务执行："+now);
+
+        List<TbChryxxb> chryxxbList = tbChryxxbService.selectTbChryxxbListFromTbCheckPerson(yesterday.toString());
+        for (TbChryxxb tbChryxxb : chryxxbList) {
+            String xzqhmc = sysDictDataService.selectDictLabel("anhui_code", tbChryxxb.getXZQHDM());
+            tbChryxxb.setXZQHMC(xzqhmc);
+            tbChryxxbService.insertTbChryxxb(tbChryxxb);
+        }
+    }
+}
diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java
index 5219f40..b8cf3b4 100644
--- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java
+++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbChryxxbController.java
@@ -13,7 +13,9 @@ import com.alibaba.dubbo.config.annotation.Reference;
 import guo.ping.e3mall.common.annotation.Log;
 import guo.ping.e3mall.common.controller.BaseController;
 import guo.ping.e3mall.common.enums.BusinessType;
+import guo.ping.e3mall.common.page.PageDomain;
 import guo.ping.e3mall.common.page.TableDataInfo;
+import guo.ping.e3mall.common.page.TableSupport;
 import guo.ping.e3mall.common.pojo.AjaxResult;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -38,7 +40,6 @@ public class TbChryxxbController extends BaseController
 
     @Reference
     private ITbChryxxbService tbChryxxbService;
-
     @RequiresPermissions("system:chryxxb:view")
     @GetMapping()
     public String chryxxb()
@@ -55,8 +56,11 @@ public class TbChryxxbController extends BaseController
     public TableDataInfo list(TbChryxxb tbChryxxb)
     {
         startPage();
-        List<TbChryxxb> list = tbChryxxbService.selectTbChryxxbList(tbChryxxb);
-        return getDataTable(list);
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        TableDataInfo list = tbChryxxbService.selectTbChryxxbList(tbChryxxb,pageNum,pageSize);
+        return list;
     }
 
     /**
@@ -90,7 +94,7 @@ public class TbChryxxbController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TbChryxxb tbChryxxb)
     {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar today = Calendar.getInstance();
         today.add(Calendar.DATE,-1);
         Date jcsj = today.getTime();
@@ -107,10 +111,21 @@ public class TbChryxxbController extends BaseController
     /**
      * 修改检查站查获人员信息
      */
-    @GetMapping("/edit/{HCRYBH}")
+    /*@GetMapping("/edit/{HCRYBH}")
     public String edit(@PathVariable("HCRYBH") String HCRYBH, ModelMap mmap)
     {
-        TbChryxxb tbChryxxb = tbChryxxbService.selectTbChryxxbById(HCRYBH);
+        TbChryxxb tbChryxxb = tbChryxxbService.selectTbChryxxbByHcrybh(HCRYBH);
+        mmap.put("tbChryxxb", tbChryxxb);
+        return prefix + "/edit";
+    }*/
+
+    /**
+     * 修改检查站查获人员信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap)
+    {
+        TbChryxxb tbChryxxb = tbChryxxbService.selectTbChryxxbById(id);
         mmap.put("tbChryxxb", tbChryxxb);
         return prefix + "/edit";
     }
@@ -124,7 +139,7 @@ public class TbChryxxbController extends BaseController
     @ResponseBody
     public AjaxResult editSave(TbChryxxb tbChryxxb)
     {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar today = Calendar.getInstance();
         today.add(Calendar.DATE,-1);
         Date jcsj = today.getTime();
diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
index 9f4afb7..2213fd3 100644
--- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
+++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java
@@ -7,6 +7,8 @@ import basepro.manager.pojo.TbMdjfjxxxb;
 import basepro.manager.service.ITbMdjfjxxxbService;
 import com.alibaba.dubbo.config.annotation.Reference;
 import guo.ping.e3mall.common.annotation.Log;
+import guo.ping.e3mall.common.page.PageDomain;
+import guo.ping.e3mall.common.page.TableSupport;
 import guo.ping.e3mall.common.pojo.AjaxResult;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -51,8 +53,11 @@ public class TbMdjfjxxxbController extends BaseController
     public TableDataInfo list(TbMdjfjxxxb tbMdjfjxxxb)
     {
         startPage();
-        List<TbMdjfjxxxb> list = tbMdjfjxxxbService.selectTbMdjfjxxxbList(tbMdjfjxxxb);
-        return getDataTable(list);
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        TableDataInfo list = tbMdjfjxxxbService.selectTbMdjfjxxxbList(tbMdjfjxxxb,pageNum,pageSize);
+        return list;
     }
 
     /**
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/add.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/add.html
index ad215a6..ff0c223 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/add.html
+++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/add.html
@@ -71,7 +71,7 @@
                 <div class="col-sm-7">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="jcsjStr" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                        <input name="jcsjStr" class="form-control" placeholder="检查时间" type="text" required>
                     </div>
                 </div>
             </div>
@@ -95,8 +95,8 @@
         }
 
         $("input[name='jcsjStr']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
+            format: "yyyy-mm-dd hh:ii:ss",
+            minView: 0,
             autoclose: true
         });
         function selectDeptTree() {
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html
index f0c5dbc..8af319b 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html
+++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html
@@ -110,10 +110,14 @@
                     checkbox: true
                 },
                 {
-                    field : 'hcrybh', 
-                    title : '检查站核查人员编号',
+                    field : 'id',
+                    title : '主键',
                     visible: false
                 },
+                {
+                    field : 'hcrybh',
+                    title : '检查站核查人员编号',
+                },
                 {
                     field : 'xzqhdm', 
                     title : '检查站所属行政区划代码',
@@ -161,8 +165,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.hcrybh + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.hcrybh + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/edit.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/edit.html
index 0d5f33b..671fadb 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/edit.html
+++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/edit.html
@@ -7,10 +7,11 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-chryxxb-edit" th:object="${tbChryxxb}">
+            <input name="id" class="form-control" type="text" th:field="*{id}">
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">核查人员编号：</label>
                 <div class="col-sm-7">
-                    <input name="HCRYBH" disabled class="form-control" type="text" th:field="*{HCRYBH}" required>
+                    <input name="HCRYBH" class="form-control" type="text" th:field="*{HCRYBH}" required>
                 </div>
             </div>
 
@@ -73,7 +74,7 @@
                 <div class="col-sm-7">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="jcsjStr" th:value="${#dates.format(tbChryxxb.jcsj, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                        <input name="jcsjStr" th:value="${#dates.format(tbChryxxb.jcsj, 'yyyy-MM-dd hh:mm:ss')}" class="form-control" placeholder="检查时间" type="text" required>
                     </div>
                 </div>
             </div>
@@ -94,8 +95,8 @@
         }
 
         $("input[name='jcsjStr']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
+            format: "yyyy-mm-dd hh:ii:ss HH:mm:ss",
+            minView: 0,
             autoclose: true
         });
         function selectDeptTree() {