Merge branch 'master' of http://git.helou.vip:8088/ly/ypc_manager

# Conflicts:
#	basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml

basepro-manager/basepro-manager-dao/pom.xml

@@ -50,6 +50,11 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
+        <!--<dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.6</version>
+        </dependency>-->
     </dependencies>
 
 </project>

basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml

@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTbXjxdzhxxb" parameterType="basepro.manager.pojo.TbXjxdzhxxb">
         insert into tb_xjxdzhxxb
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="Id != null ">id,</if>
+            <if test="Id != null and Id != '' ">id,</if>
             <if test="XZQHDM != null  and XZQHDM != ''">XZQHDM,</if>
             <if test="XZQHMC != null  and XZQHMC != ''">XZQHMC,</if>
             <if test="GAJGDM != null  and GAJGDM != ''">GAJGDM,</if>
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ChwpGzdj != null ">CHWP_GZDJ,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="Id != null ">#{Id},</if>
+            <if test="Id != null and Id != '' ">#{Id},</if>
             <if test="XZQHDM != null  and XZQHDM != ''">#{XZQHDM},</if>
             <if test="XZQHMC != null  and XZQHMC != ''">#{XZQHMC},</if>
             <if test="GAJGDM != null  and GAJGDM != ''">#{GAJGDM},</if>

basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbXjxdzhxxbService.java

@@ -39,6 +39,8 @@ public interface ITbXjxdzhxxbService
      */
     public int insertTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb);
 
+    public int insertTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb);
+
     /**
      * 修改夏季行动综合信息
      * 
@@ -47,6 +49,8 @@ public interface ITbXjxdzhxxbService
      */
     public int updateTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb);
 
+    public int updateTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb);
+
     /**
      * 批量删除夏季行动综合信息
      * 
@@ -63,7 +67,7 @@ public interface ITbXjxdzhxxbService
      */
     public int deleteTbXjxdzhxxbById(Long Id);
 
-    public TbXjxdzhxxb getNumByPctj(String manageDeptId);
+    public TbXjxdzhxxb getNumByPctj(String manageDeptId, String date);
 
     public List<TbXjxdzhxxb> xjxdStatics(TbXjxdzhxxb xjxdzhxxb);
 }

basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbXjxdzhxxb.java

@@ -20,7 +20,7 @@ public class TbXjxdzhxxb extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键 */
-    private Long Id;
+    private String Id;
 
     /** 行政区划代码 */
     @Excel(name = "行政区划代码")
@@ -43,6 +43,8 @@ public class TbXjxdzhxxb extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ZAFKRQ;
 
+    private String zafkrqStr;
+
     /** 投入民辅警力数量（人次） */
     @Excel(name = "投入民辅警力数量", readConverterExp = "人=次")
     private Long TRXFJLSL;
@@ -193,16 +195,15 @@ public class TbXjxdzhxxb extends BaseEntity
 
     private List<TbStuck> stuckList;
 
-    public void setId(Long Id) 
+    public String getId() {
-    {
-        this.Id = Id;
-    }
-
-    public Long getId() 
-    {
         return Id;
     }
-    public void setXZQHDM(String XZQHDM) 
+
+    public void setId(String id) {
+        Id = id;
+    }
+
+    public void setXZQHDM(String XZQHDM)
     {
         this.XZQHDM = XZQHDM;
     }
@@ -589,6 +590,14 @@ public class TbXjxdzhxxb extends BaseEntity
         this.stuckList = stuckList;
     }
 
+    public String getZafkrqStr() {
+        return zafkrqStr;
+    }
+
+    public void setZafkrqStr(String zafkrqStr) {
+        this.zafkrqStr = zafkrqStr;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

basepro-manager/basepro-manager-service/pom.xml

@@ -93,6 +93,20 @@
             <artifactId>mybatis</artifactId>
             <version>3.4.6</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.1.14</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-autoconfigure</artifactId>
@@ -129,6 +143,19 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.60</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.huaweicloud.dws</groupId>
+            <artifactId>huaweicloud-dws-jdbc</artifactId>
+            <version>8.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>4.3.13.RELEASE</version>
+        </dependency>
+
         <!--<dependency>
             <groupId>guo.ping.e3mall</groupId>
             <artifactId>basepro-framework</artifactId>

basepro-manager/basepro-manager-service/src/main/java/basepro/manager/BaseProServiceApplicationStarter.java

@@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
@@ -15,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import java.util.concurrent.CountDownLatch;
 
 @MapperScan(value = "basepro.manager.mapper")
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @EnableAsync
 public class BaseProServiceApplicationStarter extends SpringBootServletInitializer {
 
@@ -32,7 +33,7 @@ public class BaseProServiceApplicationStarter extends SpringBootServletInitializ
     }
 
 
-    @Override
+    /*@Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
         return builder.sources(BaseProServiceApplicationStarter.class);
     }
@@ -42,7 +43,7 @@ public class BaseProServiceApplicationStarter extends SpringBootServletInitializ
         PropertySourcesPlaceholderConfigurer c = new PropertySourcesPlaceholderConfigurer();
         c.setIgnoreUnresolvablePlaceholders(true);
         return c;
-    }
+    }*/
 
     @Bean
     public MessageClient messageClient(){

basepro-manager/basepro-manager-service/src/main/java/basepro/manager/config/DruidConfiguration.java

@@ -2,7 +2,7 @@ package basepro.manager.config;
 
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+//@Configuration
 public class DruidConfiguration {
 
 }

basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbXjxdzhxxbServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 import basepro.manager.common.core.text.Convert;
 import basepro.manager.common.utils.DateUtils;
+import basepro.manager.config.DataSourceUtil;
 import basepro.manager.mapper.RoadCheckStatisticsMapper;
 import basepro.manager.mapper.SysDeptMapper;
 import basepro.manager.mapper.TbStuckMapper;
@@ -19,6 +20,7 @@ import basepro.manager.service.ITbXjxdzhxxbService;
 import com.alibaba.dubbo.config.annotation.Service;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
+import guo.ping.e3mall.common.annotation.DataSource;
 import guo.ping.e3mall.common.page.TableDataInfo;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,10 +89,27 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
     @Override
     public int insertTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb)
     {
-        tbXjxdzhxxb.setZAFKRQ(DateUtils.getNowDate());
+        tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr()));
         return tbXjxdzhxxbMapper.insertTbXjxdzhxxb(tbXjxdzhxxb);
     }
 
+    @Override
+//    @DataSource(DataSourceEnum.DB2)
+    public int insertTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb) {
+        DataSourceUtil.setDB("db2");
+        tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr()));
+        return tbXjxdzhxxbMapper.insertTbXjxdzhxxb(tbXjxdzhxxb);
+    }
+
+    @Override
+//    @DataSource(DataSourceEnum.DB2)
+    public int updateTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb) {
+        DataSourceUtil.setDB("db2");
+        tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr()));
+        int num = tbXjxdzhxxbMapper.updateTbXjxdzhxxb(tbXjxdzhxxb);
+        return num;
+    }
+
     /**
      * 修改夏季行动综合信息
      * 
@@ -100,6 +119,7 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
     @Override
     public int updateTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb)
     {
+        tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr()));
         int num = tbXjxdzhxxbMapper.updateTbXjxdzhxxb(tbXjxdzhxxb);
         return num;
     }
@@ -129,9 +149,11 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
     }
 
     @Override
-    public TbXjxdzhxxb getNumByPctj(String manageDeptId) {
+    public TbXjxdzhxxb getNumByPctj(String manageDeptId ,String date) {
         TbXjxdzhxxb xjxd = new TbXjxdzhxxb();
-        String date = DateUtils.getDate();
+        if (null == date || "".equals(date)){
+            date = DateUtils.getDate();
+        }
         HashMap map = new HashMap();
         map.put("beginTime",date);
         map.put("endTime",date);

basepro-manager/basepro-manager-service/src/main/resources/application-dev.yml

@@ -6,11 +6,20 @@ mybatis:
 
 spring:
   datasource:
-    username: root
+    druid:
-    password: root
+#      driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.0.107:3306/e3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+      db1:
-    driver-class-name: com.mysql.jdbc.Driver
+        username: root
-    type: com.alibaba.druid.pool.DruidDataSource
+        password: root
+        jdbc-url: jdbc:mysql://localhost:3306/e3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        driver-class-name: com.mysql.jdbc.Driver
+      db2:
+        username: ahrs
+        password: Ycgis!2509
+        jdbc-url: jdbc:postgresql://192.168.0.168:5432/sjzl?currentSchema=public&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+        driver-class-name: org.postgresql.Driver
+
+#    type: com.alibaba.druid.pool.DruidDataSource
   devtools:
     restart:
       enabled: true

basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbXjxdzhxxbController.java

@@ -1,6 +1,7 @@
 package basepro.manager.controller;
 
 import java.util.List;
+import java.util.UUID;
 
 import basepro.manager.common.annotation.DataScope;
 import basepro.manager.common.annotation.Log;
@@ -90,7 +91,7 @@ public class TbXjxdzhxxbController extends BaseController
     public String add(ModelMap mmap)
     {
         SysUser user = ShiroUtils.getSysUser();
-        TbXjxdzhxxb xjxd = tbXjxdzhxxbService.getNumByPctj(user.getManageDeptId());
+        TbXjxdzhxxb xjxd = tbXjxdzhxxbService.getNumByPctj(user.getManageDeptId(),null);
         mmap.put("xjxd",xjxd);
         return prefix + "/add";
     }
@@ -104,9 +105,20 @@ public class TbXjxdzhxxbController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TbXjxdzhxxb tbXjxdzhxxb)
     {
+        String uuid = UUID.randomUUID().toString();
+        tbXjxdzhxxb.setId(uuid);
+        tbXjxdzhxxbService.insertTbXjxdzhxxbGs(tbXjxdzhxxb);
         return toAjax(tbXjxdzhxxbService.insertTbXjxdzhxxb(tbXjxdzhxxb));
     }
 
+    @PostMapping("/getDataByDate")
+    @ResponseBody
+    public AjaxResult getDataByDate(String date){
+        SysUser user = ShiroUtils.getSysUser();
+        TbXjxdzhxxb xjxd = tbXjxdzhxxbService.getNumByPctj(user.getManageDeptId(),date);
+        return AjaxResult.success(xjxd);
+    }
+
     /**
      * 修改夏季行动综合信息
      */

basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/mdjfjxxxb.html

@@ -120,10 +120,10 @@
                     field : 'xzqhmc',
                     title : '纠纷地行政区划名称'
                 },
-                {
+                /*{
                     field : 'fsdz',
                     title : '纠纷发生地址'
-                },
+                },*/
                 {
                     field : 'mdjfly',
                     title : '矛盾纠纷来源',
@@ -173,10 +173,10 @@
                     field : 'zrdwmc',
                     title : '责任公安机关'
                 },
-                {
+                /*{
                     field : 'tcsj',
                     title : '纠纷调处时间'
-                },
+                },*/
                 /*{
                     field : 'tcgcjs',
                     title : '矛盾纠纷调处过程简述'
@@ -188,10 +188,10 @@
                         return $.table.selectDictLabel(jgdatas, item.tcjg);
                     }
                 },
-                {
+                /*{
                     field : 'jlgxsj',
                     title : '记录更新时间'
-                },
+                },*/
                 {
                     title: '操作',
                     align: 'center',

basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html

@@ -44,6 +44,19 @@
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-sm-5">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">登记日期：</label>
+                        <div class="col-sm-8">
+                            <input name="zafkrqStr" class="form-control" type="text"  required>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-5">
+
+                </div>
+            </div>
             <h4 class="form-header h4">社会面防控总体情况</h4>
             <div class="row">
                 <div class="col-sm-5">
@@ -75,7 +88,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">抓获违法犯罪嫌疑人数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>抓获违法犯罪嫌疑人数量：</label>
                         <div class="col-sm-8">
                             <input name="ZAKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAKDSL}" required>
                         </div>
@@ -85,7 +98,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">检查车辆数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>检查车辆数量：</label>
                         <div class="col-sm-8">
                             <input name="JCCLSL" class="form-control" type="number" value="0" th:value="*{xjxd.JCCLSL}" required>
                         </div>
@@ -93,7 +106,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">盘查人员数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>盘查人员数量：</label>
                         <div class="col-sm-8">
                             <input name="PCRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.PCRYSL}" required>
                         </div>
@@ -113,6 +126,7 @@
 
                 </div>
             </div>
+            <div class="row"><span style="color: red; ">注*数据来源为人车物平台路面盘查数据,可根据实际情况进行修改</span></div>
             <h4 class="form-header h4">社会面防控总体情况</h4>
             <div class="row">
                 <div class="col-sm-5">
@@ -240,7 +254,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">排查矛盾纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>排查矛盾纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="PCMDJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -248,7 +262,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">化解矛盾纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解矛盾纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="HJMDJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -258,7 +272,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">婚恋家庭纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>婚恋家庭纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="HLJTJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -266,7 +280,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">化解婚恋家庭纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解婚恋家庭纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="HJHLJTJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -276,7 +290,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">邻里纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>邻里纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="LLJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -284,7 +298,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">化解邻里纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解邻里纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="HJLLJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -294,7 +308,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">经济纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>经济纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="JJJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -302,7 +316,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">化解经济纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解经济纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="HJJJJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -312,7 +326,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">医疗纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>医疗纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="YLJFSL" class="form-control" type="number" value="0" required>
                         </div>
@@ -320,18 +334,19 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">化解医疗纠纷数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解医疗纠纷数量：</label>
                         <div class="col-sm-8">
                             <input name="HJYLJFSL" class="form-control" type="number" value="0" required>
                         </div>
                     </div>
                 </div>
             </div>
+            <div class="row"><span style="color: red; ">注*数据来源为瑞信矛盾纠纷平台数据,可根据实际情况进行修改</span></div>
             <h4 class="form-header h4">检查站查控</h4>
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">运行公安检查站数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>运行公安检查站数量：</label>
                         <div class="col-sm-8">
                             <input name="YXGAJCZSL" class="form-control" type="number" value="0" th:value="*{xjxd.YXGAJCZSL}" required>
                         </div>
@@ -339,7 +354,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">设立临时治安卡点数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>设立临时治安卡点数量：</label>
                         <div class="col-sm-8">
                             <input name="SLZHKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.SLZHKDSL}" required>
                         </div>
@@ -349,7 +364,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">核查人员数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>核查人员数量：</label>
                         <div class="col-sm-8">
                             <input name="ZAPCRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAPCRYSL}" required>
                         </div>
@@ -357,7 +372,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">检查车辆数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>检查车辆数量：</label>
                         <div class="col-sm-8">
                             <input name="ZAPCCLSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAPCCLSL}" required>
                         </div>
@@ -367,7 +382,7 @@
             <div class="row">
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">抓获在逃人员数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>抓获在逃人员数量：</label>
                         <div class="col-sm-8">
                             <input name="ZHZTRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZHZTRYSL}" required>
                         </div>
@@ -375,7 +390,7 @@
                 </div>
                 <div class="col-sm-5">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">劝返涉访人员数量：</label>
+                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>劝返涉访人员数量：</label>
                         <div class="col-sm-8">
                             <input name="QFSFRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.QFSFRYSL}" required>
                         </div>
@@ -395,6 +410,7 @@
 
                 </div>
             </div>
+            <div class="row"><span style="color: red; ">注*数据来源为人车物平台卡点盘查数据,可根据实际情况进行修改</span></div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -411,10 +427,42 @@
             }
         }
 
-        $("input[name='ZAFKRQ']").datetimepicker({
+        $("input[name='zafkrqStr']").datetimepicker({
             format: "yyyy-mm-dd",
-            minView: "month",
+            minView: 2,
             autoclose: true
+        }).on('changeDate',function(){
+            var starttime=$('#zafkrqStr').val();
+            $.ajax({
+                url: prefix + '/getDataByDate',
+                type: 'POST',
+                data: {date: starttime},
+                success: function (res) {
+                    var data = res.data;
+                    $(':input[name="ZAKDSL"]').val(data.zakdsl);
+                    $(':input[name="JCCLSL"]').val(data.jcclsl);
+                    $(':input[name="PCRYSL"]').val(data.pcrysl);
+                 /*   $(':input[name="PCMDJFSL"]').val(data.pcmdjfsl);
+                    $(':input[name="HJMDJFSL"]').val(data.hjmdjfsl);
+                    $(':input[name="HLJTJFSL"]').val(data.hljtjfsl);
+                    $(':input[name="HJHLJTJFSL"]').val(data.hjhljtjfsl);
+                    $(':input[name="LLJFSL"]').val(data.lljfsl);
+                    $(':input[name="HJLLJFSL"]').val(data.hjlljfsl);
+                    $(':input[name="JJJFSL"]').val(data.jjjfsl);
+                    $(':input[name="HJJJJFSL"]').val(data.hjjjjfsl);
+                    $(':input[name="YLJFSL"]').val(data.yljfsl);
+                    $(':input[name="HJYLJFSL"]').val(data.hjyljfsl);*/
+                    $(':input[name="YXGAJCZSL"]').val(data.yxgajczsl);
+                    $(':input[name="SLZHKDSL"]').val(data.slzhkdsl);
+                    $(':input[name="ZAPCRYSL"]').val(data.zapcrysl);
+                    $(':input[name="ZAPCCLSL"]').val(data.zapcclsl);
+                    $(':input[name="ZHZTRYSL"]').val(data.zhztrysl);
+                    $(':input[name="QFSFRYSL"]').val(data.qfsfrysl);
+                    // $(':input[name="nameValue"]').val();
+                    // $(':input[name="nameValue"]').val();
+                    // $(':input[name="nameValue"]').val();
+                }
+            })
         });
     </script>
 </body>