diff --git a/src/main/java/org/springblade/common/constant/BusinessConstant.java b/src/main/java/org/springblade/common/constant/BusinessConstant.java index 78c3759..5f779b3 100644 --- a/src/main/java/org/springblade/common/constant/BusinessConstant.java +++ b/src/main/java/org/springblade/common/constant/BusinessConstant.java @@ -10,7 +10,7 @@ public interface BusinessConstant { String DATE_STR_DAY_START_HMS = " 00:00:00"; String DATE_STR_DAY_END_HMS = " 23:59:59"; - String ROLE_NAME_HOSPITAL = "医院"; + String ROLE_NAME_HOSPITAL = "hospital"; Integer BOOLEAN_INT_TRUE = 1; Integer BOOLEAN_INT_FALSE = 0; diff --git a/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java b/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java index 57b74ad..4b0670f 100644 --- a/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java +++ b/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java @@ -1,7 +1,11 @@ package org.springblade.modules.business.controller; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.common.cache.DictBizCache; @@ -24,6 +28,7 @@ import org.springblade.modules.business.vo.ApmRecordDetailVO; import org.springblade.modules.business.vo.ApmRecordListVO; import org.springblade.modules.business.vo.ApmRecordVO; import org.springblade.modules.business.wrapper.ApmRecordWrapper; +import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -158,20 +163,62 @@ public class ApmRecordController extends BladeController { return R.data(page); } +// /** +// * 新增 +// */ +// @PostMapping("/save") +// @ApiOperationSupport(order = 5) +// @ApiOperation(value = "新增", notes = "传入apmConfig") +// public R save(@RequestBody List apmRecordList) { +// if (Func.isEmpty(apmRecordList)) { +// return R.fail(ErrorMsgEnum.APMRECORD_SAVE_OBJ_IS_NULL.getValue()); +// } +// +// Date apmDay = null; +// String cardNo = null; +// for (ApmRecord record : apmRecordList) { +// if (apmDay == null) { +// apmDay = record.getApmDay(); +// } +// if (cardNo == null) { +// cardNo = record.getCupCardNo(); +// } +// +// if (!DateUtil.format(apmDay, DateUtil.PATTERN_DATE).equals(DateUtil.format(record.getApmDay(), DateUtil.PATTERN_DATE))) { +// return R.fail("预约失败, 一次只能预约同一天的体检项目"); +// } +// +// if (!cardNo.equals(record.getCupCardNo())) { +// return R.fail("预约失败, 一次只能预约同一个人"); +// } +// +// record.setApmTime(DateUtil.now()); +// record.setApmStatus(BusinessConstant.RECORD_STATUS_UNREGISTER); +// } +// +// String checkMsg = recordService.checkApmRecordSave(apmRecordList); +// if (Func.isBlank(checkMsg)) { +// recordService.saveBatch(apmRecordList); +// return R.status(true); +// } +// return R.fail(checkMsg); +// } + /** * 新增 */ @PostMapping("/save") @ApiOperationSupport(order = 5) @ApiOperation(value = "新增", notes = "传入apmConfig") - public R save(@RequestBody List apmRecordList) { - if (Func.isEmpty(apmRecordList)) { - return R.fail(ErrorMsgEnum.APMRECORD_SAVE_OBJ_IS_NULL.getValue()); - } + public R save(@RequestBody Map apmRecordListStr) { + List> apmRecordMapList = (List>) apmRecordListStr.get("data"); + List apmRecordList = new ArrayList<>(); Date apmDay = null; String cardNo = null; - for (ApmRecord record : apmRecordList) { + for (Map item : apmRecordMapList) { + ApmRecord record = BeanUtil.copy(item, ApmRecord.class); + record.setApmDay(DateUtil.parse(item.get("apmDay").toString(), DateUtil.PATTERN_DATE)); if (apmDay == null) { apmDay = record.getApmDay(); } @@ -189,6 +236,7 @@ public class ApmRecordController extends BladeController { record.setApmTime(DateUtil.now()); record.setApmStatus(BusinessConstant.RECORD_STATUS_UNREGISTER); + apmRecordList.add(record); } String checkMsg = recordService.checkApmRecordSave(apmRecordList); diff --git a/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml b/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml index 363eb85..b76bdd2 100644 --- a/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml +++ b/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml @@ -35,6 +35,7 @@ and ac.project = #{project} + order by apm_day desc