From 61e376d42c7a48ce06e97cc41e4da11f7b6c56e9 Mon Sep 17 00:00:00 2001
From: luyya <luya0519>
Date: Thu, 19 Dec 2024 10:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=20=E6=A3=80=E6=9F=A5=E7=AB=99=E6=9F=A5=E8=8E=B7?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/framework/config/ShiroConfig.java |   5 +-
 .../manager/mapper/TbChryxxbMapper.java       |   2 +-
 .../mybatis/mapper/TbChryxxbMapper.xml        |  14 ++++--
 .../java/basepro/manager/pojo/TbChryxxb.java  |  33 ++++++-------
 .../service/impl/TbChryxxbServiceImpl.java    |  22 ++++++++-
 .../src/main/resources/application-dev.yml    |   7 +--
 .../src/main/resources/application.yml        |   2 +-
 .../controller/TbChryxxbController.java       |  37 ++++++++------
 .../src/main/resources/application-dev.yml    |   2 +-
 .../src/main/resources/application.yml        |   2 +-
 .../resources/static/download/bmzrs_v1.0.doc  | Bin 31744 -> 0 bytes
 .../main/resources/static/download/jcsq.xlsx  | Bin 12355 -> 0 bytes
 .../resources/static/download/ywrybmzrs.doc   | Bin 29184 -> 0 bytes
 .../main/resources/templates/chry/add.html    |  45 ++++++++----------
 .../resources/templates/chry/chryxxb.html     |  18 -------
 .../main/resources/templates/xjxd/add.html    |   5 +-
 .../main/resources/templates/xjxd/edit.html   |   2 +-
 .../resources/templates/xjxd/xjxdzhxxb.html   |   8 +++-
 18 files changed, 111 insertions(+), 93 deletions(-)
 delete mode 100644 basepro-manager/basepro-manager-web/src/main/resources/static/download/bmzrs_v1.0.doc
 delete mode 100644 basepro-manager/basepro-manager-web/src/main/resources/static/download/jcsq.xlsx
 delete mode 100644 basepro-manager/basepro-manager-web/src/main/resources/static/download/ywrybmzrs.doc

