修改查询侦查员接口，修改现场的出勘时间的时间格式

src/main/java/org/springblade/founder/asj/VO/AsjVO.java

@@ -16,6 +16,8 @@ public class AsjVO {
 	private Date asjfssjAsjfskssj;//案事件发生时间_案事件发生开始时间
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date asjfssjAsjfsjssj;//案事件发生时间_案事件发生结束时间
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date larq;//立案日期
 	private String asjfsddXzqhdm;//案事件发生地点_行政区划代码
 	private String asjfsddDzmc;//案事件发生地点_地址名称
 	private String ladwGajgjgdm;//立案单位_公安机关机构代码

src/main/java/org/springblade/founder/dzbl/entity/ZcyEntity.java

@@ -2,14 +2,17 @@ package org.springblade.founder.dzbl.entity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.founder.entity.PageModel;
+import org.springblade.founder.entity.BaseModel;
+
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ZcyEntity extends PageModel {
+public class ZcyEntity extends BaseModel {
 	private String xm;
 	private String sfzh;
 	private String jh;
 	private String dwdm;
 	private String dwmc;
+	private List<String> dwList;
 }

src/main/java/org/springblade/founder/dzbl/mapper/TbStAppDzblMapper.xml

@@ -9,6 +9,7 @@
         FROM TB_ST_APP_DZBL dzbl
         where dzbl.XXSC_PDBZ = '0'
         <include refid="dzblParam"/>
+        order by dzbl.DJSJ desc
         ) t
         where rownum <![CDATA[ <= ]]> #{end})
         where r <![CDATA[ > ]]> #{begin}
@@ -27,15 +28,22 @@
           and XXZJBH = #{xxzjbh,jdbcType=VARCHAR}
     </select>
     <select id="selectZcyListByParam" resultType="org.springblade.founder.dzbl.entity.ZcyEntity">
-        select *
-        from (select rownum r, t.*
-              from (
                        select true_name    as xm,
                               identitycard as sfzh,
                               unitcode     as dwdm,
                               unitname     as dwmc
-                       from SYS_USER
-                       where unitcode like #{dwdm,jdbcType=VARCHAR} || '%'
+                       from sys_user
+                       where scbz = '0'
+                             and open_flag = '1'
+                       <if test="dwdm != null and dwdm != ''">
+                           unitcode like #{dwdm,jdbcType=VARCHAR} || '%'
+                       </if>
+                       <if test="dwList != null and dwList.size() > 0">
+                           and unitcode in
+                           <foreach collection="dwList" item="dw" open="(" close=")" separator=",">
+                               #{dw,jdbcType=VARCHAR}
+                           </foreach>
+                       </if>
                        <if test="xm != null and xm != ''">
                            and true_name like '%' || #{xm,jdbcType=VARCHAR} || '%'
                        </if>
@@ -46,19 +54,27 @@
                            and policemanid = #{jh,jdbcType=VARCHAR}
                        </if>
                        order by lrsj desc
-                   ) t
-              where rownum <![CDATA[ <= ]]> #{end})
-        where r <![CDATA[ > ]]> #{begin}
+                        limit #{begin}, #{end}
     </select>
     <select id="selectZcyCountByParam" resultType="java.lang.Integer">
         select count(1)
-        from SYS_USER
-        where UNITCODE like #{dwdm,jdbcType=VARCHAR} || '%'
+        from sys_user
+        where scbz = '0'
+        and open_flag = '1'
+        <if test="dwdm != null and dwdm != ''">
+            unitcode like #{dwdm,jdbcType=VARCHAR} || '%'
+        </if>
+        <if test="dwList != null and dwList.size() > 0">
+            and unitcode in
+            <foreach collection="dwList" item="dw" open="(" close=")" separator=",">
+                #{dw,jdbcType=VARCHAR}
+            </foreach>
+        </if>
         <if test="xm != null and xm != ''">
-            and TRUE_NAME like '%' || #{xm,jdbcType=VARCHAR} || '%'
+            and true_name like '%' || #{xm,jdbcType=VARCHAR} || '%'
         </if>
         <if test="sfzh != null and sfzh != ''">
-            and IDENTITYCARD = #{sfzh,jdbcType=VARCHAR}
+            and identitycard = #{sfzh,jdbcType=VARCHAR}
         </if>
         <if test="jh != null and jh != ''">
             and username = #{jh,jdbcType=VARCHAR}

src/main/java/org/springblade/founder/dzbl/service/impl/TbStAppDzblServiceImpl.java

@@ -105,7 +105,7 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService {
 	public void deleteDzbl(String xxzjbh) {
 		TbStAppDzbl dzbl = new TbStAppDzbl();
 		dzbl.setXxzjbh(xxzjbh);
-		dzbl.setXxscPdbz("0");
+		dzbl.setXxscPdbz("1");
 		Utils.setUserCzxx(dzbl);
 		tbStAppDzblMapper.updateById(dzbl);
 	}
@@ -114,19 +114,19 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService {
 	public void deleteDzblBsh(String xxzjbh) {
 		TbStAppDzblBsh bsh = new TbStAppDzblBsh();
 		bsh.setXxzjbh(xxzjbh);
-		bsh.setXxscPdbz("0");
+		bsh.setXxscPdbz("1");
 		Utils.setUserCzxx(bsh);
 		tbStAppDzblBshMapper.updateById(bsh);
 	}
 
 	@Override
+	@DS("db1")
 	public Map<String, Object> queryAllZcy(ZcyEntity zcy) {
 		HashMap<String, Object> resultMap = new HashMap<>();
-		Utils.setPageParams(zcy);
-		XzxtUser xzxtUser = SecureUtil.getUserXzxt();
-		String unitcode = xzxtUser.getUnitcode();
-		String dwlike = Utils.getDwlikeByUnitCode(unitcode);
-		zcy.setDwdm(dwlike);
+		// Utils.setPageParams(zcy);
+		zcy.setEnd(zcy.getRows());
+		zcy.setBegin((zcy.getPage() - 1 ) * zcy.getRows());
+		unitcodeUnitService.setDwParam(zcy);
 		List<ZcyEntity> dateList = tbStAppDzblMapper.selectZcyListByParam(zcy);
 		Integer total = tbStAppDzblMapper.selectZcyCountByParam(zcy);
 		resultMap.put("rows", dateList);

src/main/java/org/springblade/founder/ryythcj/service/impl/TbStAppRyxxServiceImpl.java

@@ -144,6 +144,7 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
 	public void deleteOneFj(String xxzjbh) {
 		TbStAppRyzpfj ryzpfj = new TbStAppRyzpfj();
 		ryzpfj.setXxzjbh(xxzjbh);
+		ryzpfj.setXxscPdbz("1");
 		Utils.setUserCzxx(ryzpfj);
 		tbStAppRyzpfjMapper.updateById(ryzpfj);
 	}
@@ -152,6 +153,7 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
 	public void deleteRyxx(String xxzjbh) {
 		TbStAppRyxx ryxx = new TbStAppRyxx();
 		ryxx.setXxzjbh(xxzjbh);
+		ryxx.setXxscPdbz("1");
 		Utils.setUserCzxx(ryxx);
 		tbStAppRyxxMapper.updateById(ryxx);
 	}
@@ -159,7 +161,7 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
 	@Override
 	public TbStAppRyxx tqQgryxx(String zjhm) throws ParseException {
 		if(StringUtils.isNotEmpty(zjhm)){
-			if (zjhm.equals("150105********7822")){
+			if (zjhm.equals("150121199909090010")){
 				QgckryBean qgckryBean = new QgckryBean();
 				qgckryBean.setXm("测试人员");
 				qgckryBean.setXb("1");

src/main/java/org/springblade/founder/socketio/dao/MessgeMapper.java

 package org.springblade.founder.socketio.dao;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import org.apache.ibatis.annotations.Mapper;
 import org.springblade.founder.socketio.entity.TbXxfwXxdl;
 import org.springblade.modules.system.entity.SysNewUser;

src/main/java/org/springblade/founder/xcxx/entity/TbStAppXcxx.java

@@ -30,7 +30,7 @@ public class TbStAppXcxx extends BaseModel {
 	private String xcmsJyqk;
 	//出勘时间
 	@TableField(whereStrategy = FieldStrategy.NOT_EMPTY)
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date cksj;
 	//现场经度
 	private Double xcdlwzJd;

src/main/resources/application-dev.yml

@@ -160,3 +160,6 @@ esBzUrl: http://localhost:8888/
 secretKey: xzeq2021@zhyy#54
 
 ixqrck_flag: false
+#科通接口路径
+#ktUrl: http://74.6.57.208:30030/
+ktUrl: http://localhost:9022/bjhc/ktsj