Skip to content

D
data_management_system
Commit 1bf16cf2 authored by zhuangxinwei's avatar zhuangxinwei
Browse files
Options

Merge remote-tracking branch 'origin/master' into master

parents 163dd1ca 4f33e906
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 54 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GldryController.java
View file @ 1bf16cf2
......@@ -56,22 +56,18 @@ public class GldryController extends BaseController
}
@Log(title = "导出隔离点人员导入空模板",businessType = BusinessType.EXPORT)
@GetMapping("/exportTemplate")
@GetMapping("/importTemplate")
public void exportTemplate(HttpServletResponse response){
ExcelUtil<Gldry> util = new ExcelUtil<Gldry>(Gldry.class);
util.importTemplateExcel(response,"隔离点人员数据导入空模板");
}
@Log(title = "导入隔离点人员数据",businessType = BusinessType.EXPORT)
@PostMapping("/importGldryData")
@ResponseBody
public AjaxResult importGldryData(MultipartFile file, HttpServletResponse response) throws Exception{
@PostMapping("/importData")
public void importGldryData(MultipartFile file, HttpServletResponse response) throws Exception{
ExcelUtil<Gldry> util = new ExcelUtil<Gldry>(Gldry.class);
List<Gldry> dataList = util.importExcel(file.getInputStream());
gldryService.importList(dataList,response);
String message = "导入隔离点人员数据";
return AjaxResult.success(message);
}
/**
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HscjController.java
View file @ 1bf16cf2
......@@ -56,23 +56,19 @@ public class HscjController extends BaseController
}
@Log(title = "导出核酸采集导入空模板",businessType = BusinessType.EXPORT)
@GetMapping("/exportTemplate")
@GetMapping("/importTemplate")
public void exportTemplate(HttpServletResponse response){
ExcelUtil<Hscj> util = new ExcelUtil<Hscj>(Hscj.class);
util.importTemplateExcel(response,"核酸采集导入空模板");
}
@Log(title = "导入核算采集数据",businessType = BusinessType.EXPORT)
@PostMapping("/importHsjcData")
@ResponseBody
public AjaxResult importHsjcData(MultipartFile file,HttpServletResponse response) throws Exception{
@PostMapping("/importData")
public void importHscjData(MultipartFile file,HttpServletResponse response) throws Exception{
ExcelUtil<Hscj> util = new ExcelUtil<Hscj>(Hscj.class);
List<Hscj> dataList = util.importExcel(file.getInputStream());
System.out.println(dataList);
hscjService.importList(dataList,response);
String message = "导入核算采集数据";
return AjaxResult.success(message);
}
/**
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YxryController.java
View file @ 1bf16cf2
......@@ -113,7 +113,7 @@ public class YxryController extends BaseController
}
@PostMapping("/importTemplate")
@PreAuthorize("@ss.hasPermi('system:yxry:add')")
@PreAuthorize("@ss.hasPermi('system:yxry:import')")
@Log(title = "下载阳性人员模板", businessType = BusinessType.IMPORT)
public void importTemplate(HttpServletResponse response) throws Exception {
ExcelUtil<Yxry> util = new ExcelUtil<Yxry>(Yxry.class);
......@@ -143,7 +143,7 @@ public class YxryController extends BaseController
}
@Log(title = "导入阳性人员", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:yxry:add')")
@PreAuthorize("@ss.hasPermi('system:yxry:import')")
@PostMapping("/importData")
public void importData(MultipartFile file, HttpServletResponse response) throws Exception
{
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/YxryMapper.java
View file @ 1bf16cf2
......@@ -2,6 +2,8 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.Yxry;
import com.ruoyi.system.domain.Zlqk;
import org.apache.ibatis.annotations.Param;
/**
* 阳性人员Mapper接口
......@@ -58,4 +60,8 @@ public interface YxryMapper
* @return 结果
*/
public int deleteYxryByIds(Long[] ids);
List<Yxry> selectYxryByCard(String cardNo);
int insertBatchYxry(@Param("list")List<Yxry> list);
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HscjServiceImpl.java
View file @ 1bf16cf2
......@@ -3,12 +3,14 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CheckUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.Zlqk;
import com.ruoyi.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.SecurityUtils;
......@@ -30,6 +32,8 @@ public class HscjServiceImpl implements IHscjService
{
@Autowired
private HscjMapper hscjMapper;
@Autowired
private SysDictDataMapper sysDictDataMapper;
/**
* 查询核酸采集
......@@ -146,6 +150,16 @@ public class HscjServiceImpl implements IHscjService
if (!hscjs.isEmpty()){
failureList.add(hscj);
}else {
if (StringUtils.isNotEmpty(hscj.getStreet())){
List<SysDictData> dictDataList = sysDictDataMapper.selectDictDataByType("street_town");
String street = hscj.getStreet();
for (SysDictData sysDictData:dictDataList){
if (sysDictData.getDictLabel().equals(street)){
street = sysDictData.getDictValue();
}
}
hscj.setStreet(street);
}
if (CheckUtils.checkCard(hscj.getCardNo())){
if (hscj.getSex().equals("女")){
hscj.setSex("1");
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YxryServiceImpl.java
View file @ 1bf16cf2
......@@ -123,39 +123,43 @@ public class YxryServiceImpl implements IYxryService
List<Yxry> trueList = new ArrayList<>();
List<Yxry> failureList = new ArrayList<>();
for (Yxry zlqk : list) {
// if (StringUtils.isNotEmpty(zlqk.getCardNo()) && StringUtils.isNotEmpty(zlqk.getUserName())
// &&StringUtils.isNotEmpty(zlqk.getPhone()) && zlqk.getSbDate() != null
// &&StringUtils.isNotEmpty(zlqk.getRemark()) && StringUtils.isNotEmpty(zlqk.getMedication())){
// //校验身份证是否重复
// List<Zlqk> zlqks = zlqkMapper.selectZlqkByCard(zlqk.getCardNo());
// if (!zlqks.isEmpty())
// failureList.add(zlqk);
// else {
// zlqks = list.stream().filter(l -> zlqk.getCardNo().equals(l.getCardNo())).collect(Collectors.toList());
// if (zlqks.size()>1)
// failureList.add(zlqk);
// else {
// if (CheckUtils.checkCard(zlqk.getCardNo()))
// zlqk.setCheckCard("正确");
// else
// zlqk.setCheckCard("不正确");
// trueList.add(zlqk);
// }
// }
// } else if (StringUtils.isEmpty(zlqk.getCardNo()) || StringUtils.isEmpty(zlqk.getUserName())
// &&StringUtils.isEmpty(zlqk.getPhone()) || zlqk.getSbDate() == null
// &&StringUtils.isEmpty(zlqk.getRemark()) || StringUtils.isEmpty(zlqk.getMedication())) {
// continue;
// } else {
// failureList.add(zlqk);
// }
if (StringUtils.isNotEmpty(zlqk.getCardNo()) && StringUtils.isNotEmpty(zlqk.getUserName())
&&StringUtils.isNotEmpty(zlqk.getPhone())
&&StringUtils.isNotEmpty(zlqk.getIsYin()) && StringUtils.isNotEmpty(zlqk.getGlPlace())){
//校验身份证是否重复
List<Yxry> zlqks = yxryMapper.selectYxryByCard(zlqk.getCardNo());
if (!zlqks.isEmpty())
failureList.add(zlqk);
else {
zlqks = list.stream().filter(l -> zlqk.getCardNo().equals(l.getCardNo())).collect(Collectors.toList());
if (zlqks.size()>1)
failureList.add(zlqk);
else {
if (!CheckUtils.checkPhone(zlqk.getPhone())) {
failureList.add(zlqk);
} else {
if (CheckUtils.checkCard(zlqk.getCardNo()))
zlqk.setCheckCard("正确");
else
zlqk.setCheckCard("不正确");
trueList.add(zlqk);
}
}
}
} else if (StringUtils.isEmpty(zlqk.getCardNo()) && StringUtils.isEmpty(zlqk.getUserName())
&&StringUtils.isEmpty(zlqk.getPhone())
&&StringUtils.isEmpty(zlqk.getIsYin()) && StringUtils.isEmpty(zlqk.getGlPlace())) {
continue;
} else {
failureList.add(zlqk);
}
}
if (!trueList.isEmpty()){
for (Yxry zlqk : trueList) {
zlqk.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
zlqk.setCreateTime(DateUtils.getNowDate());
}
// zlqkMapper.insertBatchZlqk(trueList);
yxryMapper.insertBatchYxry(trueList);
}
if (!failureList.isEmpty()) {
ExcelUtil<Yxry> util = new ExcelUtil<Yxry>(Yxry.class);
......
ruoyi-system/src/main/resources/mapper/system/YxryMapper.xml
View file @ 1bf16cf2
......@@ -30,17 +30,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="address" column="address" />
<result property="isYz" column="is_yz" />
<result property="isYin" column="is_yin" />
<result property="fcName" column="fc_name" />
<result property="glName" column="gl_name" />
<result property="checkCard" column="check_card" />
<result property="zyTime" column="zy_time" />
<result property="userType" column="user_type" />
<result property="riskSource" column="risk_source" />
<result property="isHome" column="is_home" />
</resultMap>
<sql id="selectYxryVo">
select id, sb_date, ldry, user_name, card_no, phone, area, street, isolation_status, is_control, community, unit,house,building,
has_acid, gl_place, status, del_flag, create_by, create_time, update_by, update_time, remark, address, is_yz from yxry
has_acid, gl_place, status, del_flag, create_by, create_time, update_by, update_time, remark, address, is_yz,is_yin,
is_home,risk_source,user_type,zy_time,check_card,gl_name,fc_name from yxry
</sql>
<select id="selectYxryList" parameterType="Yxry" resultMap="YxryResult">
select a.id, a.sb_date, 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 ,CONCAT(f.fc_place,f.room) gl_place, a.address,a.is_yz
a.create_time, a.update_by, a.update_time, a.remark ,CONCAT(f.fc_place,f.room) 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
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
......@@ -72,6 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="selectYxryByCard" resultType="com.ruoyi.system.domain.Yxry" parameterType="java.lang.String">
<include refid="selectYxryVo"/>
where del_flag = '0' and card_no = #{cardNo}
</select>
<insert id="insertYxry" parameterType="Yxry" useGeneratedKeys="true" keyProperty="id">
insert into yxry
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -98,6 +113,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="isYz != null">is_yz,</if>
<if test="isYin != null">is_yin,</if>
<if test="isHome != null">is_home,</if>
<if test="riskSource != null">risk_source,</if>
<if test="userType != null">user_type,</if>
<if test="zyTime != null">zy_time,</if>
<if test="checkCard != null">check_card,</if>
<if test="glName != null">gl_name,</if>
<if test="fcName != null">fc_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sbDate != null">#{sbDate},</if>
......@@ -123,9 +146,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="isYz != null">#{isYz},</if>
<if test="isYin != null">#{isYin},</if>
<if test="isHome != null">#{isHome},</if>
<if test="riskSource != null">#{riskSource},</if>
<if test="userType != null">#{userType},</if>
<if test="zyTime != null">#{zyTime},</if>
<if test="checkCard != null">#{checkCard},</if>
<if test="glName != null">#{glName},</if>
<if test="fcName != null">#{fcName},</if>
</trim>
</insert>
<insert id="insertBatchYxry" parameterType="com.ruoyi.system.domain.Yxry">
insert into yxry (sb_date,ldry,user_name,card_no,phone,area,street,isolation_status,is_control,community,unit,building,
house,has_acid,gl_place,create_by,create_time,remark,is_yz,is_yin,is_home,
risk_source,user_type,zy_time,check_card,gl_name,fc_name) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.sbDate},#{item.ldry},#{item.userName},#{item.cardNo},#{item.phone},#{item.area},#{item.street},
#{item.isolationStatus},#{item.isControl},#{item.community},#{item.unit},#{item.building},#{item.house},
#{item.hasAcid},#{item.glPlace},#{item.createBy},#{item.createTime},#{item.remark},#{item.isYz},#{item.isYin},
#{item.isHome},#{item.riskSource},#{item.userType},#{item.zyTime},#{item.checkCard},#{item.glName},#{item.fcName})
</foreach>
</insert>
<update id="updateYxry" parameterType="Yxry">
update yxry
<trim prefix="SET" suffixOverrides=",">
......@@ -152,6 +195,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="isYz != null">is_yz = #{isYz},</if>
<if test="isYin != null">is_yin = #{isYin},</if>
<if test="isHome != null">is_home = #{isHome},</if>
<if test="riskSource != null">risk_source = #{riskSource},</if>
<if test="userType != null">user_type = #{userType},</if>
<if test="zyTime != null">zy_time = #{zyTime},</if>
<if test="checkCard != null">check_card = #{checkCard},</if>
<if test="glName != null">gl_name = #{glName},</if>
<if test="fcName != null">fc_name = #{fcName},</if>
</trim>
where id = #{id}
</update>
......
ruoyi-ui/src/api/system/gldry.js
View file @ 1bf16cf2
......@@ -42,3 +42,23 @@ export function delGldry(id) {
method: 'delete'
})
}
// 下载导入模板
export function importTemplate(params) {
return request({
url: '/system/gldry/importTemplate',
method: 'get',
responseType: 'blob',
params
})
}
// 导入用户信息
export function importExcel(data) {
return request({
url: '/system/gldry/importData',
method: 'post',
responseType: 'blob',
data
})
}
ruoyi-ui/src/api/system/hscj.js
View file @ 1bf16cf2
......@@ -42,3 +42,23 @@ export function delHscj(id) {
method: 'delete'
})
}
// 下载导入模板
export function importTemplate(params) {
return request({
url: '/system/hscj/importTemplate',
method: 'get',
responseType: 'blob',
params
})
}
// 导入用户信息
export function importExcel(data) {
return request({
url: '/system/hscj/importData',
method: 'post',
responseType: 'blob',
data
})
}
ruoyi-ui/src/views/system/gldry/index.vue
View file @ 1bf16cf2
......@@ -348,7 +348,7 @@
<script>
import { listGldry, getGldry, delGldry, addGldry, updateGldry } from "@/api/system/gldry";
import { getToken } from '@/utils/auth'
import { importTemplate, importExcel } from "@/api/system/zlqk";
import { importTemplate, importExcel } from "@/api/system/gldry";
export default {
name: "Gldry",
......@@ -370,7 +370,7 @@ export default {
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/zlqk/importTemplate"
url: process.env.VUE_APP_BASE_API + "/system/gldry/exportTemplate"
},
// 遮罩层
loading: true,
......@@ -499,7 +499,7 @@ export default {
/** 导入按钮操作 */
handleImport() {
this.importLoading = false
this.upload.title = "治疗情况导入";
this.upload.title = "隔离点人员信息导入";
this.upload.open = true;
},
/** 下载模板操作 */
......@@ -509,7 +509,7 @@ export default {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '治疗情况导入模板' + '.xls' // 下载后文件名
downloadElement.download = '隔离点人员信息导入模板' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......
ruoyi-ui/src/views/system/hscj/index.vue
View file @ 1bf16cf2
......@@ -454,7 +454,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 治疗情况导入对话框 -->
<!-- 导入对话框 -->
<el-dialog :before-close="closeFileDialog" :title="upload.title" :close-on-click-modal="false" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
accept=".xlsx, .xls"
......@@ -493,7 +493,7 @@
<script>
import { listHscj, getHscj, delHscj, addHscj, updateHscj } from "@/api/system/hscj";
import { getToken } from '@/utils/auth'
import { importTemplate, importExcel } from "@/api/system/zlqk";
import { importTemplate, importExcel } from "@/api/system/hscj";
export default {
......@@ -516,7 +516,7 @@ export default {
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/zlqk/importTemplate"
url: process.env.VUE_APP_BASE_API + "/system/hscj/exportTemplate"
},
// 遮罩层
loading: true,
......@@ -656,7 +656,7 @@ export default {
/** 导入按钮操作 */
handleImport() {
this.importLoading = false
this.upload.title = "治疗情况导入";
this.upload.title = "核酸采集信息导入";
this.upload.open = true;
},
/** 下载模板操作 */
......@@ -666,7 +666,7 @@ export default {
const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href
downloadElement.download = '治疗情况导入模板' + '.xls' // 下载后文件名
downloadElement.download = '核酸采集信息导入模板' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
......
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