diff --git a/basepro-manager/basepro-framework/src/main/java/basepro/manager/framework/config/ShiroConfig.java b/basepro-manager/basepro-framework/src/main/java/basepro/manager/framework/config/ShiroConfig.java
index ece1a45..9ddb9e5 100644
--- a/basepro-manager/basepro-framework/src/main/java/basepro/manager/framework/config/ShiroConfig.java
+++ b/basepro-manager/basepro-framework/src/main/java/basepro/manager/framework/config/ShiroConfig.java
@@ -258,8 +258,9 @@ public class ShiroConfig
     @Bean
     public RedisManager redisManager(RedisProperties redisProperties) {
         RedisManager redisManager = new RedisManager();
-        redisManager.setHost("127.0.0.1:6379");
-//        redisManager.setHost("53.1.252.179:6389");
+//        redisManager.setHost("127.0.0.1:6379");
+//        redisManager.setPassword("ruoyi123");
+        redisManager.setHost("53.1.252.179:6389");
         /*redisManager.setPort(6389);
         redisManager.setHost("53.1.252.179");*/
         //redisManager.setPassword(redisProperties.getPassword());
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 a81cb03..9ad47a2 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
@@ -84,7 +84,7 @@ public interface TbChryxxbMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteTbChryxxbByIds(Integer[] ids);
+    public int deleteTbChryxxbByIds(String[] ids);
 
     /**
      * 从人车物核查表及卡点表获取查货人员信息
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 935a2f1..d33b1cf 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
@@ -24,12 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTbChryxxbList" parameterType="basepro.manager.pojo.TbChryxxb" resultMap="TbChryxxbResult">
-        <include refid="selectTbChryxxbVo"/>
+        select d.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 d
+        left join sys_dept s on d.GAJGDM = s.dept_id
         <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>
+            <if test="GAJGDM != null  and GAJGDM != ''">
+              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  like concat('%',#{GAJGMC},'%')</if>
             <if test="JCZDM != null  and JCZDM != ''"> and JCZDM = #{JCZDM}</if>
             <if test="JCZMC != null  and JCZMC != ''"> and JCZMC  like concat('%',#{JCZMC},'%')</if>
@@ -42,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ZJHM != null  and ZJHM != ''"> and ZJHM = #{ZJHM}</if>
             <if test="HCRYLB != null  and HCRYLB != ''"> and HCRYLB = #{HCRYLB}</if>
         </where>
+            order by jcsj desc
     </select>
     
     <select id="selectTbChryxxbByHcrybh" parameterType="String" resultMap="TbChryxxbResult">
@@ -123,8 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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 id="deleteTbChryxxbById" parameterType="string">
+        delete from tb_chryxxb where id = #{id}
     </delete>
 
     <delete id="deleteTbChryxxbByHcrybhs" parameterType="String">
@@ -133,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{HCRYBH}
         </foreach>
     </delete>
-    <delete id="deleteTbChryxxbByIds" parameterType="Integer">
+    <delete id="deleteTbChryxxbByIds" parameterType="String">
         delete from tb_chryxxb where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
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 0d40c36..52c3fa4 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
@@ -48,17 +48,9 @@ public class TbChryxxb extends BaseEntity
     private String JCZMC;
 
     /** 检查时间 */
-    @Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date jcsj;
+    private String jcsj;
 
-    public String getJcsjStr() {
-        return jcsjStr;
-    }
-
-    public void setJcsjStr(String jcsjStr) {
-        this.jcsjStr = jcsjStr;
-    }
 
     /**
      * 检查时间字符串
@@ -144,16 +136,17 @@ public class TbChryxxb extends BaseEntity
     {
         return JCZMC;
     }
-    public void setJcsj(Date jcsj) 
-    {
+
+
+    public String getJcsj() {
+        return jcsj;
+    }
+
+    public void setJcsj(String jcsj) {
         this.jcsj = jcsj;
     }
 
-    public Date getJcsj() 
-    {
-        return jcsj;
-    }
-    public void setZJHM(String ZJHM) 
+    public void setZJHM(String ZJHM)
     {
         this.ZJHM = ZJHM;
     }
@@ -172,6 +165,14 @@ public class TbChryxxb extends BaseEntity
         return HCRYLB;
     }
 
+    public String getJcsjStr() {
+        return jcsjStr;
+    }
+
+    public void setJcsjStr(String jcsjStr) {
+        this.jcsjStr = jcsjStr;
+    }
+
 
     @Override
     public String toString() {
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 af53922..40bf240 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
@@ -6,8 +6,10 @@ import java.util.List;
 import basepro.manager.config.DataSourceUtil;
 import basepro.manager.mapper.SysDeptXzqhMapper;
 import basepro.manager.mapper.TbChryxxbMapper;
+import basepro.manager.mapper.TbStuckMapper;
 import basepro.manager.pojo.SysDeptXzqh;
 import basepro.manager.pojo.TbChryxxb;
+import basepro.manager.pojo.TbStuck;
 import basepro.manager.service.ITbChryxxbService;
 import com.github.pagehelper.PageHelper;
 import guo.ping.e3mall.common.page.TableDataInfo;
@@ -32,6 +34,9 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
     @Autowired
     private SysDeptXzqhMapper xzqhMapper;
 
+    @Autowired
+    private TbStuckMapper stuckMapper;
+
     /**
      * 查询检查站查获人员信息
      *
@@ -71,6 +76,9 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
     public TableDataInfo selectTbChryxxbList(TbChryxxb tbChryxxb, Integer pageNum, Integer pageSize)
     {
         PageHelper.startPage(pageNum,pageSize);
+        if ("340000000000".equals(tbChryxxb.getGAJGDM())){
+            tbChryxxb.setGAJGDM("");
+        }
         List<TbChryxxb> chryxxbList = tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
         return getDataTable(chryxxbList);
     }
@@ -84,6 +92,18 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
     @Override
     public int insertTbChryxxb(TbChryxxb tbChryxxb)
     {
+        TbStuck stuck = stuckMapper.selectTbStuckById(Long.valueOf(tbChryxxb.getJCZDM()));
+        if (null != stuck){
+            tbChryxxb.setJCZMC(stuck.getDeptName()+"-"+stuck.getName());
+            tbChryxxb.setJCZDM("JCZ"+stuck.getDeptId().substring(0,6)+(stuck.getId()+1000));
+            tbChryxxb.setGAJGDM(stuck.getDeptId());
+            tbChryxxb.setGAJGMC(stuck.getDeptName());
+            SysDeptXzqh xzqh = xzqhMapper.selectSysDeptXzqhById(stuck.getDeptId());
+            if (null != xzqh){
+                tbChryxxb.setXZQHDM(xzqh.getXzqhdm());
+                tbChryxxb.setXZQHMC(xzqh.getXzqhmc());
+            }
+        }
 
         return tbChryxxbMapper.insertTbChryxxb(tbChryxxb);
     }
@@ -170,7 +190,7 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
      * @return 结果
      */
     public int deleteTbChryxxbByIds(String ids){
-        return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toIntArray(ids));
+        return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toStrArray(ids));
     }
 
 
diff --git a/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml b/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml
index 938c547..9fa0e47 100644
--- a/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml
+++ b/basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml
@@ -33,9 +33,10 @@ spring:
         enabled: true
 
   redis:
-      timeout: 50000
-      host: 127.0.0.1
-      port: 6379
+    timeout: 50000
+    host: 127.0.0.1
+    port: 6379
+    password: ruoyi123
 
   activemq:
         user: admin
diff --git a/basepro-manager/basepro-manager-service/src/main/resources/application.yml b/basepro-manager/basepro-manager-service/src/main/resources/application.yml
index 02d8b52..add3983 100644
--- a/basepro-manager/basepro-manager-service/src/main/resources/application.yml
+++ b/basepro-manager/basepro-manager-service/src/main/resources/application.yml
@@ -4,7 +4,7 @@
 
 spring:
   profiles:
-    active: dev
+    active: prod
 
 #spring:
 #  datasource:
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 d048bfe..adfb5ca 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
@@ -8,8 +8,12 @@ import java.util.List;
 import java.util.UUID;
 
 import basepro.manager.common.utils.poi.ExcelUtil;
+import basepro.manager.framework.util.ShiroUtils;
+import basepro.manager.pojo.SysUser;
 import basepro.manager.pojo.TbChryxxb;
+import basepro.manager.pojo.TbStuck;
 import basepro.manager.service.ITbChryxxbService;
+import basepro.manager.service.ITbStuckService;
 import com.alibaba.dubbo.config.annotation.Reference;
 import guo.ping.e3mall.common.annotation.Log;
 import guo.ping.e3mall.common.controller.BaseController;
@@ -18,6 +22,7 @@ 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 guo.ping.e3mall.common.utils.DateUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -41,6 +46,10 @@ public class TbChryxxbController extends BaseController
 
     @Reference
     private ITbChryxxbService tbChryxxbService;
+
+    @Reference
+    private ITbStuckService stuckService;
+
     @RequiresPermissions("system:chryxxb:view")
     @GetMapping()
     public String chryxxb()
@@ -56,10 +65,14 @@ public class TbChryxxbController extends BaseController
     @ResponseBody
     public TableDataInfo list(TbChryxxb tbChryxxb)
     {
+        SysUser user = ShiroUtils.getSysUser();
         startPage();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
+        if (null == tbChryxxb.getGAJGDM() || "".equals(tbChryxxb.getGAJGDM())){
+            tbChryxxb.setGAJGDM(user.getManageDeptId());
+        }
         TableDataInfo list = tbChryxxbService.selectTbChryxxbList(tbChryxxb,pageNum,pageSize);
         return list;
     }
@@ -81,8 +94,14 @@ public class TbChryxxbController extends BaseController
      * 新增检查站查获人员信息
      */
     @GetMapping("/add")
-    public String add()
+    public String add(ModelMap mmap)
     {
+        SysUser user = ShiroUtils.getSysUser();
+        TbStuck stuck = new TbStuck();
+        String deptId = user.getManageDeptId().substring(0,4)+"00000000";
+        stuck.setDeptId(deptId);
+        List<TbStuck> stuckList = stuckService.selectTbStuckList(stuck);
+        mmap.put("stucks",stuckList);
         return prefix + "/add";
     }
 
@@ -100,15 +119,10 @@ public class TbChryxxbController extends BaseController
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar today = Calendar.getInstance();
         today.add(Calendar.DATE,-1);
