From 5714e075d27664a7cfc2a4d9d28c10f07bcf6a4c Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 12 Jun 2024 17:13:28 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=AD=95=E5=A6=87?= =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E7=BA=BF=E4=B8=8A=E3=80=81=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E3=80=81=E6=8A=A5=E9=81=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5=E5=8F=8A=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/CourseModel.java | 20 +++++++++++++++ .../com/lyms/platform/pojo/PatientCourseModel.java | 10 ++++++++ .../java/com/lyms/platform/query/CourseQuery.java | 2 ++ .../web/controller/PatientCourseController.java | 6 +++-- .../platform/operate/web/facade/CourseFacade.java | 2 ++ .../operate/web/facade/PatientCourseFacade.java | 30 +++++++++++++++++----- .../platform/operate/web/result/CourseResult.java | 20 +++++++++++++++ 7 files changed, 82 insertions(+), 8 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java index 5137429..c27cf49 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java @@ -43,6 +43,10 @@ public class CourseModel extends BaseModel { //签到人数 private Integer signNum; + //线下报名人数 + private Integer enrolmentUnderNum; + //线下签到人数 + private Integer signUnderNum; //状态 1待发布，2 已发布，3已结束 4 已取消 private Integer status; @@ -86,6 +90,22 @@ public class CourseModel extends BaseModel { //听课方式 1线上 2现场 private String courseType; + public Integer getEnrolmentUnderNum() { + return enrolmentUnderNum; + } + + public void setEnrolmentUnderNum(Integer enrolmentUnderNum) { + this.enrolmentUnderNum = enrolmentUnderNum; + } + + public Integer getSignUnderNum() { + return signUnderNum; + } + + public void setSignUnderNum(Integer signUnderNum) { + this.signUnderNum = signUnderNum; + } + public String getCourseType() { return courseType; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCourseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCourseModel.java index 21d1c6f..1a6a760 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCourseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientCourseModel.java @@ -61,6 +61,16 @@ public class PatientCourseModel extends BaseModel { private String hospitalId; + private Integer type; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public String getId() { return id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java index 785ee74..4444790 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java @@ -47,9 +47,11 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { //报名人数 private Integer enrolmentNum; + //签到人数 private Integer signNum; + //状态 1待发布，2 已发布，3已结束 private Integer status; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java index b5aadd0..43c7142 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java @@ -106,9 +106,10 @@ public class PatientCourseController extends BaseController { public BaseResponse signCourse( @RequestParam(required = true) String patientCourseId, @RequestParam(required = true) String courseId, + @RequestParam(required = true) Integer type, HttpServletRequest request) { - return patientCourseFacade.signCourse(patientCourseId, courseId); + return patientCourseFacade.signCourse(patientCourseId, courseId,type); } @@ -129,9 +130,10 @@ public class PatientCourseController extends BaseController { @RequestParam(required = true) String patientId, @RequestParam(required = true) String hospitalId, @RequestParam(required = true) Integer orderType, + @RequestParam(required = true) Integer type, HttpServletRequest request) { - return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType); + return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType,type); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index eb04cf2..e52965f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -255,6 +255,8 @@ public class CourseFacade { result.setCourseObj(model.getCourseObjId() == null ? "全部" : CourseStatusEnums.CourseObjEnums.getNameById(model.getCourseObjId())); result.setCourseObjId(model.getCourseObjId() == null ? 0 : model.getCourseObjId()); result.setType(model.getCourseType()); + result.setSignUnderNum(model.getSignUnderNum()); + result.setEnrolmentUnderNum(model.getEnrolmentUnderNum()); results.add(result); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java index a485abc..a779083 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java @@ -223,7 +223,7 @@ public class PatientCourseFacade { return results; } - public BaseResponse orderCourse(String courseId, String patientId,String hospitalId,Integer orderType) { + public BaseResponse orderCourse(String courseId, String patientId,String hospitalId,Integer orderType,Integer type) { BaseObjectResponse objectResponse = new BaseObjectResponse(); CourseQuery query = new CourseQuery(); @@ -317,11 +317,17 @@ public class PatientCourseFacade { model.setModified(new Date()); model.setYn(YnEnums.YES.getId()); model.setStatus(1); + model.setType(type); patientCourseService.addPatientCourse(model); objectResponse.setData(model.getId()); CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1); + // 1是线上 2是线下 + if (type==1){ + courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1); + }else { + courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 1 : courseModels.get(0).getEnrolmentUnderNum()+1); + } courseService.updateCourse(courseModel); } @@ -388,7 +394,7 @@ public class PatientCourseFacade { List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientses)) { Patients patients = patientses.get(0); - orderCourse(courseId, patients.getId(),hospitalId,1); + orderCourse(courseId, patients.getId(),hospitalId,1,1); } PatientCourseQuery patientCourseQuery1 = new PatientCourseQuery(); @@ -445,7 +451,7 @@ public class PatientCourseFacade { return objectResponse; } - public BaseResponse signCourse(String patientCourseId,String courseId) { + public BaseResponse signCourse(String patientCourseId,String courseId,Integer type) { BaseResponse objectResponse = new BaseResponse(); CourseQuery query = new CourseQuery(); @@ -483,12 +489,19 @@ public class PatientCourseFacade { model.setModified(new Date()); model.setYn(YnEnums.YES.getId()); model.setStatus(2); + model.setType(type); patientCourseService.updatePatientCourse(model); CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - courseModel.setSignNum(courseModels.get(0).getSignNum() == null ? 1 : courseModels.get(0).getSignNum() + 1); + //1是线上 2是线下 + if (type==1){ + courseModel.setSignNum(courseModels.get(0).getSignNum() == null ? 1 : courseModels.get(0).getSignNum() + 1); + }else { + courseModel.setSignUnderNum(courseModels.get(0).getSignUnderNum() == null ? 1 : courseModels.get(0).getSignUnderNum() + 1); + + } courseService.updateCourse(courseModel); } @@ -685,6 +698,7 @@ public class PatientCourseFacade { if (CollectionUtils.isNotEmpty(patientCourseModels)) { String id = patientCourseModels.get(0).getId(); + Integer type=patientCourseModels.get(0).getType(); patientCourseService.deletePatientCourse(id); CourseQuery query = new CourseQuery(); @@ -695,7 +709,11 @@ public class PatientCourseFacade { { CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1); + if (type!=null&&type==2){ + courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1); + }else { + courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1); + } courseService.updateCourse(courseModel); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java index 435a73b..245090a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java @@ -33,6 +33,10 @@ public class CourseResult { //签到人数 private Integer signNum; + //线下报名人数 + private Integer enrolmentUnderNum; + //线下签到人数 + private Integer signUnderNum; //状态 1待发布，2 已发布，3已结束 private String status; @@ -64,6 +68,22 @@ public class CourseResult { private String type; + public Integer getEnrolmentUnderNum() { + return enrolmentUnderNum; + } + + public void setEnrolmentUnderNum(Integer enrolmentUnderNum) { + this.enrolmentUnderNum = enrolmentUnderNum; + } + + public Integer getSignUnderNum() { + return signUnderNum; + } + + public void setSignUnderNum(Integer signUnderNum) { + this.signUnderNum = signUnderNum; + } + public String getType() { return type; } -- 1.8.3.1