|
@@ -51,7 +51,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
* @return 指定数据
|
|
|
*/
|
|
|
public ResultVo<Map<String, Object>> queryCovidVaccinateAppointment(CovidVaccinateAppointment param) {
|
|
|
- log.info("查询新冠疫苗预约=>操作人:{},查询条件:{}", TokenUtil.getTokenUserId(),
|
|
|
+ log.info("查询新冠疫苗预约 --> 操作人:{},查询条件:{}", TokenUtil.getTokenUserId(),
|
|
|
JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
|
|
|
IPage<CovidVaccinateAppointment> page = getQueryPage(param);
|
|
|
Map<String, Object> map = new HashMap<>(Capacity.TWO);
|
|
@@ -101,13 +101,13 @@ public class CovidVaccinateAppointmentService {
|
|
|
date = SDF.parse(DateUtil.getOffsetDate(i));
|
|
|
if (maxDate == null) {
|
|
|
dateList.add(date);
|
|
|
- log.info("新冠疫苗插入默认设置阈值==》code:{},插入的日期为:{},阈值数:{}", code, DateUtil.formatDatetime(date, DATE_FORMAT), value);
|
|
|
+ log.info("新冠疫苗插入默认设置阈值 --> code:{},插入的日期为:{},阈值数:{}", code, DateUtil.formatDatetime(date, DATE_FORMAT), value);
|
|
|
} else if (maxDate.getTime() < date.getTime()) {
|
|
|
dateList.add(date);
|
|
|
- log.info("新冠疫苗厂家阈值插入==》code:{},添加日期为:{},阈值数:{}", code, DateUtil.formatDatetime(date, DATE_FORMAT), value);
|
|
|
+ log.info("新冠疫苗厂家阈值插入 --> code:{},添加日期为:{},阈值数:{}", code, DateUtil.formatDatetime(date, DATE_FORMAT), value);
|
|
|
}
|
|
|
}
|
|
|
- //因为在 查看的时候 也是需要 执行
|
|
|
+ //因为在 查看的时候 也是需要 执行 要判断一下 只有日期为空的时候才会插入
|
|
|
if (dateList.size() > 0) {
|
|
|
dao.chaRuMeiYouDeDate(code, dateList, value);
|
|
|
}
|
|
@@ -170,7 +170,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
public ResultVo<Integer> xinZengYiMiao(ZdCovidVaccinate param) {
|
|
|
try {
|
|
|
dao.xinZengYiMiao(param);
|
|
|
- log.info("插入疫苗==》操作人:{},插入信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
|
|
|
+ log.info("插入疫苗 --> 操作人:{},插入信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
|
|
|
} catch (Exception e) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("<p style='color:red'>【%s】</p>该疫苗名称已存在,添加失败。", param.getName()));
|
|
|
}
|
|
@@ -196,7 +196,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
//新增厂家
|
|
|
dao.xinZengChangJia(param);
|
|
|
for (CovidVaccinateFactory pojo : param) {
|
|
|
- log.info("插入厂家==》操作人:{},信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(pojo));
|
|
|
+ log.info("插入厂家 --> 操作人:{},信息:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(pojo));
|
|
|
//在新插入厂家的时候我就要默认设置好 阈值
|
|
|
chaRuRiQI(pojo.getCode());
|
|
|
}
|
|
@@ -228,7 +228,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
* @param param 修改的字段为 name enableFlag bookTip 通过id来修改
|
|
|
*/
|
|
|
public ResultVo<Boolean> xiuGaiYiMiao(ZdCovidVaccinate param) {
|
|
|
- log.info("修改疫苗==》操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
|
|
|
+ log.info("修改疫苗 --> 操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONStringWithDateFormat(param, DATE_FORMAT));
|
|
|
dao.xiuGaiYiMiao(param);
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, String.format("<p style='color:#67C23A'>%s</p>修改成功 \(☆o☆)/", param.getName()));
|
|
|
}
|
|
@@ -240,7 +240,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
* @return 返回boolean
|
|
|
*/
|
|
|
public ResultVo<Boolean> xiuGaiChangJia(CovidVaccinateFactory param) {
|
|
|
- log.info("修改新冠疫苗厂家==》操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
|
|
|
+ log.info("修改新冠疫苗厂家 --> 操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(param));
|
|
|
dao.xiuGaiChangJia(param);
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, String.format("<p style='color:teal'>%s</p>厂家信息修改成功 φ(゜▽゜*)♪", param.getName()));
|
|
|
}
|
|
@@ -252,7 +252,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
* @return 返回
|
|
|
*/
|
|
|
public ResultVo<Boolean> shanChuChangJia(Integer code) {
|
|
|
- log.info("删除新冠疫苗厂家==》操作人:{},删除的数据:{}", TokenUtil.getTokenUserId(), code);
|
|
|
+ log.info("删除新冠疫苗厂家 --> 操作人:{},删除的数据:{}", TokenUtil.getTokenUserId(), code);
|
|
|
dao.shanChuChangJia(code);
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功 \(☆o☆)/");
|
|
|
}
|
|
@@ -264,7 +264,7 @@ public class CovidVaccinateAppointmentService {
|
|
|
* @return 通知修改成功
|
|
|
*/
|
|
|
public ResultVo<Boolean> yiJianXiuGaiRiQi(List<CovidVaccinateThreshold> list) {
|
|
|
- log.info("修改新冠疫苗厂家阈值==》操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(list));
|
|
|
+ log.info("修改新冠疫苗厂家阈值 --> 操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(list));
|
|
|
dao.xiuGaiYuZhi(list);
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "阈值修改成功 ヽ(”`▽´)ノ");
|
|
|
}
|