-        Date jcsj = today.getTime();
-        try {
-            jcsj = format.parse(tbChryxxb.getJcsjStr());
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
+        String jcsj = tbChryxxb.getJcsj();
         tbChryxxb.setJcsj(jcsj);
         int insertTbChryxxb = tbChryxxbService.insertTbChryxxb(tbChryxxb);
-        tbChryxxbService.insertTbChryxxbGs(tbChryxxb);
+//        tbChryxxbService.insertTbChryxxbGs(tbChryxxb);
         return toAjax(insertTbChryxxb);
     }
 
@@ -146,12 +160,7 @@ public class TbChryxxbController extends BaseController
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar today = Calendar.getInstance();
         today.add(Calendar.DATE,-1);
-        Date jcsj = today.getTime();
-        try {
-            jcsj = format.parse(tbChryxxb.getJcsjStr());
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
+        String jcsj = tbChryxxb.getJcsj();
         tbChryxxb.setJcsj(jcsj);
         tbChryxxbService.updateTbChryxxbGs(tbChryxxb);
         return toAjax(tbChryxxbService.updateTbChryxxb(tbChryxxb));
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml b/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml
index 0f0ec48..e4ad170 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml
+++ b/basepro-manager/basepro-manager-web/src/main/resources/application-dev.yml
@@ -108,7 +108,7 @@ spring:
 
     expire : 1800
     # Redis服务器连接密码（默认为空）
-    password :
+    password : ruoyi123
   # 连接池最大连接数（使用负值表示没有限制）
     jedis:
       pool:
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/application.yml b/basepro-manager/basepro-manager-web/src/main/resources/application.yml
index ad9a171..fadf7d2 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/application.yml
+++ b/basepro-manager/basepro-manager-web/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/static/download/bmzrs_v1.0.doc b/basepro-manager/basepro-manager-web/src/main/resources/static/download/bmzrs_v1.0.doc
deleted file mode 100644
index 3b36815f70bf29c5546dc1234b50f2cdca018bcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31744
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

diff --git a/basepro-manager/basepro-manager-web/src/main/resources/static/download/jcsq.xlsx b/basepro-manager/basepro-manager-web/src/main/resources/static/download/jcsq.xlsx
deleted file mode 100644
index 55c83d082c92dddaad691cd4ffafc25535ec41af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12355
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
BTR#8*

diff --git a/basepro-manager/basepro-manager-web/src/main/resources/static/download/ywrybmzrs.doc b/basepro-manager/basepro-manager-web/src/main/resources/static/download/ywrybmzrs.doc
deleted file mode 100644
index 3138202997531aea37fb6de13644cf3fc0daea94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29184
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

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 ff0c223..164b405 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
@@ -8,21 +8,21 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-chryxxb-add">
             <div class="form-group">
-                <label class="col-sm-4 control-label is-required">核查人员编号：</label>
-                <div class="col-sm-7">
+                <label class="col-sm-4 control-label is-required">核查人员身份证：</label>
+                <div class="col-sm-8">
                     <input name="HCRYBH" class="form-control" type="text" required>
                 </div>
             </div>
 
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">查获人员身份证号码：</label>
-                <div class="col-sm-7">
+                <div class="col-sm-8">
                     <input name="ZJHM" class="form-control"  id="ZJHM" type="text" required>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">查获人员类别：</label>
-                <div class="col-sm-7">
+                <div class="col-sm-8">
                     <select name="HCRYLB" class="form-control m-b" th:with="type=${@dict.getType('t_dict_chrylb')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
@@ -30,20 +30,16 @@
             </div>
 
             <div class="form-group">
-                <label class="col-sm-4 control-label">检查站代码：</label>
-                <div class="col-sm-7">
-                    <input name="JCZDM" class="form-control" type="text" placeholder="'JCZ'+6位地区代码+4位序列号">
+                <label class="col-sm-4 control-label is-required">查获检查站：</label>
+                <div class="col-sm-8">
+                    <select name="JCZDM" class="form-control m-b" required>
+                        <option th:each="stuck:${stucks}" th:value="${stuck.id}" th:text="${stuck.name}"></option>
+                    </select>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-4 control-label is-required">检查站名称：</label>
-                <div class="col-sm-7">
-                    <input name="JCZMC" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-4 control-label is-required">检查站所属行政区划代码：</label>
-                <div class="col-sm-7">
+                <div class="col-sm-8">
                     <input name="XZQHDM" class="form-control" type="text" required>
                 </div>
             </div>
@@ -52,27 +48,24 @@
                 <div class="col-sm-7">
                     <input name="XZQHMC" class="form-control" type="text" required>
                 </div>
-            </div>
+            </div>-->
             <!--<div class="form-group">
                 <label class="col-sm-4 control-label is-required">检查站所属公安机关代码：</label>
                 <div class="col-sm-7">
                     <input name="GAJGDM" class="form-control" type="text" required>
                 </div>
             </div>-->
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-4 control-label is-required">检查站所属公安机关：</label>
                 <div class="col-sm-7">
                     <input type="hidden" name="GAJGDM"  id="treeId"/>
                     <input type="text" name="GAJGMC" onclick="selectDeptTree()" id="treeName" placeholder="请选择归属机构" class="form-control"/>
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">    
                 <label class="col-sm-4 control-label is-required">检查时间：</label>
-                <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="检查时间" type="text" required>
-                    </div>
+                <div class="col-sm-8">
+                    <input name="jcsj" class="form-control" placeholder="检查时间" type="text" required>
                 </div>
             </div>
         </form>
@@ -81,6 +74,8 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script type="text/javascript">
         var prefix = ctx + "system/chryxxb"
+
+        var today = new Date();
         $("#form-chryxxb-add").validate({
             focusCleanup: true
         });
@@ -94,9 +89,11 @@
             }
         }
 
