diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java index 2225259..7827df3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java @@ -50,12 +50,20 @@ public class CourseController extends BaseController { public BaseResponse updateCourese(@RequestBody CourseRequest model, HttpServletRequest request) { - return courseFacade.updateCourese(model,getUserId(request)); + return courseFacade.updateCourese(model, getUserId(request)); } /** * 课程列表 + * @param courseTypeId 课程类型id + * @param page + * @param limit + * @param status 1待发布,2 已发布,3已结束 + * @param courseName 课程名称 + * @param courseSpeaker 课程主讲 + * @param createdTime 创建时间 + * @param courseTime 课程时间 * @param request * @return */ @@ -66,11 +74,13 @@ public class CourseController extends BaseController { @RequestParam("page") Integer page, @RequestParam("limit") Integer limit, @RequestParam(required = false) Integer status, + @RequestParam(required = false) String courseName, + @RequestParam(required = false) String courseSpeaker, @RequestParam(required = false) String createdTime, @RequestParam(required = false) String courseTime, HttpServletRequest request) { - return courseFacade.getCoureseList(courseTypeId, status, + return courseFacade.getCoureseList(courseTypeId, status,courseName,courseSpeaker, createdTime, courseTime, page, limit, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java index a61a224..43837d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java @@ -51,7 +51,7 @@ public class CourseTypeController extends BaseController { @TokenRequired public BaseResponse updateCoureseType(@RequestBody CourseTypeRequest model, HttpServletRequest request) { - return courseTypeFacade.updateCoureseType(model); + return courseTypeFacade.updateCoureseType(model,getUserId(request)); } 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 eab0508..8a91f18 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 @@ -6,6 +6,7 @@ import com.lyms.platform.biz.service.CourseTypeService; import com.lyms.platform.biz.service.PatientCourseService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.CourseStatusEnums; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -51,6 +52,9 @@ public class CourseFacade { @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private OperateLogFacade operateLogFacade; + public BaseResponse addCourese(CourseRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -65,6 +69,7 @@ public class CourseFacade { model.setModified(new Date()); model.setStatus(CourseStatusEnums.DFB.getId()); courseService.addCourse(model); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加课程"); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; @@ -92,7 +97,7 @@ public class CourseFacade { return model; } - public BaseResponse getCoureseList(String courseTypeId, Integer status, + public BaseResponse getCoureseList(String courseTypeId, Integer status,String courseName,String courseSpeaker, String createdTime, String courseTime, Integer page, Integer limit, Integer userId) { @@ -125,6 +130,8 @@ public class CourseFacade { query.setLimit(limit); query.setNeed("true"); query.setHospitalId(hospitalId); + query.setCourseSpeaker(courseSpeaker); + query.setCourseName(courseName); List courseModels = courseService.queryCourseList(query); CourseTypeQuery courseTypeQuery = new CourseTypeQuery(); @@ -254,9 +261,23 @@ public class CourseFacade { public BaseResponse updateCourese(CourseRequest request, Integer userId) { BaseResponse objectResponse = new BaseResponse(); + + CourseQuery query = new CourseQuery(); + query.setYn(YnEnums.YES.getId()); + query.setId(request.getId()); + CourseModel updateModel = null; + List courseModels = courseService.queryCourseList(query); + if (CollectionUtils.isNotEmpty(courseModels)) { + updateModel = courseModels.get(0); + } + + CourseModel model = getCoureseModel(request); model.setModified(new Date()); courseService.updateCourse(model); + + String hospitalId = autoMatchFacade.getHospitalId(userId); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel,model, OptActionEnums.UPDATE.getId(), "修改课程"); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java index dca74d0..b512756 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java @@ -4,6 +4,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.CourseService; import com.lyms.platform.biz.service.CourseTypeService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; @@ -41,6 +42,9 @@ public class CourseTypeFacade { @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private OperateLogFacade operateLogFacade; + public BaseResponse addCoureseType(CourseTypeRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -55,6 +59,10 @@ public class CourseTypeFacade { model.setModified(new Date()); courseTypeService.addCourseType(model); + + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加课程类型"); + + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; @@ -115,11 +123,23 @@ public class CourseTypeFacade { } - public BaseResponse updateCoureseType(CourseTypeRequest request) { + public BaseResponse updateCoureseType(CourseTypeRequest request,Integer userId) { BaseResponse objectResponse = new BaseResponse(); CourseTypeModel model = getCoureseTypeModel(request); model.setModified(new Date()); + String hospitalId = autoMatchFacade.getHospitalId(userId); + CourseTypeQuery query = new CourseTypeQuery(); + query.setId(request.getId()); + query.setYn(YnEnums.YES.getId()); + + + List typeModels = courseTypeService.queryCourseTypeList(query); + if (CollectionUtils.isNotEmpty(typeModels)) + { + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), typeModels.get(0), model, OptActionEnums.UPDATE.getId(), "修改课程类型"); + } courseTypeService.updateCourseType(model); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse;