From add2864818d6e7fe2979740fbbce630a00249027 Mon Sep 17 00:00:00 2001 From: "862857010@qq.com" <862857010@> Date: Fri, 4 Aug 2023 16:33:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=A5=E6=94=B6=E5=8F=96=E6=B6=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=202.=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppointmentCenterDataController.java | 54 +++- .../domain/AppointmentCenterData.java | 18 +- .../mapper/AppointmentCenterDataMapper.java | 16 +- .../IAppointmentCenterDataService.java | 22 +- .../AppointmentCenterDataServiceImpl.java | 113 ++++++- .../AppointmentCenterDataMapper.xml | 13 +- .../static/appointmentInformationStencil.xlsx | Bin 0 -> 19456 bytes .../framework/config/SecurityConfig.java | 4 +- .../system/mapper/SysDictDataMapper.java | 167 +++++----- .../system/service/ISysDictDataService.java | 3 + .../service/impl/SysDictDataServiceImpl.java | 5 + .../mapper/system/SysDictDataMapper.xml | 4 +- .../appointmentrecord/index.vue | 292 ++++++++++++------ 13 files changed, 505 insertions(+), 206 deletions(-) create mode 100644 cjy-project/src/main/resources/static/appointmentInformationStencil.xlsx diff --git a/cjy-project/src/main/java/com/cjy/reservationdata/controller/AppointmentCenterDataController.java b/cjy-project/src/main/java/com/cjy/reservationdata/controller/AppointmentCenterDataController.java index 47561af9..3003116f 100644 --- a/cjy-project/src/main/java/com/cjy/reservationdata/controller/AppointmentCenterDataController.java +++ b/cjy-project/src/main/java/com/cjy/reservationdata/controller/AppointmentCenterDataController.java @@ -1,10 +1,10 @@ package com.cjy.reservationdata.controller; import java.util.List; -import java.util.Map; + import javax.servlet.http.HttpServletResponse; -import com.alibaba.fastjson2.JSONArray; + import com.cjy.reservationdata.domain.vo.SynchronousWriteOffDataVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,9 @@ import com.ruoyi.common.enums.BusinessType; import com.cjy.reservationdata.domain.AppointmentCenterData; import com.cjy.reservationdata.service.IAppointmentCenterDataService; import com.ruoyi.common.utils.poi.ExcelUtil; + import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; /** * 预约记录Controller @@ -113,6 +115,28 @@ public class AppointmentCenterDataController extends BaseController } + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) { + + + ExcelUtil util = new ExcelUtil(AppointmentCenterData.class); + List list = null; + try { + list = util.importExcel(file.getInputStream(), 1); + } catch (Exception e) { + e.printStackTrace(); + } + + String message = appointmentCenterDataService.importData(list, 2,getUserOrganCode()); + return AjaxResult.success(message); + } + + + /** + * 同步预约数据 + * @param list + * @return + */ @RequestMapping("/synchronousData") public AjaxResult synchronousData(@RequestBody List list) { try { @@ -123,13 +147,35 @@ public class AppointmentCenterDataController extends BaseController } } + /** + * 核销预约数据 + * @param list + * @return + */ @RequestMapping("/synchronousWriteOffData") - public AjaxResult synchronousWriteOffData( @RequestBody SynchronousWriteOffDataVO synchronousWriteOffDataVO) { + public AjaxResult synchronousWriteOffData( @RequestBody List list) { + try { + //通过id去修改数据 + appointmentCenterDataService.synchronousWriteOffData(list); + return AjaxResult.success("接收成功"); + }catch (Exception e){ + return AjaxResult.error("接收数据异常"); + } + } + + /** + * 取消预约数据 + * @param list + * @return + */ + @RequestMapping("/synchronousCancelData") + public AjaxResult synchronousCancelData( @RequestBody List list) { try { //通过id去修改数据 - appointmentCenterDataService.synchronousWriteOffData(synchronousWriteOffDataVO); + appointmentCenterDataService.synchronousCancelData(list); return AjaxResult.success("接收成功"); }catch (Exception e){ + e.printStackTrace(); return AjaxResult.error("接收数据异常"); } } diff --git a/cjy-project/src/main/java/com/cjy/reservationdata/domain/AppointmentCenterData.java b/cjy-project/src/main/java/com/cjy/reservationdata/domain/AppointmentCenterData.java index f5f92175..7d3cb861 100644 --- a/cjy-project/src/main/java/com/cjy/reservationdata/domain/AppointmentCenterData.java +++ b/cjy-project/src/main/java/com/cjy/reservationdata/domain/AppointmentCenterData.java @@ -27,32 +27,32 @@ public class AppointmentCenterData extends BaseEntity private String appointmentNumber; /** 景区名称 */ - @Excel(name = "景区名称") + @Excel(name = "景区名称(必填)") private String scenicName; /** 预约日期 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "预约日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "预约日期(必填)", width = 30, dateFormat = "yyyy-MM-dd") private Date appointmentDate; /** 预约时段 */ - @Excel(name = "预约时段") + @Excel(name = "预约时段(必填)") private String appointmentSlot; /** 预约人姓名 */ - @Excel(name = "预约人姓名") + @Excel(name = "预约人姓名(必填)") private String appointmentPeopleName; /** 预约人手机号 */ - @Excel(name = "预约人手机号") + @Excel(name = "预约人手机号(必填)") private String appointmentPeoplePhone; /** 证件类型 */ - @Excel(name = "证件类型") + @Excel(name = "证件类型(必填)") private String certificateType; /** 证件号码 */ - @Excel(name = "证件号码") + @Excel(name = "证件号码(必填)") private String documentsNumber; /** 核销码 */ @@ -60,7 +60,7 @@ public class AppointmentCenterData extends BaseEntity private String verificationCode; /** 状态 */ - @Excel(name = "状态") + @Excel(name = "状态(必填)") private String state; /** 核销日期 */ @@ -123,7 +123,7 @@ public class AppointmentCenterData extends BaseEntity this.appointmentDate = appointmentDate; } - public Date getAppointmentDate() + public Date getAppointmentDate() { return appointmentDate; } diff --git a/cjy-project/src/main/java/com/cjy/reservationdata/mapper/AppointmentCenterDataMapper.java b/cjy-project/src/main/java/com/cjy/reservationdata/mapper/AppointmentCenterDataMapper.java index c1cadb98..15b5d3dd 100644 --- a/cjy-project/src/main/java/com/cjy/reservationdata/mapper/AppointmentCenterDataMapper.java +++ b/cjy-project/src/main/java/com/cjy/reservationdata/mapper/AppointmentCenterDataMapper.java @@ -62,11 +62,23 @@ public interface AppointmentCenterDataMapper public int deleteAppointmentCenterDataByIds(Long[] ids); /** - * 同步数据批量插入 + * 同步预约数据 * @param list * @return */ int synchronousData(@Param("list") List list); - int synchronousWriteOffData(SynchronousWriteOffDataVO synchronousWriteOffDataVO); + /** + * 核销预约数据 + * @param list + * @return + */ + int synchronousWriteOffData(@Param("list") List list); + + /** + * 取消预约数据 + * @param list + * @return + */ + int synchronousCancelData(@Param("list") List list ); } diff --git a/cjy-project/src/main/java/com/cjy/reservationdata/service/IAppointmentCenterDataService.java b/cjy-project/src/main/java/com/cjy/reservationdata/service/IAppointmentCenterDataService.java index d7afe1bb..8ccf2210 100644 --- a/cjy-project/src/main/java/com/cjy/reservationdata/service/IAppointmentCenterDataService.java +++ b/cjy-project/src/main/java/com/cjy/reservationdata/service/IAppointmentCenterDataService.java @@ -60,8 +60,26 @@ public interface IAppointmentCenterDataService */ public int deleteAppointmentCenterDataById(Long id); - + /** + * 同步预约数据 + * @param list + * @return + */ int synchronousData(List list); - int synchronousWriteOffData(SynchronousWriteOffDataVO synchronousWriteOffDataVO); + /** + * 核销预约数据 + * @param list + * @return + */ + int synchronousWriteOffData(List list ); + + /** + * 取消预约数据 + * @param list + * @return + */ + int synchronousCancelData(List list ); + + String importData( List list,int row,Long organCode); } diff --git a/cjy-project/src/main/java/com/cjy/reservationdata/service/impl/AppointmentCenterDataServiceImpl.java b/cjy-project/src/main/java/com/cjy/reservationdata/service/impl/AppointmentCenterDataServiceImpl.java index 2cd6432c..2bdc3f04 100644 --- a/cjy-project/src/main/java/com/cjy/reservationdata/service/impl/AppointmentCenterDataServiceImpl.java +++ b/cjy-project/src/main/java/com/cjy/reservationdata/service/impl/AppointmentCenterDataServiceImpl.java @@ -1,9 +1,15 @@ package com.cjy.reservationdata.service.impl; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import com.cjy.reservationdata.domain.vo.SynchronousWriteOffDataVO; +import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.service.ISysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cjy.reservationdata.mapper.AppointmentCenterDataMapper; @@ -21,7 +27,8 @@ public class AppointmentCenterDataServiceImpl implements IAppointmentCenterDataS { @Autowired private AppointmentCenterDataMapper appointmentCenterDataMapper; - + @Autowired + private ISysDictDataService iSysDictDataService; /** * 查询预约记录 * @@ -96,13 +103,113 @@ public class AppointmentCenterDataServiceImpl implements IAppointmentCenterDataS return appointmentCenterDataMapper.deleteAppointmentCenterDataById(id); } + /** + * 同步预约数据 + * @param list + * @return + */ @Override public int synchronousData(List list) { return appointmentCenterDataMapper.synchronousData(list); } + /** + * 核销预约数据 + * @param list + * @return + */ + @Override + public int synchronousWriteOffData(List list) { + return appointmentCenterDataMapper.synchronousWriteOffData(list); + } + + /** + * 取消预约数据 + * @param list + * @return + */ + @Override + public int synchronousCancelData(List list) { + return appointmentCenterDataMapper.synchronousCancelData(list); + } + @Override - public int synchronousWriteOffData(SynchronousWriteOffDataVO synchronousWriteOffDataVO) { - return appointmentCenterDataMapper.synchronousWriteOffData(synchronousWriteOffDataVO); + public String importData(List list, int row,Long organCode) { + List newList= new ArrayList<>(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + List dictTypes =new ArrayList<>(); + dictTypes.add("write_off_status"); + dictTypes.add("certificate_type"); + List dictData=iSysDictDataService.selectDictDataListByType(dictTypes); + for (int i = 0; i < list.size(); i++) { + AppointmentCenterData appointmentCenterData= new AppointmentCenterData(); + appointmentCenterData.setDataSources("1"); + appointmentCenterData.setOrganCode(organCode); + if (StringUtils.isBlank(list.get(i).getScenicName())) { + return "第" + (row + i) + "行数据,景区名称不能为空,请核验"; + } + appointmentCenterData.setScenicName(list.get(i).getScenicName()); + if (StringUtils.isBlank( dateFormat.format(list.get(i).getAppointmentDate()))) { + return "第" + (row + i) + "行数据,预约日期不能为空,请核验"; + } + appointmentCenterData.setAppointmentDate(list.get(i).getAppointmentDate()); + if (StringUtils.isBlank( list.get(i).getAppointmentSlot())) { + return "第" + (row + i) + "行数据,预约时段不能为空,请核验"; + } + appointmentCenterData.setAppointmentSlot( list.get(i).getAppointmentSlot()); + + if (StringUtils.isBlank( list.get(i).getAppointmentPeopleName())) { + return "第" + (row + i) + "行数据,预约人姓名不能为空,请核验"; + } + appointmentCenterData.setAppointmentPeopleName(list.get(i).getAppointmentPeopleName()); + + if (StringUtils.isBlank( list.get(i).getAppointmentPeoplePhone())) { + return "第" + (row + i) + "行数据,预约人电话不能为空,请核验"; + } + appointmentCenterData.setAppointmentPeoplePhone(list.get(i).getAppointmentPeoplePhone()); + if (StringUtils.isBlank( list.get(i).getDocumentsNumber())) { + return "第" + (row + i) + "行数据,证件号码不能为空,请核验"; + } + appointmentCenterData.setDocumentsNumber(list.get(i).getDocumentsNumber()); + + if (StringUtils.isBlank( list.get(i).getCertificateType())) { + return "第" + (row + i) + "行数据,证件类型不能为空,请核验"; + } + try { + int finalI = i; + String state=dictData.stream().filter(dataSate ->dataSate.getDictLabel().equals(list.get(finalI).getState())).collect(Collectors.toList()).get(0).getDictValue(); + appointmentCenterData.setState(state); + }catch (Exception e){ + return "第" + (row + i) + "行数据,证件类型不能正确,请核验"; + } + + + + if (StringUtils.isBlank( list.get(i).getState())) { + return "第" + (row + i) + "行数据,状态不能为空,请核验"; + } + try { + int finalI = i; + String state = dictData.stream().filter(dataSate -> dataSate.getDictLabel().equals(list.get(finalI).getState())).collect(Collectors.toList()).get(0).getDictValue(); + appointmentCenterData.setState(state); + }catch (Exception e){ + return "第" + (row + i) + "行数据,状态数据错,请核验"; + } + + + + + if(newList.size()<1000){ + newList.add(appointmentCenterData); + }else { + appointmentCenterDataMapper.synchronousData(newList); + newList.clear(); + newList.add(appointmentCenterData); + } + } + if(!newList.isEmpty()){ + appointmentCenterDataMapper.synchronousData(newList); + } + return "导入"+newList.size() + "条数据"; } } diff --git a/cjy-project/src/main/resources/mapper/reservationdata/AppointmentCenterDataMapper.xml b/cjy-project/src/main/resources/mapper/reservationdata/AppointmentCenterDataMapper.xml index 0a9a2a79..573e33f3 100644 --- a/cjy-project/src/main/resources/mapper/reservationdata/AppointmentCenterDataMapper.xml +++ b/cjy-project/src/main/resources/mapper/reservationdata/AppointmentCenterDataMapper.xml @@ -155,6 +155,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update appointment_center_data set state=1,write_off_time=#{date} where appointment_people_id=#{id} + + update appointment_center_data set state=1,write_off_time=#{item.date} + where appointment_people_id=#{item.id} + + + + update appointment_center_data set state=3 where appointment_people_id in + + #{item} + + + \ No newline at end of file diff --git a/cjy-project/src/main/resources/static/appointmentInformationStencil.xlsx b/cjy-project/src/main/resources/static/appointmentInformationStencil.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ef879087411012be1ed04e3f78f4b377cba18c81 GIT binary patch literal 19456 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 selectDictDataList(SysDictData dictData); +public interface SysDictDataMapper { + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据集合信息 - */ - public List selectDictDataByType(String dictType); + /** + * 通过 dictType 和dictValue 获取数据 + * + * @param dictType + * @param list + * @return + */ + public List selectDictDataByTypeAndDictValue(@Param("dictType") String dictType, @Param("list") List list); - /** - * 通过 dictType 和dictValue 获取数据 - * @param dictType - * @param list - * @return - */ - public List selectDictDataByTypeAndDictValue(@Param("dictType") String dictType,@Param("list") List list); + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); - /** - * 根据字典数据ID查询信息 - * - * @param dictCode 字典数据ID - * @return 字典数据 - */ - public SysDictData selectDictDataById(Long dictCode); + /** + * 查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据 + */ + public int countDictDataByType(String dictType); - /** - * 查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据 - */ - public int countDictDataByType(String dictType); + /** + * 通过字典ID删除字典数据信息 + * + * @param dictCode 字典数据ID + * @return 结果 + */ + public int deleteDictDataById(Long dictCode); - /** - * 通过字典ID删除字典数据信息 - * - * @param dictCode 字典数据ID - * @return 结果 - */ - public int deleteDictDataById(Long dictCode); + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + * @return 结果 + */ + public int deleteDictDataByIds(Long[] dictCodes); - /** - * 批量删除字典数据信息 - * - * @param dictCodes 需要删除的字典数据ID - * @return 结果 - */ - public int deleteDictDataByIds(Long[] dictCodes); + /** + * 新增字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); - /** - * 新增字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int insertDictData(SysDictData dictData); + /** + * 修改字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); - /** - * 修改字典数据信息 - * - * @param dictData 字典数据信息 - * @return 结果 - */ - public int updateDictData(SysDictData dictData); + /** + * 同步修改字典类型 + * + * @param oldDictType 旧字典类型 + * @param newDictType 新旧字典类型 + * @return 结果 + */ + public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); - /** - * 同步修改字典类型 - * - * @param oldDictType 旧字典类型 - * @param newDictType 新旧字典类型 - * @return 结果 - */ - public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); + String getDictValueByDictLabel(@Param("dictType") String dictType, @Param("dictLable") String dictLable); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 38045c01..a684a12b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.common.core.domain.entity.SysDictData; +import org.apache.ibatis.annotations.Param; /** * 字典 业务层 @@ -65,4 +66,6 @@ public interface ISysDictDataService * @return */ public List selectDictDataListByType(List dictTypes); + + String getDictValueByDictLabel( String dictType, String dictLable); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 6c85436a..fb4bc06a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -131,4 +131,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService } return list; } + + @Override + public String getDictValueByDictLabel(String dictType, String dictLable) { + return dictDataMapper.getDictValueByDictLabel(dictType,dictLable); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index f270c1e4..4f3db92d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -130,5 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + \ No newline at end of file diff --git a/ruoyi-ui/src/views/reservationdata/appointmentrecord/index.vue b/ruoyi-ui/src/views/reservationdata/appointmentrecord/index.vue index 15613b20..fc384eea 100644 --- a/ruoyi-ui/src/views/reservationdata/appointmentrecord/index.vue +++ b/ruoyi-ui/src/views/reservationdata/appointmentrecord/index.vue @@ -1,6 +1,8 @@