-        $("input[name='jcsjStr']").datetimepicker({
+        $("input[name='jcsj']").datetimepicker({
             format: "yyyy-mm-dd hh:ii:ss",
             minView: 0,
+            initialDate:new Date(),
+            endDate: today,
             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 d42bb83..7352b24 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
@@ -25,18 +25,6 @@
                                 <p>检查站所属行政区划代码：</p>
                                 <input type="text" name="XZQHDM"/>
                             </li>-->
-                            <li>
-                                <p>查获人员身份证号码：</p>
-                                <input type="text" name="ZJHM" placeholder="请输入正确的身份证号码查询"/>
-                            </li>
-                            <li>
-                                <p>检查站名称：</p>
-                                <input type="text" name="JCZMC"/>
-                            </li>
-                            <li>
-                                <p>检查站所属行政区划名称：</p>
-                                <input type="text" name="XZQHMC"/>
-                            </li>
                             <li>
                                 <p>检查站所属公安机关：</p>
                                 <input type="hidden" name="GAJGDM"  id="treeId"/>
@@ -57,12 +45,6 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li class="select-time">
-                                <p>检查时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginJcsj]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endJcsj]"/>
-                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html
index e87f22f..faf47fa 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html
+++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html
@@ -49,7 +49,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">登记日期：</label>
                         <div class="col-sm-8">
-                            <input name="zafkrqStr" id="zafkrqStr" th:value="*{xjxd.zafkrqStr}" readonly class="form-control" type="text"  required>
+                            <input name="zafkrqStr" id="zafkrqStr" th:value="*{xjxd.zafkrqStr}" class="form-control" type="text"  required>
                         </div>
                     </div>
                 </div>
@@ -445,7 +445,7 @@
 
         }
 
-        /*$("input[name='zafkrqStr']").datetimepicker({
+        $("input[name='zafkrqStr']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: 2,
             autoclose: true,
@@ -484,7 +484,6 @@
                 }
             })
         });
-*/
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html
index f634583..e8dc62a 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html
+++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html
@@ -50,7 +50,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">登记日期：</label>
                         <div class="col-sm-8">
-                            <input  id="zafkrqStr" th:field="*{zafkrqStr}" class="form-control" readonly type="text" readonly  required>
+                            <input  id="zafkrqStr" th:field="*{zafkrqStr}" class="form-control"  type="text" readonly  required>
                         </div>
                     </div>
                 </div>
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html
index 7f1b654..f30d7d2 100644
--- a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html
+++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html
@@ -305,10 +305,14 @@
                     class: 'table-cell-nowrap',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        if ((row.sfdj == '已上报' && row.ZAFKRQ == getdate())){
+                        if ((row.sfdj == '已上报' )){
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + 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>');
                         }
-                        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>');
+                        /*if ((row.sfdj == '已上报' && row.ZAFKRQ == getdate())){
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        }*/
+
                         return actions.join('');
                     }
                 }]