|
@@ -1,5 +1,8 @@
|
|
|
package thyyxxk.webserver.service.querydata;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
@@ -14,7 +17,9 @@ import thyyxxk.webserver.utils.TokenUtil;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -35,14 +40,27 @@ public class TCovidVaccinateAppointmentService {
|
|
|
this.dao = dao;
|
|
|
}
|
|
|
|
|
|
- public ResultVo<List<TCovidVaccinateAppointment>> queryXGYM(TCovidVaccinateAppointment data){
|
|
|
+ public ResultVo<Map<String,Object>> queryXGYM(TCovidVaccinateAppointment data){
|
|
|
log.info("查询新冠疫苗预约=>操作人:{},查找姓名:{},查找日期:{}", TokenUtil.getTokenUserId(),
|
|
|
- data.getName(), DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"));
|
|
|
- List<TCovidVaccinateAppointment> list = dao.queryXGYM(data);
|
|
|
- if (list.size()!=0){
|
|
|
- return ResultVoUtil.success(list);
|
|
|
+ data.getName(),data.getExecuteDate()!=null? DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"): "");
|
|
|
+ IPage<TCovidVaccinateAppointment> page = new Page<>(data.getCurrentPage(),data.getPageSize());
|
|
|
+
|
|
|
+ QueryWrapper<TCovidVaccinateAppointment> qw = new QueryWrapper<>();
|
|
|
+ Map map = new HashMap();
|
|
|
+ if (data.getName() != null && data.getName() !="" && !data.getName().equals("")){
|
|
|
+ qw.eq("a.name",data.getName());
|
|
|
+ }
|
|
|
+ if (data.getExecuteDate() != null ){
|
|
|
+ qw.eq("execute_date",DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"));
|
|
|
}
|
|
|
- return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
|
|
|
+ dao.mybatisPlusQueryXGYM(page,qw);
|
|
|
+
|
|
|
+ if (page.getTotal()>0 || page.getRecords().size()>0){
|
|
|
+ map.put("total",page.getTotal());
|
|
|
+ map.put("data",page.getRecords());
|
|
|
+ return ResultVoUtil.success(map);
|
|
|
+ }
|
|
|
+ return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
|
|
|
}
|
|
|
|
|
|
public ResultVo<List<TcovidVaccinateThreshold>> queryCount() throws ParseException {
|
|
@@ -57,11 +75,10 @@ public class TCovidVaccinateAppointmentService {
|
|
|
|
|
|
}
|
|
|
|
|
|
- public ResultVo<Boolean> update(int value, Date date, int newValue){
|
|
|
+ public ResultVo<Boolean> update(int modificationDate, Date date, int newRevisionDate){
|
|
|
String oldDate = sdf.format(date);
|
|
|
log.info("修改疫苗预约人数=>操作员:{},修改的日期为:{},限制人数为:{},原本的人数为:{}",
|
|
|
- TokenUtil.getTokenUserId(),oldDate,newValue,value);
|
|
|
- return ResultVoUtil.success(dao.update(newValue,oldDate));
|
|
|
+ TokenUtil.getTokenUserId(),oldDate,newRevisionDate,modificationDate);
|
|
|
+ return ResultVoUtil.success(dao.update(newRevisionDate,oldDate));
|
|
|
}
|
|
|
-
|
|
|
}
|