Compare commits
No commits in common. "d3807cbb891e59377019033bffbcd26cd4d339c5" and "1a9f89510929d87086f8f8d11b72ea10140df434" have entirely different histories.
d3807cbb89
...
1a9f895109
|
|
@ -50,11 +50,6 @@
|
||||||
<groupId>com.alibaba</groupId>
|
<groupId>com.alibaba</groupId>
|
||||||
<artifactId>druid</artifactId>
|
<artifactId>druid</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>druid-spring-boot-starter</artifactId>
|
|
||||||
<version>1.2.6</version>
|
|
||||||
</dependency>-->
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<insert id="insertTbXjxdzhxxb" parameterType="basepro.manager.pojo.TbXjxdzhxxb">
|
<insert id="insertTbXjxdzhxxb" parameterType="basepro.manager.pojo.TbXjxdzhxxb">
|
||||||
insert into tb_xjxdzhxxb
|
insert into tb_xjxdzhxxb
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="Id != null and Id != '' ">id,</if>
|
<if test="Id != null ">id,</if>
|
||||||
<if test="XZQHDM != null and XZQHDM != ''">XZQHDM,</if>
|
<if test="XZQHDM != null and XZQHDM != ''">XZQHDM,</if>
|
||||||
<if test="XZQHMC != null and XZQHMC != ''">XZQHMC,</if>
|
<if test="XZQHMC != null and XZQHMC != ''">XZQHMC,</if>
|
||||||
<if test="GAJGDM != null and GAJGDM != ''">GAJGDM,</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>
|
<if test="ChwpGzdj != null ">CHWP_GZDJ,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="Id != null and Id != '' ">#{Id},</if>
|
<if test="Id != null ">#{Id},</if>
|
||||||
<if test="XZQHDM != null and XZQHDM != ''">#{XZQHDM},</if>
|
<if test="XZQHDM != null and XZQHDM != ''">#{XZQHDM},</if>
|
||||||
<if test="XZQHMC != null and XZQHMC != ''">#{XZQHMC},</if>
|
<if test="XZQHMC != null and XZQHMC != ''">#{XZQHMC},</if>
|
||||||
<if test="GAJGDM != null and GAJGDM != ''">#{GAJGDM},</if>
|
<if test="GAJGDM != null and GAJGDM != ''">#{GAJGDM},</if>
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,6 @@ public interface ITbXjxdzhxxbService
|
||||||
*/
|
*/
|
||||||
public int insertTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb);
|
public int insertTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb);
|
||||||
|
|
||||||
public int insertTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改夏季行动综合信息
|
* 修改夏季行动综合信息
|
||||||
*
|
*
|
||||||
|
|
@ -49,8 +47,6 @@ public interface ITbXjxdzhxxbService
|
||||||
*/
|
*/
|
||||||
public int updateTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb);
|
public int updateTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb);
|
||||||
|
|
||||||
public int updateTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除夏季行动综合信息
|
* 批量删除夏季行动综合信息
|
||||||
*
|
*
|
||||||
|
|
@ -67,7 +63,7 @@ public interface ITbXjxdzhxxbService
|
||||||
*/
|
*/
|
||||||
public int deleteTbXjxdzhxxbById(Long Id);
|
public int deleteTbXjxdzhxxbById(Long Id);
|
||||||
|
|
||||||
public TbXjxdzhxxb getNumByPctj(String manageDeptId, String date);
|
public TbXjxdzhxxb getNumByPctj(String manageDeptId);
|
||||||
|
|
||||||
public List<TbXjxdzhxxb> xjxdStatics(TbXjxdzhxxb xjxdzhxxb);
|
public List<TbXjxdzhxxb> xjxdStatics(TbXjxdzhxxb xjxdzhxxb);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ public class TbXjxdzhxxb extends BaseEntity
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 主键 */
|
/** 主键 */
|
||||||
private String Id;
|
private Long Id;
|
||||||
|
|
||||||
/** 行政区划代码 */
|
/** 行政区划代码 */
|
||||||
@Excel(name = "行政区划代码")
|
@Excel(name = "行政区划代码")
|
||||||
|
|
@ -43,8 +43,6 @@ public class TbXjxdzhxxb extends BaseEntity
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
private Date ZAFKRQ;
|
private Date ZAFKRQ;
|
||||||
|
|
||||||
private String zafkrqStr;
|
|
||||||
|
|
||||||
/** 投入民辅警力数量(人次) */
|
/** 投入民辅警力数量(人次) */
|
||||||
@Excel(name = "投入民辅警力数量", readConverterExp = "人=次")
|
@Excel(name = "投入民辅警力数量", readConverterExp = "人=次")
|
||||||
private Long TRXFJLSL;
|
private Long TRXFJLSL;
|
||||||
|
|
@ -195,14 +193,15 @@ public class TbXjxdzhxxb extends BaseEntity
|
||||||
|
|
||||||
private List<TbStuck> stuckList;
|
private List<TbStuck> stuckList;
|
||||||
|
|
||||||
public String getId() {
|
public void setId(Long Id)
|
||||||
|
{
|
||||||
|
this.Id = Id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getId()
|
||||||
|
{
|
||||||
return Id;
|
return Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
Id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setXZQHDM(String XZQHDM)
|
public void setXZQHDM(String XZQHDM)
|
||||||
{
|
{
|
||||||
this.XZQHDM = XZQHDM;
|
this.XZQHDM = XZQHDM;
|
||||||
|
|
@ -590,14 +589,6 @@ public class TbXjxdzhxxb extends BaseEntity
|
||||||
this.stuckList = stuckList;
|
this.stuckList = stuckList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getZafkrqStr() {
|
|
||||||
return zafkrqStr;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setZafkrqStr(String zafkrqStr) {
|
|
||||||
this.zafkrqStr = zafkrqStr;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||||
|
|
|
||||||
|
|
@ -93,20 +93,6 @@
|
||||||
<artifactId>mybatis</artifactId>
|
<artifactId>mybatis</artifactId>
|
||||||
<version>3.4.6</version>
|
<version>3.4.6</version>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.mybatis.spring.boot</groupId>
|
<groupId>org.mybatis.spring.boot</groupId>
|
||||||
<artifactId>mybatis-spring-boot-autoconfigure</artifactId>
|
<artifactId>mybatis-spring-boot-autoconfigure</artifactId>
|
||||||
|
|
@ -143,19 +129,6 @@
|
||||||
<artifactId>fastjson</artifactId>
|
<artifactId>fastjson</artifactId>
|
||||||
<version>1.2.60</version>
|
<version>1.2.60</version>
|
||||||
</dependency>
|
</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>
|
<!--<dependency>
|
||||||
<groupId>guo.ping.e3mall</groupId>
|
<groupId>guo.ping.e3mall</groupId>
|
||||||
<artifactId>basepro-framework</artifactId>
|
<artifactId>basepro-framework</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import org.mybatis.spring.annotation.MapperScan;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.WebApplicationType;
|
import org.springframework.boot.WebApplicationType;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
|
||||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
|
|
@ -16,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
|
||||||
@MapperScan(value = "basepro.manager.mapper")
|
@MapperScan(value = "basepro.manager.mapper")
|
||||||
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
|
@SpringBootApplication
|
||||||
@EnableAsync
|
@EnableAsync
|
||||||
public class BaseProServiceApplicationStarter extends SpringBootServletInitializer {
|
public class BaseProServiceApplicationStarter extends SpringBootServletInitializer {
|
||||||
|
|
||||||
|
|
@ -33,7 +32,7 @@ public class BaseProServiceApplicationStarter extends SpringBootServletInitializ
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*@Override
|
@Override
|
||||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
|
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
|
||||||
return builder.sources(BaseProServiceApplicationStarter.class);
|
return builder.sources(BaseProServiceApplicationStarter.class);
|
||||||
}
|
}
|
||||||
|
|
@ -43,7 +42,7 @@ public class BaseProServiceApplicationStarter extends SpringBootServletInitializ
|
||||||
PropertySourcesPlaceholderConfigurer c = new PropertySourcesPlaceholderConfigurer();
|
PropertySourcesPlaceholderConfigurer c = new PropertySourcesPlaceholderConfigurer();
|
||||||
c.setIgnoreUnresolvablePlaceholders(true);
|
c.setIgnoreUnresolvablePlaceholders(true);
|
||||||
return c;
|
return c;
|
||||||
}*/
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public MessageClient messageClient(){
|
public MessageClient messageClient(){
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ package basepro.manager.config;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
//@Configuration
|
@Configuration
|
||||||
public class DruidConfiguration {
|
public class DruidConfiguration {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import java.util.List;
|
||||||
|
|
||||||
import basepro.manager.common.core.text.Convert;
|
import basepro.manager.common.core.text.Convert;
|
||||||
import basepro.manager.common.utils.DateUtils;
|
import basepro.manager.common.utils.DateUtils;
|
||||||
import basepro.manager.config.DataSourceUtil;
|
|
||||||
import basepro.manager.mapper.RoadCheckStatisticsMapper;
|
import basepro.manager.mapper.RoadCheckStatisticsMapper;
|
||||||
import basepro.manager.mapper.SysDeptMapper;
|
import basepro.manager.mapper.SysDeptMapper;
|
||||||
import basepro.manager.mapper.TbStuckMapper;
|
import basepro.manager.mapper.TbStuckMapper;
|
||||||
|
|
@ -20,7 +19,6 @@ import basepro.manager.service.ITbXjxdzhxxbService;
|
||||||
import com.alibaba.dubbo.config.annotation.Service;
|
import com.alibaba.dubbo.config.annotation.Service;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import guo.ping.e3mall.common.annotation.DataSource;
|
|
||||||
import guo.ping.e3mall.common.page.TableDataInfo;
|
import guo.ping.e3mall.common.page.TableDataInfo;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -89,27 +87,10 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
|
||||||
@Override
|
@Override
|
||||||
public int insertTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb)
|
public int insertTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb)
|
||||||
{
|
{
|
||||||
tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr()));
|
tbXjxdzhxxb.setZAFKRQ(DateUtils.getNowDate());
|
||||||
return tbXjxdzhxxbMapper.insertTbXjxdzhxxb(tbXjxdzhxxb);
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改夏季行动综合信息
|
* 修改夏季行动综合信息
|
||||||
*
|
*
|
||||||
|
|
@ -119,7 +100,6 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
|
||||||
@Override
|
@Override
|
||||||
public int updateTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb)
|
public int updateTbXjxdzhxxb(TbXjxdzhxxb tbXjxdzhxxb)
|
||||||
{
|
{
|
||||||
tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr()));
|
|
||||||
int num = tbXjxdzhxxbMapper.updateTbXjxdzhxxb(tbXjxdzhxxb);
|
int num = tbXjxdzhxxbMapper.updateTbXjxdzhxxb(tbXjxdzhxxb);
|
||||||
return num;
|
return num;
|
||||||
}
|
}
|
||||||
|
|
@ -149,11 +129,9 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TbXjxdzhxxb getNumByPctj(String manageDeptId ,String date) {
|
public TbXjxdzhxxb getNumByPctj(String manageDeptId) {
|
||||||
TbXjxdzhxxb xjxd = new TbXjxdzhxxb();
|
TbXjxdzhxxb xjxd = new TbXjxdzhxxb();
|
||||||
if (null == date || "".equals(date)){
|
String date = DateUtils.getDate();
|
||||||
date = DateUtils.getDate();
|
|
||||||
}
|
|
||||||
HashMap map = new HashMap();
|
HashMap map = new HashMap();
|
||||||
map.put("beginTime",date);
|
map.put("beginTime",date);
|
||||||
map.put("endTime",date);
|
map.put("endTime",date);
|
||||||
|
|
|
||||||
|
|
@ -6,20 +6,11 @@ mybatis:
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
druid:
|
|
||||||
# driver-class-name: com.mysql.jdbc.Driver
|
|
||||||
db1:
|
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: root
|
||||||
jdbc-url: jdbc:mysql://localhost:3306/e3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
url: jdbc:mysql://192.168.0.112:3306/e3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||||
driver-class-name: com.mysql.jdbc.Driver
|
driver-class-name: com.mysql.jdbc.Driver
|
||||||
db2:
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
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:
|
devtools:
|
||||||
restart:
|
restart:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package basepro.manager.controller;
|
package basepro.manager.controller;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import basepro.manager.common.annotation.DataScope;
|
import basepro.manager.common.annotation.DataScope;
|
||||||
import basepro.manager.common.annotation.Log;
|
import basepro.manager.common.annotation.Log;
|
||||||
|
|
@ -91,7 +90,7 @@ public class TbXjxdzhxxbController extends BaseController
|
||||||
public String add(ModelMap mmap)
|
public String add(ModelMap mmap)
|
||||||
{
|
{
|
||||||
SysUser user = ShiroUtils.getSysUser();
|
SysUser user = ShiroUtils.getSysUser();
|
||||||
TbXjxdzhxxb xjxd = tbXjxdzhxxbService.getNumByPctj(user.getManageDeptId(),null);
|
TbXjxdzhxxb xjxd = tbXjxdzhxxbService.getNumByPctj(user.getManageDeptId());
|
||||||
mmap.put("xjxd",xjxd);
|
mmap.put("xjxd",xjxd);
|
||||||
return prefix + "/add";
|
return prefix + "/add";
|
||||||
}
|
}
|
||||||
|
|
@ -105,20 +104,9 @@ public class TbXjxdzhxxbController extends BaseController
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxResult addSave(TbXjxdzhxxb tbXjxdzhxxb)
|
public AjaxResult addSave(TbXjxdzhxxb tbXjxdzhxxb)
|
||||||
{
|
{
|
||||||
String uuid = UUID.randomUUID().toString();
|
|
||||||
tbXjxdzhxxb.setId(uuid);
|
|
||||||
tbXjxdzhxxbService.insertTbXjxdzhxxbGs(tbXjxdzhxxb);
|
|
||||||
return toAjax(tbXjxdzhxxbService.insertTbXjxdzhxxb(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);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改夏季行动综合信息
|
* 修改夏季行动综合信息
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -120,10 +120,10 @@
|
||||||
field : 'xzqhmc',
|
field : 'xzqhmc',
|
||||||
title : '纠纷地行政区划名称'
|
title : '纠纷地行政区划名称'
|
||||||
},
|
},
|
||||||
/*{
|
{
|
||||||
field : 'fsdz',
|
field : 'fsdz',
|
||||||
title : '纠纷发生地址'
|
title : '纠纷发生地址'
|
||||||
},*/
|
},
|
||||||
{
|
{
|
||||||
field : 'mdjfly',
|
field : 'mdjfly',
|
||||||
title : '矛盾纠纷来源',
|
title : '矛盾纠纷来源',
|
||||||
|
|
@ -173,10 +173,10 @@
|
||||||
field : 'zrdwmc',
|
field : 'zrdwmc',
|
||||||
title : '责任公安机关'
|
title : '责任公安机关'
|
||||||
},
|
},
|
||||||
/*{
|
{
|
||||||
field : 'tcsj',
|
field : 'tcsj',
|
||||||
title : '纠纷调处时间'
|
title : '纠纷调处时间'
|
||||||
},*/
|
},
|
||||||
/*{
|
/*{
|
||||||
field : 'tcgcjs',
|
field : 'tcgcjs',
|
||||||
title : '矛盾纠纷调处过程简述'
|
title : '矛盾纠纷调处过程简述'
|
||||||
|
|
@ -188,10 +188,10 @@
|
||||||
return $.table.selectDictLabel(jgdatas, item.tcjg);
|
return $.table.selectDictLabel(jgdatas, item.tcjg);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/*{
|
{
|
||||||
field : 'jlgxsj',
|
field : 'jlgxsj',
|
||||||
title : '记录更新时间'
|
title : '记录更新时间'
|
||||||
},*/
|
},
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|
|
||||||
|
|
@ -44,19 +44,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</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>
|
<h4 class="form-header h4">社会面防控总体情况</h4>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
|
|
@ -88,7 +75,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>抓获违法犯罪嫌疑人数量:</label>
|
<label class="col-sm-4 control-label">抓获违法犯罪嫌疑人数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="ZAKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAKDSL}" required>
|
<input name="ZAKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAKDSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -98,7 +85,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>检查车辆数量:</label>
|
<label class="col-sm-4 control-label">检查车辆数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="JCCLSL" class="form-control" type="number" value="0" th:value="*{xjxd.JCCLSL}" required>
|
<input name="JCCLSL" class="form-control" type="number" value="0" th:value="*{xjxd.JCCLSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -106,7 +93,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>盘查人员数量:</label>
|
<label class="col-sm-4 control-label">盘查人员数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="PCRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.PCRYSL}" required>
|
<input name="PCRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.PCRYSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -126,7 +113,6 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row"><span style="color: red; ">注*数据来源为人车物平台路面盘查数据,可根据实际情况进行修改</span></div>
|
|
||||||
<h4 class="form-header h4">社会面防控总体情况</h4>
|
<h4 class="form-header h4">社会面防控总体情况</h4>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
|
|
@ -254,7 +240,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>排查矛盾纠纷数量:</label>
|
<label class="col-sm-4 control-label">排查矛盾纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="PCMDJFSL" class="form-control" type="number" value="0" required>
|
<input name="PCMDJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -262,7 +248,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解矛盾纠纷数量:</label>
|
<label class="col-sm-4 control-label">化解矛盾纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="HJMDJFSL" class="form-control" type="number" value="0" required>
|
<input name="HJMDJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -272,7 +258,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>婚恋家庭纠纷数量:</label>
|
<label class="col-sm-4 control-label">婚恋家庭纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="HLJTJFSL" class="form-control" type="number" value="0" required>
|
<input name="HLJTJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -280,7 +266,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解婚恋家庭纠纷数量:</label>
|
<label class="col-sm-4 control-label">化解婚恋家庭纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="HJHLJTJFSL" class="form-control" type="number" value="0" required>
|
<input name="HJHLJTJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -290,7 +276,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>邻里纠纷数量:</label>
|
<label class="col-sm-4 control-label">邻里纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="LLJFSL" class="form-control" type="number" value="0" required>
|
<input name="LLJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -298,7 +284,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解邻里纠纷数量:</label>
|
<label class="col-sm-4 control-label">化解邻里纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="HJLLJFSL" class="form-control" type="number" value="0" required>
|
<input name="HJLLJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -308,7 +294,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>经济纠纷数量:</label>
|
<label class="col-sm-4 control-label">经济纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="JJJFSL" class="form-control" type="number" value="0" required>
|
<input name="JJJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -316,7 +302,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解经济纠纷数量:</label>
|
<label class="col-sm-4 control-label">化解经济纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="HJJJJFSL" class="form-control" type="number" value="0" required>
|
<input name="HJJJJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -326,7 +312,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>医疗纠纷数量:</label>
|
<label class="col-sm-4 control-label">医疗纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="YLJFSL" class="form-control" type="number" value="0" required>
|
<input name="YLJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -334,19 +320,18 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>化解医疗纠纷数量:</label>
|
<label class="col-sm-4 control-label">化解医疗纠纷数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="HJYLJFSL" class="form-control" type="number" value="0" required>
|
<input name="HJYLJFSL" class="form-control" type="number" value="0" required>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row"><span style="color: red; ">注*数据来源为瑞信矛盾纠纷平台数据,可根据实际情况进行修改</span></div>
|
|
||||||
<h4 class="form-header h4">检查站查控</h4>
|
<h4 class="form-header h4">检查站查控</h4>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>运行公安检查站数量:</label>
|
<label class="col-sm-4 control-label">运行公安检查站数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="YXGAJCZSL" class="form-control" type="number" value="0" th:value="*{xjxd.YXGAJCZSL}" required>
|
<input name="YXGAJCZSL" class="form-control" type="number" value="0" th:value="*{xjxd.YXGAJCZSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -354,7 +339,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>设立临时治安卡点数量:</label>
|
<label class="col-sm-4 control-label">设立临时治安卡点数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="SLZHKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.SLZHKDSL}" required>
|
<input name="SLZHKDSL" class="form-control" type="number" value="0" th:value="*{xjxd.SLZHKDSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -364,7 +349,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>核查人员数量:</label>
|
<label class="col-sm-4 control-label">核查人员数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="ZAPCRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAPCRYSL}" required>
|
<input name="ZAPCRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAPCRYSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -372,7 +357,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>检查车辆数量:</label>
|
<label class="col-sm-4 control-label">检查车辆数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="ZAPCCLSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAPCCLSL}" required>
|
<input name="ZAPCCLSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZAPCCLSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -382,7 +367,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>抓获在逃人员数量:</label>
|
<label class="col-sm-4 control-label">抓获在逃人员数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="ZHZTRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZHZTRYSL}" required>
|
<input name="ZHZTRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.ZHZTRYSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -390,7 +375,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-4 control-label"><span style="color: red; ">*</span>劝返涉访人员数量:</label>
|
<label class="col-sm-4 control-label">劝返涉访人员数量:</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input name="QFSFRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.QFSFRYSL}" required>
|
<input name="QFSFRYSL" class="form-control" type="number" value="0" th:value="*{xjxd.QFSFRYSL}" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -410,7 +395,6 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row"><span style="color: red; ">注*数据来源为人车物平台卡点盘查数据,可根据实际情况进行修改</span></div>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<th:block th:include="include :: footer" />
|
<th:block th:include="include :: footer" />
|
||||||
|
|
@ -427,42 +411,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$("input[name='zafkrqStr']").datetimepicker({
|
$("input[name='ZAFKRQ']").datetimepicker({
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd",
|
||||||
minView: 2,
|
minView: "month",
|
||||||
autoclose: true
|
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>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue