Skip to content

D
data_management_system
Commit 40acf57f authored by 秦嘉's avatar 秦嘉
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents e3f7efc1 ab21d866
Hide whitespace changes
Inline Side-by-side
Showing with 685 additions and 24 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FcryController.java
View file @ 40acf57f
......@@ -84,7 +84,7 @@ public class FcryController extends BaseController
fcry.setValue(DataUtils.getKey(null, String.valueOf(SecurityUtils.getUserId()),null,null,null));
else if ("3".equals(userType))
fcry.setValue(DataUtils.getKey(null,null, String.valueOf(SecurityUtils.getUserId()),null,null));
List<Fcry> list = fcryService.selectFcryList(fcry);
List<Fcry> list = fcryService.selectFcryListExport(fcry);
ExcelUtil<Fcry> util = new ExcelUtil<Fcry>(Fcry.class);
for (Fcry fcryExport : list) {
if (StringUtils.isNotEmpty(fcryExport.getCommunity())) {
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FkqkController.java
View file @ 40acf57f
......@@ -70,7 +70,7 @@ public class FkqkController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, Fkqk fkqk)
{
List<Fkqk> list = fkqkService.selectFkqkList(fkqk);
List<Fkqk> list = fkqkService.selectFkqkListExport(fkqk);
ExcelUtil<Fkqk> util = new ExcelUtil<Fkqk>(Fkqk.class);
for (Fkqk fkqkExport : list) {
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GldryController.java
View file @ 40acf57f
......@@ -77,7 +77,7 @@ public class GldryController extends BaseController
gldry.setValue(DataUtils.getKey(null, String.valueOf(SecurityUtils.getUserId()),null,null,null));
else if ("3".equals(userType))
gldry.setValue(DataUtils.getKey(null,null, String.valueOf(SecurityUtils.getUserId()),null,null));
List<Gldry> list = gldryService.selectGldryList(gldry);
List<Gldry> list = gldryService.selectGldryListExport(gldry);
List<SysDictData> community = DictUtils.getDictCache("community");
List<SysDictData> committee = DictUtils.getDictCache("committee");
List<SysDictData> street = DictUtils.getDictCache("street_town");
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HscjController.java
View file @ 40acf57f
......@@ -61,7 +61,7 @@ public class HscjController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, Hscj hscj)
{
List<Hscj> list = hscjService.selectHscjList(hscj);
List<Hscj> list = hscjService.selectHscjListExport(hscj);
List<SysDictData> community = DictUtils.getDictCache("community");
List<SysDictData> committee = DictUtils.getDictCache("committee");
List<SysDictData> street = DictUtils.getDictCache("street_town");
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JcglryController.java
View file @ 40acf57f
......@@ -82,7 +82,7 @@ public class JcglryController extends BaseController
jcglry.setValue(DataUtils.getKey(null, String.valueOf(SecurityUtils.getUserId()),null,null,null));
else if ("3".equals(userType))
jcglry.setValue(DataUtils.getKey(null,null, String.valueOf(SecurityUtils.getUserId()),null,null));
List<Jcglry> list = jcglryService.selectJcglryList(jcglry);
List<Jcglry> list = jcglryService.selectJcglryListExport(jcglry);
List<SysDictData> shelters = DictUtils.getDictCache("shelters");
List<SysDictData> isolationPoint = DictUtils.getDictCache("isolation_point");
List<SysDictData> street = DictUtils.getDictCache("street_town");
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/WzzryController.java
View file @ 40acf57f
package com.ruoyi.web.controller.system;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -54,7 +59,45 @@ public class WzzryController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, Wzzry wzzry)
{
List<Wzzry> list = wzzryService.selectWzzryList(wzzry);
List<Wzzry> list = wzzryService.selectWzzryListExport(wzzry);
for (Wzzry wzzry1 : list){
if (StringUtils.isNotEmpty(wzzry1.getCommunity())) {
List<SysDictData> communities = DictUtils.getDictCache("community");
List<String> labels = communities.stream().filter(i -> wzzry1.getCommunity().equals(i.getDictValue()))
.map(SysDictData::getDictLabel).collect(Collectors.toList());
if (!labels.isEmpty()) {
wzzry1.setCommunity(labels.get(0));
} else {
wzzry1.setCommunity("");
}
} else {
wzzry1.setCommunity("");
}
if (StringUtils.isNotEmpty(wzzry1.getCommittee())) {
List<SysDictData> communities = DictUtils.getDictCache("committee");
List<String> labels = communities.stream().filter(i -> wzzry1.getCommittee().equals(i.getDictValue()))
.map(SysDictData::getDictLabel).collect(Collectors.toList());
if (!labels.isEmpty()) {
wzzry1.setCommittee(labels.get(0));
} else {
wzzry1.setCommittee("");
}
} else {
wzzry1.setCommittee("");
}
if (StringUtils.isNotEmpty(wzzry1.getStreet())) {
List<SysDictData> communities = DictUtils.getDictCache("street_town");
List<String> labels = communities.stream().filter(i -> wzzry1.getStreet().equals(i.getDictValue()))
.map(SysDictData::getDictLabel).collect(Collectors.toList());
if (!labels.isEmpty()) {
wzzry1.setStreet(labels.get(0));
} else {
wzzry1.setStreet("");
}
} else {
wzzry1.setStreet("");
}
}
ExcelUtil<Wzzry> util = new ExcelUtil<Wzzry>(Wzzry.class);
util.exportExcel(response, list, "危重症人员数据");
}
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YxryController.java
View file @ 40acf57f
......@@ -76,7 +76,7 @@ public class YxryController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, Yxry yxry)
{
List<Yxry> list = yxryService.selectYxryList(yxry);
List<Yxry> list = yxryService.selectYxryListExport(yxry);
List<SysDictData> community = DictUtils.getDictCache("community");
List<SysDictData> committee = DictUtils.getDictCache("committee");
List<SysDictData> street = DictUtils.getDictCache("street_town");
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Fcry.java
View file @ 40acf57f
package com.ruoyi.system.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -109,6 +111,17 @@ public class Fcry extends BaseEntity
@Transient
private String value;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public String getRemark() {
return remark;
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Fkqk.java
View file @ 40acf57f
package com.ruoyi.system.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.data.annotation.Transient;
/**
* 小区封控情况对象 fkqk
......@@ -89,6 +92,18 @@ public class Fkqk extends BaseEntity
/** 错误提示 */
private String tips;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public String getTips() {
return tips;
}
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Gldry.java
View file @ 40acf57f
package com.ruoyi.system.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -124,6 +126,17 @@ public class Gldry extends BaseEntity
//当前登录人所属value
@Transient
private String value;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public Date getOtherZrTime() {
return otherZrTime;
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Hscj.java
View file @ 40acf57f
package com.ruoyi.system.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.data.annotation.Transient;
/**
* 核酸采集对象 hscj
......@@ -148,6 +151,17 @@ public class Hscj extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public String getCheckCard() {
return checkCard;
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Jcglry.java
View file @ 40acf57f
package com.ruoyi.system.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -118,6 +120,18 @@ public class Jcglry extends BaseEntity
@Transient
private String value;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public void setId(Long id)
{
this.id = id;
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Wzzry.java
View file @ 40acf57f
......@@ -4,6 +4,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.data.annotation.Transient;
import java.util.List;
/**
* 危重症人员对象 wzzry
......@@ -116,8 +119,19 @@ public class Wzzry extends BaseEntity
@Excel(name = "包联人员手机号码")
private String otherPhone;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public void setId(Long id)
public void setId(Long id)
{
this.id = id;
}
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Ycsb.java
View file @ 40acf57f
package com.ruoyi.system.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.data.annotation.Transient;
/**
* 抗原异常上报对象 ycsb
......@@ -102,7 +105,9 @@ public class Ycsb extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
// @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createTime;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
@Override
public Date getCreateTime() {
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Yxry.java
View file @ 40acf57f
......@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -161,11 +163,21 @@ public class Yxry extends BaseEntity
@Transient
private LocalDate date;
/**导出选中IDLIST */
@Transient()
private List<String> idList;
/** 采样时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cyTime;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public void setId(Long id)
{
this.id = id;
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/FcryMapper.java
View file @ 40acf57f
......@@ -30,6 +30,13 @@ public interface FcryMapper
* @return 方舱人员集合
*/
public List<Fcry> selectFcryList(Fcry fcry);
/**
* 查询导出方舱人员列表
*
* @param fcry 方舱人员
* @return 方舱人员集合
*/
public List<Fcry> selectFcryListExport(Fcry fcry);
/**
* 新增方舱人员
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/FkqkMapper.java
View file @ 40acf57f
......@@ -29,6 +29,13 @@ public interface FkqkMapper
* @return 小区封控情况集合
*/
public List<Fkqk> selectFkqkList(Fkqk fkqk);
/**
* 查询导出小区封控情况列表
*
* @param fkqk 小区封控情况
* @return 小区封控情况集合
*/
public List<Fkqk> selectFkqkListExport(Fkqk fkqk);
/**
* 新增小区封控情况
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/GldryMapper.java
View file @ 40acf57f
......@@ -29,6 +29,13 @@ public interface GldryMapper
* @return 隔离点人员集合
*/
public List<Gldry> selectGldryList(Gldry gldry);
/**
* 查询导出隔离点人员列表
*
* @param gldry 隔离点人员
* @return 隔离点人员集合
*/
public List<Gldry> selectGldryListExport(Gldry gldry);
/**
* 新增隔离点人员
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/HscjMapper.java
View file @ 40acf57f
......@@ -28,6 +28,13 @@ public interface HscjMapper
* @return 核酸采集集合
*/
public List<Hscj> selectHscjList(Hscj hscj);
/**
* 查询导出核酸采集列表
*
* @param hscj 核酸采集
* @return 核酸采集集合
*/
public List<Hscj> selectHscjListExport(Hscj hscj);
/**
* 新增核酸采集
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/JcglryMapper.java
View file @ 40acf57f
......@@ -27,6 +27,13 @@ public interface JcglryMapper
* @return 解除隔离人员集合
*/
public List<Jcglry> selectJcglryList(Jcglry jcglry);
/**
* 查询导出解除隔离人员列表
*
* @param jcglry 解除隔离人员
* @return 解除隔离人员集合
*/
public List<Jcglry> selectJcglryListExport(Jcglry jcglry);
/**
* 新增解除隔离人员
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/WzzryMapper.java
View file @ 40acf57f
......@@ -26,6 +26,13 @@ public interface WzzryMapper
* @return 危重症人员集合
*/
public List<Wzzry> selectWzzryList(Wzzry wzzry);
/**
* 查询导出危重症人员列表
*
* @param wzzry 危重症人员
* @return 危重症人员集合
*/
public List<Wzzry> selectWzzryListExport(Wzzry wzzry);
/**
* 新增危重症人员
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/YxryMapper.java
View file @ 40acf57f
......@@ -28,6 +28,13 @@ public interface YxryMapper
* @return 阳性人员集合
*/
public List<Yxry> selectYxryList(Yxry yxry);
/**
* 查询导出阳性人员列表
*
* @param yxry 阳性人员
* @return 阳性人员集合
*/
public List<Yxry> selectYxryListExport(Yxry yxry);
/**
* 新增阳性人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IFcryService.java
View file @ 40acf57f
......@@ -29,6 +29,13 @@ public interface IFcryService
* @return 方舱人员集合
*/
public List<Fcry> selectFcryList(Fcry fcry);
/**
* 查询导出方舱人员列表
*
* @param fcry 方舱人员
* @return 方舱人员集合
*/
public List<Fcry> selectFcryListExport(Fcry fcry);
/**
* 新增方舱人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IFkqkService.java
View file @ 40acf57f
......@@ -28,6 +28,13 @@ public interface IFkqkService
* @return 小区封控情况集合
*/
public List<Fkqk> selectFkqkList(Fkqk fkqk);
/**
* 查询导出小区封控情况列表
*
* @param fkqk 小区封控情况
* @return 小区封控情况集合
*/
public List<Fkqk> selectFkqkListExport(Fkqk fkqk);
/**
* 新增小区封控情况
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IGldryService.java
View file @ 40acf57f
......@@ -29,6 +29,13 @@ public interface IGldryService
* @return 隔离点人员集合
*/
public List<Gldry> selectGldryList(Gldry gldry);
/**
* 查询导出隔离点人员列表
*
* @param gldry 隔离点人员
* @return 隔离点人员集合
*/
public List<Gldry> selectGldryListExport(Gldry gldry);
/**
* 新增隔离点人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IHscjService.java
View file @ 40acf57f
......@@ -29,6 +29,13 @@ public interface IHscjService
* @return 核酸采集集合
*/
public List<Hscj> selectHscjList(Hscj hscj);
/**
* 查询导出核酸采集列表
*
* @param hscj 核酸采集
* @return 核酸采集集合
*/
public List<Hscj> selectHscjListExport(Hscj hscj);
/**
* 新增核酸采集
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IJcglryService.java
View file @ 40acf57f
......@@ -29,6 +29,13 @@ public interface IJcglryService
* @return 解除隔离人员集合
*/
public List<Jcglry> selectJcglryList(Jcglry jcglry);
/**
* 查询导出解除隔离人员列表
*
* @param jcglry 解除隔离人员
* @return 解除隔离人员集合
*/
public List<Jcglry> selectJcglryListExport(Jcglry jcglry);
/**
* 新增解除隔离人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IWzzryService.java
View file @ 40acf57f
......@@ -26,6 +26,13 @@ public interface IWzzryService
* @return 危重症人员集合
*/
public List<Wzzry> selectWzzryList(Wzzry wzzry);
/**
* 查询危重症人员列表
*
* @param wzzry 危重症人员
* @return 危重症人员集合
*/
public List<Wzzry> selectWzzryListExport(Wzzry wzzry);
/**
* 新增危重症人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/IYxryService.java
View file @ 40acf57f
......@@ -31,6 +31,13 @@ public interface IYxryService
* @return 阳性人员集合
*/
public List<Yxry> selectYxryList(Yxry yxry);
/**
* 查询导出阳性人员列表
*
* @param yxry 阳性人员
* @return 阳性人员集合
*/
public List<Yxry> selectYxryListExport(Yxry yxry);
/**
* 新增阳性人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FcryServiceImpl.java
View file @ 40acf57f
......@@ -61,6 +61,18 @@ public class FcryServiceImpl implements IFcryService
{
return fcryMapper.selectFcryList(fcry);
}
/**
* 查询导出方舱人员列表
*
* @param fcry 方舱人员
* @return 方舱人员
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Fcry> selectFcryListExport(Fcry fcry)
{
return fcryMapper.selectFcryListExport(fcry);
}
/**
* 新增方舱人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FkqkServiceImpl.java
View file @ 40acf57f
......@@ -60,6 +60,18 @@ public class FkqkServiceImpl implements IFkqkService
{
return fkqkMapper.selectFkqkList(fkqk);
}
/**
* 查询导出小区封控情况列表
*
* @param fkqk 小区封控情况
* @return 小区封控情况
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Fkqk> selectFkqkListExport(Fkqk fkqk)
{
return fkqkMapper.selectFkqkListExport(fkqk);
}
/**
* 新增小区封控情况
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GldryServiceImpl.java
View file @ 40acf57f
......@@ -63,6 +63,18 @@ public class GldryServiceImpl implements IGldryService
{
return gldryMapper.selectGldryList(gldry);
}
/**
* 查询导出隔离点人员列表
*
* @param gldry 隔离点人员
* @return 隔离点人员
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Gldry> selectGldryListExport(Gldry gldry)
{
return gldryMapper.selectGldryListExport(gldry);
}
/**
* 新增隔离点人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HscjServiceImpl.java
View file @ 40acf57f
......@@ -55,6 +55,17 @@ public class HscjServiceImpl implements IHscjService {
public List<Hscj> selectHscjList(Hscj hscj) {
return hscjMapper.selectHscjList(hscj);
}
/**
* 查询导出核酸采集列表
*
* @param hscj 核酸采集
* @return 核酸采集
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Hscj> selectHscjListExport(Hscj hscj) {
return hscjMapper.selectHscjListExport(hscj);
}
/**
* 新增核酸采集
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/JcglryServiceImpl.java
View file @ 40acf57f
......@@ -140,6 +140,56 @@ public class JcglryServiceImpl implements IJcglryService
}
return list;
}
/**
* 查询导出解除隔离人员列表
*
* @param jcglry 解除隔离人员
* @return 解除隔离人员
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Jcglry> selectJcglryListExport(Jcglry jcglry)
{
List<Jcglry> list = jcglryMapper.selectJcglryListExport(jcglry);
for (Jcglry yx : list) {
// 根据身份证号查询方舱人员信息
List<Fcry> fcries = fcryMapper.selectFcryByCard(yx.getCardNo());
// 根据身份证号查询隔离人员
List<Gldry> gldries = gldryMapper.selectGldryByCard(yx.getCardNo(),null);
Fcry fcry = null;
Gldry gldry = null;
if (!fcries.isEmpty())
fcry = fcries.stream().max(Comparator.comparing(Fcry::getZrTime)).get();
if (!gldries.isEmpty())
gldry = gldries.stream().max(Comparator.comparing(Gldry::getZrTime)).get();
//0=是,1=否
if (fcry!=null && gldry!=null) {
//相等则返回0，date1大返回1，否则返回-1。
if (fcry.getZrTime().compareTo(gldry.getZrTime()) > 0){
if (null!=fcry.getZcTime())
yx.setZyStatus("0");
else
yx.setZyStatus("1");
} else {
if (null!=gldry.getZcTime())
yx.setZyStatus("0");
else
yx.setZyStatus("1");
}
} else if (fcry!=null) {
if (null!=fcry.getZcTime())
yx.setZyStatus("0");
else
yx.setZyStatus("1");
} else if (gldry!=null) {
if (null!=gldry.getZcTime())
yx.setZyStatus("0");
else
yx.setZyStatus("1");
}
}
return list;
}
/**
* 新增解除隔离人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WzzryServiceImpl.java
View file @ 40acf57f
......@@ -49,6 +49,18 @@ public class WzzryServiceImpl implements IWzzryService
{
return wzzryMapper.selectWzzryList(wzzry);
}
/**
* 查询导出危重症人员列表
*
* @param wzzry 危重症人员
* @return 危重症人员
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Wzzry> selectWzzryListExport(Wzzry wzzry)
{
return wzzryMapper.selectWzzryListExport(wzzry);
}
/**
* 新增危重症人员
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YxryServiceImpl.java
View file @ 40acf57f
......@@ -79,6 +79,17 @@ public class YxryServiceImpl implements IYxryService {
public List<Yxry> selectYxryList(Yxry yxry) {
return yxryMapper.selectYxryList(yxry);
}
/**
* 查询导出阳性人员列表
*
* @param yxry 阳性人员
* @return 阳性人员
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Yxry> selectYxryListExport(Yxry yxry) {
return yxryMapper.selectYxryListExport(yxry);
}
/**
* 新增阳性人员
......
ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml
View file @ 40acf57f
......@@ -87,7 +87,42 @@
<if test="phone != null and phone != ''">and a.phone like concat('%', #{phone}, '%')</if>
<if test="area != null and area != ''">and a.area = #{area}</if>
<if test="street != null and street != ''">and a.street = #{street}</if>
<if test="community != null and community != ''">and a.community like concat('%', #{community}, '%')</if>
<if test="community != null and community != ''">and a.community = #{community}</if>
<if test="unit != null and unit != ''">and a.unit like concat('%', #{unit}, '%')</if>
<if test="zrTime != null ">and a.zr_time = #{zrTime}</if>
<if test="zcTime != null ">and a.zc_time = #{zcTime}</if>
<if test="glPlace != null and glPlace != ''">and a.gl_place like concat('%', #{glPlace}, '%')</if>
<if test="status != null and status != ''">and a.status = #{status}</if>
<if test="userType != null and userType == '00'.toString()">${params.dataScope}</if>
<if test="userType != null and userType == '2'.toString()">and a.street = #{value}</if>
<if test="userType != null and userType == '3'.toString()">and a.committee = #{value}</if>
order by a.create_time desc
</select>
<select id="selectFcryListExport" parameterType="Fcry" resultMap="FcryResult">
select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community, a.unit,
a.zr_time,
a.zc_time, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
a.remark ,a.check_card ,a.people_type ,a.is_positive ,a.positive_only ,a.committee ,a.floor ,a.doorplate,
a.other_fc_time,a.other_gld_time from fcry a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="fcPlace != null and fcPlace != ''">and a.fc_place = #{fcPlace}</if>
<if test="room != null and room != ''">and a.room like concat('%', #{room}, '%')</if>
<if test="floor != null and floor != ''">and a.floor like concat('%', #{floor}, '%')</if>
<if test="doorplate != null and doorplate != ''">and a.doorplate like concat('%', #{doorplate}, '%')</if>
<if test="jzName != null and jzName != ''">and a.jz_name like concat('%', #{jzName}, '%')</if>
<if test="cardNo != null and cardNo != ''">and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''">and a.phone like concat('%', #{phone}, '%')</if>
<if test="area != null and area != ''">and a.area = #{area}</if>
<if test="street != null and street != ''">and a.street = #{street}</if>
<if test="community != null and community != ''">and a.community = #{community}</if>
<if test="unit != null and unit != ''">and a.unit like concat('%', #{unit}, '%')</if>
<if test="zrTime != null ">and a.zr_time = #{zrTime}</if>
<if test="zcTime != null ">and a.zc_time = #{zcTime}</if>
......
ruoyi-system/src/main/resources/mapper/system/FkqkMapper.xml
View file @ 40acf57f
......@@ -52,6 +52,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
order by a.create_time desc
</select>
<select id="selectFkqkListExport" parameterType="Fkqk" resultMap="FkqkResult">
select a.id,a.area, a.street, a.community, a.unit, a.fk_time, a.jf_time, a.status, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark,
a.committee,a.floor,a.fk_detailed,a.fk_hs,a.fk_rs,a.is_jf,a.real_time,a.hs_time,a.level
from fkqk a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="street != null and street != ''"> and a.street = #{street}</if>
<if test="community != null and community != ''"> and a.community = #{community}</if>
<if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
<if test="fkTime != null "> and a.fk_time = #{fkTime}</if>
<if test="jfTime != null "> and a.jf_time = #{jfTime}</if>
<if test="floor != null and floor != ''"> and a.floor like concat('%', #{floor}, '%')</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
${params.dataScope}
order by a.create_time desc
</select>
<select id="selectFkqkById" parameterType="Long" resultMap="FkqkResult">
<include refid="selectFkqkVo"/>
......
ruoyi-system/src/main/resources/mapper/system/GldryMapper.xml
View file @ 40acf57f
......@@ -56,6 +56,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="street != null and street != ''"> and a.street = #{street}</if>
<if test="community != null and community != ''"> and a.community = #{community}</if>
<if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
<if test="buildingNo != null and buildingNo != ''"> and a.building_no like concat('%', #{buildingNo}, '%')</if>
<if test="unitNo != null and unitNo != ''"> and a.unit_no like concat('%', #{unitNo}, '%')</if>
<if test="houseNo != null and houseNo != ''"> and a.house_no like concat('%', #{houseNo}, '%')</if>
<if test="zrTime != null "> and a.zr_time = #{zrTime}</if>
<if test="zcTime != null "> and a.zc_time = #{zcTime}</if>
<if test="otherZrTime != null "> and a.other_zr_time = #{otherZrTime}</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="userType != null and userType == '00'.toString()"> ${params.dataScope} </if>
<if test="userType != null and userType == '2'.toString()"> and a.street = #{value} </if>
<if test="userType != null and userType == '3'.toString()"> and a.committee = #{value} </if>
order by a.create_time desc
</select>
<select id="selectGldryListExport" parameterType="Gldry" resultMap="GldryResult">
select a.id, a.gl_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community, a.unit, a.zr_time,
a.zc_time, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark ,
a.is_yx,a.building_no,a.house_no,a.unit_no,a.committee,a.check_card,a.other_zr_time
from gldry a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="glPlace != null and glPlace != ''"> and a.gl_place like concat('%', #{glPlace}, '%')</if>
<if test="room != null and room != ''"> and a.room like concat('%', #{room}, '%')</if>
<if test="jzName != null and jzName != ''"> and a.jz_name like concat('%', #{jzName}, '%')</if>
<if test="cardNo != null and cardNo != ''"> and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
<if test="area != null and area != ''"> and a.area = #{area}</if>
<if test="street != null and street != ''"> and a.street = #{street}</if>
<if test="community != null and community != ''"> and a.community = #{community}</if>
<if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
<if test="buildingNo != null and buildingNo != ''"> and a.building_no like concat('%', #{buildingNo}, '%')</if>
<if test="unitNo != null and unitNo != ''"> and a.unit_no like concat('%', #{unitNo}, '%')</if>
<if test="houseNo != null and houseNo != ''"> and a.house_no like concat('%', #{houseNo}, '%')</if>
<if test="zrTime != null "> and a.zr_time = #{zrTime}</if>
<if test="zcTime != null "> and a.zc_time = #{zcTime}</if>
<if test="otherZrTime != null "> and a.other_zr_time = #{otherZrTime}</if>
......
ruoyi-system/src/main/resources/mapper/system/HscjMapper.xml
View file @ 40acf57f
......@@ -111,6 +111,46 @@
${params.dataScope}
order by a.create_time desc
</select>
<select id="selectHscjListExport" parameterType="Hscj" resultMap="HscjResult">
select a.id, a.province, a.city, a.area, a.street, a.community, a.cj_place, a.cjgh, a.user_name, a.card_no,
a.phone,a.committee,a.cj_result,a.check_card,a.is_hun,
a.sex, a.address, a.age, a.category, a.cj_time, a.cj_name, a.cj_phone, a.b_type, a.laboratory, a.jc_time,
a.rygx, a.boxhao, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark from
hscj a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="city != null and city != ''">and a.city like concat('%', #{city}, '%')</if>
<if test="area != null and area != ''">and a.area = #{area}</if>
<if test="street != null and street != ''">and a.street = #{street}</if>
<if test="community != null">and a.community = #{community}</if>
<if test="cjPlace != null and cjPlace != ''">and a.cj_place like concat('%', #{cjPlace}, '%')</if>
<if test="cjgh != null and cjgh != ''">and a.cjgh like concat('%', #{cjgh}, '%')</if>
<if test="userName != null and userName != ''">and a.user_name like concat('%', #{userName}, '%')</if>
<if test="cardNo != null and cardNo != ''">and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''">and a.phone like concat('%', #{phone}, '%')</if>
<if test="sex != null and sex != ''">and a.sex = #{sex}</if>
<if test="address != null and address != ''">and a.address like concat('%', #{address}, '%')</if>
<if test="age != null ">and a.age = #{age}</if>
<if test="category != null and category != ''">and a.category like concat('%', #{category}, '%')</if>
<if test="cjTime != null ">and a.cj_time = #{cjTime}</if>
<if test="cjName != null and cjName != ''">and a.cj_name like concat('%', #{cjName}, '%')</if>
<if test="cjPhone != null and cjPhone != ''">and a.cj_phone like concat('%', #{cjPhone}, '%')</if>
<if test="bblx != null and bblx != ''">and a.b_type like concat('%', #{bblx}, '%')</if>
<if test="laboratory != null and laboratory != ''">and a.laboratory like concat('%', #{laboratory}, '%')</if>
<if test="jcTime != null ">and a.jc_time = #{jcTime}</if>
<if test="rygx != null and rygx != ''">and a.rygx like concat('%', #{rygx}, '%')</if>
<if test="boxhao != null and boxhao != ''">and a.boxhao like concat('%', #{boxhao}, '%')</if>
<if test="status != null and status != ''">and a.status = #{status}</if>
${params.dataScope}
order by a.create_time desc
</select>
<select id="selectHscjById" parameterType="Long" resultMap="HscjResult">
<include refid="selectHscjVo"/>
......
ruoyi-system/src/main/resources/mapper/system/JcglryMapper.xml
View file @ 40acf57f
......@@ -70,7 +70,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userType != null and userType == '3'.toString()"> and a.committee = #{value} </if>
order by a.create_time desc
</select>
<select id="selectJcglryListExport" parameterType="Jcglry" resultMap="JcglryResult">
select a.id, a.is_area, a.name, a.gl_place, a.rz_time, a.jc_time, a.rylb, a.card_no, a.phone, a.street,
a.committee, a.community, a.address, a.zy_status, a.arrange_drivers, a.bz_street, a.bz_address,
a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.unit, a.house, a.building
from jcglry a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isArea != null and isArea != ''"> and a.is_area = #{isArea}</if>
<if test="name != null and name != ''"> and a.name like concat('%', #{name}, '%')</if>
<if test="glPlace != null and glPlace != ''"> and a.gl_place = #{glPlace}</if>
<if test="rzTime != null "> and a.rz_time = #{rzTime}</if>
<if test="jcTime != null "> and a.jc_time = #{jcTime}</if>
<if test="rylb != null and rylb != ''"> and a.rylb like concat('%', #{rylb}, '%')</if>
<if test="cardNo != null and cardNo != ''"> and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
<if test="street != null and street != ''"> and a.street = #{street}</if>
<if test="committee != null and committee != ''"> and a.committee = #{committee}</if>
<if test="community != null and community != ''"> and a.community = #{community}</if>
<if test="address != null and address != ''"> and a.address like concat('%', #{address}, '%')</if>
<if test="zyStatus != null and zyStatus != ''"> and a.zy_status = #{zyStatus}</if>
<if test="arrangeDrivers != null and arrangeDrivers != ''"> and a.arrange_drivers = #{arrangeDrivers}</if>
<if test="bzStreet != null and bzStreet != ''"> and a.bz_street like concat('%', #{bzStreet}, '%')</if>
<if test="bzAddress != null and bzAddress != ''"> and a.bz_address like concat('%', #{bzAddress}, '%')</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="userType != null and userType == '00'.toString()"> ${params.dataScope} </if>
<if test="userType != null and userType == '2'.toString()"> and a.street = #{value} </if>
<if test="userType != null and userType == '3'.toString()"> and a.committee = #{value} </if>
order by a.create_time desc
</select>
<select id="selectJcglryById" parameterType="Long" resultMap="JcglryResult">
<include refid="selectJcglryVo"/>
where id = #{id}
......
ruoyi-system/src/main/resources/mapper/system/WzzryMapper.xml
View file @ 40acf57f
......@@ -78,7 +78,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
order by a.create_time desc
</select>
<select id="selectWzzryListExport" parameterType="Wzzry" resultMap="WzzryResult">
select a.id, a.user_name, a.card_no, a.phone, a.street, a.committee, a.community, a.building, a.unit, a.floor,
a.house, a.address, a.basic_disease, a.is_care, a.cohabitants_number, a.status, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.remark,a.user_style, a.other_situation, a.basic_disease_detail,
a.hospital, a.is_self, a.situation_true, a.other_name, a.other_phone from wzzry a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="userName != null and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
<if test="cardNo != null and cardNo != ''"> and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
<if test="street != null and street != ''"> and a.street = #{street}</if>
<if test="committee != null and committee != ''"> and a.committee = #{committee}</if>
<if test="community != null and community != ''"> and a.community = #{community}</if>
<if test="building != null and building != ''"> and a.building like concat('%', #{building}, '%')</if>
<if test="unit != null and unit != ''"> and a.unit like concat('%', #{unit}, '%')</if>
<if test="floor != null and floor != ''"> and a.floor = #{floor}</if>
<if test="house != null and house != ''"> and a.house like concat('%', #{house}, '%')</if>
<if test="address != null and address != ''"> and a.address like concat('%', #{address}, '%')</if>
<if test="basicDisease != null and basicDisease != ''"> and a.basic_disease = #{basicDisease}</if>
<if test="isCare != null and isCare != ''"> and a.is_care = #{isCare}</if>
<if test="cohabitantsNumber != null "> and a.cohabitants_number like concat('%', #{cohabitantsNumber}, '%')</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="userStyle != null and userStyle != ''"> and a.user_style = #{userStyle}</if>
<if test="otherSituation != null and otherSituation != ''"> and a.other_situation = #{otherSituation}</if>
<if test="basicDiseaseDetail != null and basicDiseaseDetail != ''"> and a.basic_disease_detail = #{basicDiseaseDetail}</if>
<if test="hospital != null and hospital != ''"> and a.hospital = #{hospital}</if>
<if test="isSelf != null and isSelf != ''"> and a.is_self = #{isSelf}</if>
<if test="situationTrue != null and situationTrue != ''"> and a.situation_true = #{situationTrue}</if>
<if test="otherName != null and otherName != ''"> and a.other_name like concat('%', #{otherName}, '%')</if>
<if test="otherPhone != null and otherPhone != ''"> and a.other_phone = #{otherPhone}</if>
${params.dataScope}
order by a.create_time desc
</select>
<select id="selectWzzryById" parameterType="Long" resultMap="WzzryResult">
<include refid="selectWzzryVo"/>
where id = #{id}
......
ruoyi-system/src/main/resources/mapper/system/YcsbMapper.xml
View file @ 40acf57f
......@@ -74,6 +74,34 @@
${params.dataScope}
order by a.is_handle desc,a.create_time desc
</select>
<select id="selectYcsbListExport" parameterType="Ycsb" resultMap="YcsbResult">
select a.id, a.sb_date, a.user_name, a.card_no, a.phone, a.area, a.street,a.committee, a.community, a.unit,a.check_card,
a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.address,a.house,
a.building,a.is_handle,a.ky_result
from ycsb a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="sbDate != null ">and a.sb_date = #{sbDate}</if>
<if test="userName != null and userName != ''">and a.user_name like concat('%', #{userName}, '%')</if>
<if test="cardNo != null and cardNo != ''">and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''">and a.phone like concat('%', #{phone}, '%')</if>
<if test="area != null and area != ''">and a.area = #{area}</if>
<if test="street != null and street != ''">and a.street = #{street}</if>
<if test="community != null ">and a.community = #{community}</if>
<if test="committee != null and committee != ''">and a.committee like concat('%', #{committee}, '%')</if>
<if test="unit != null and unit != ''">and a.unit like concat('%', #{unit}, '%')</if>
<if test="hasAcid != null and hasAcid != ''">and a.has_acid like concat('%', #{hasAcid}, '%')</if>
<if test="status != null and status != ''">and a.status = #{status}</if>
${params.dataScope}
order by a.is_handle desc,a.create_time desc
</select>
<select id="selectYcsbById" parameterType="Long" resultMap="YcsbResult">
<include refid="selectYcsbVo"/>
......
ruoyi-system/src/main/resources/mapper/system/YxryMapper.xml
View file @ 40acf57f
......@@ -122,6 +122,46 @@
${params.dataScope}
order by a.sb_date desc ,a.id desc
</select>
<select id="selectYxryListExport" parameterType="Yxry" resultMap="YxryResult">
select a.id, a.sb_date, a.committee,
a.fc_name,
a.gl_name,a.cy_time,
a.is_cf,a.ldry, a.user_name, a.card_no, a.phone, a.area, a.street, a.isolation_status,
a.is_control, a.community, a.unit, a.has_acid, a.status, a.del_flag, a.create_by, a.house, a.building,
a.create_time, a.update_by, a.update_time, a.remark ,a.gl_place,
a.address,a.is_yz,a.is_yin,
a.is_home,a.risk_source,a.user_type,a.zy_time,a.check_card,a.gl_name,a.fc_name,a.floor,a.is_deisolation
from yxry a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
<if test="idList != null ">
and a.id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="sbDate != null ">and a.sb_date = #{sbDate}</if>
<if test="cyTime != null ">and a.cy_time = #{cyTime}</if>
<if test="ldry != null and ldry != ''">and a.ldry like concat('%', #{ldry}, '%')</if>
<if test="userName != null and userName != ''">and a.user_name like concat('%', #{userName}, '%')</if>
<if test="cardNo != null and cardNo != ''">and a.card_no like concat('%', #{cardNo}, '%')</if>
<if test="phone != null and phone != ''">and a.phone like concat('%', #{phone}, '%')</if>
<if test="area != null and area != ''">and a.area = #{area}</if>
<if test="street != null and street != ''">and a.street = #{street}</if>
<if test="isolationStatus != null and isolationStatus != ''">and a.isolation_status = #{isolationStatus}</if>
<if test="isControl != null and isControl != ''">and a.is_control = #{isControl}</if>
<if test="community != null and community != ''">and a.community = #{community}</if>
<if test="unit != null and unit != ''">and a.unit like concat('%', #{unit}, '%')</if>
<if test="house != null and house != ''">and a.house like concat('%', #{house}, '%')</if>
<if test="building != null and building != ''">and a.building like concat('%', #{building}, '%')</if>
<if test="hasAcid != null and hasAcid != ''">and a.has_acid like concat('%', #{hasAcid}, '%')</if>
<if test="glPlace != null and glPlace != ''">and a.gl_place like concat('%', #{glPlace}, '%')</if>
<if test="status != null and status != ''">and a.status = #{status}</if>
<if test="isYz != null and isYz != ''">and a.is_yz = #{isYz}</if>
${params.dataScope}
order by a.sb_date desc ,a.id desc
</select>
<select id="selectYxryById" parameterType="Long" resultMap="YxryResult">
<include refid="selectYxryVo"/>
......
ruoyi-ui/src/views/system/wzzry/index.vue
View file @ 40acf57f
......@@ -26,6 +26,26 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="街道/镇" prop="street">
<el-select v-model="queryParams.street" placeholder="请选择街道/镇" clearable>
<el-option
v-for="dict in dict.type.street_town"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="居委会" prop="committee">
<el-select v-model="queryParams.committee" placeholder="请选择居委会" clearable>
<el-option
v-for="dict in dict.type.committee"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="楼号" prop="building">
<el-input
v-model="queryParams.building"
......@@ -105,16 +125,16 @@
v-hasPermi="['system:wzzry:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:wzzry:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:wzzry:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -1070,7 +1090,7 @@ export default {
}
this.download('system/wzzry/export', {
...this.queryParams
}, `wzzry_${new Date().getTime()}.xlsx`)
}, `危重症人员数据.xlsx`)
}
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment