jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8a60004299dd97446ac48d115354058dafa26d9

Authored by liquanyu
1 parent 2a6b60238b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕妇学校

Showing 4 changed files with 56 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java View file @ c8a6000
... ... @@ -50,12 +50,20 @@
50 50 public BaseResponse updateCourese(@RequestBody CourseRequest model,
51 51 HttpServletRequest request) {
52 52  
53   - return courseFacade.updateCourese(model,getUserId(request));
  53 + return courseFacade.updateCourese(model, getUserId(request));
54 54 }
55 55  
56 56  
57 57 /**
58 58 * 课程列表
  59 + * @param courseTypeId 课程类型id
  60 + * @param page
  61 + * @param limit
  62 + * @param status 1待发布，2 已发布，3已结束
  63 + * @param courseName 课程名称
  64 + * @param courseSpeaker 课程主讲
  65 + * @param createdTime 创建时间
  66 + * @param courseTime 课程时间
59 67 * @param request
60 68 * @return
61 69 */
62 70  
... ... @@ -66,11 +74,13 @@
66 74 @RequestParam("page") Integer page,
67 75 @RequestParam("limit") Integer limit,
68 76 @RequestParam(required = false) Integer status,
  77 + @RequestParam(required = false) String courseName,
  78 + @RequestParam(required = false) String courseSpeaker,
69 79 @RequestParam(required = false) String createdTime,
70 80 @RequestParam(required = false) String courseTime,
71 81 HttpServletRequest request) {
72 82  
73   - return courseFacade.getCoureseList(courseTypeId, status,
  83 + return courseFacade.getCoureseList(courseTypeId, status,courseName,courseSpeaker,
74 84 createdTime, courseTime, page, limit, getUserId(request));
75 85 }
76 86  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java View file @ c8a6000
... ... @@ -51,7 +51,7 @@
51 51 @TokenRequired
52 52 public BaseResponse updateCoureseType(@RequestBody CourseTypeRequest model,
53 53 HttpServletRequest request) {
54   - return courseTypeFacade.updateCoureseType(model);
  54 + return courseTypeFacade.updateCoureseType(model,getUserId(request));
55 55 }
56 56  
57 57  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ c8a6000
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.biz.service.PatientCourseService;
7 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 8 import com.lyms.platform.common.enums.CourseStatusEnums;
  9 +import com.lyms.platform.common.enums.OptActionEnums;
9 10 import com.lyms.platform.common.enums.YnEnums;
10 11 import com.lyms.platform.common.result.BaseListResponse;
11 12 import com.lyms.platform.common.result.BaseObjectResponse;
... ... @@ -51,6 +52,9 @@
51 52 @Autowired
52 53 private AutoMatchFacade autoMatchFacade;
53 54  
  55 + @Autowired
  56 + private OperateLogFacade operateLogFacade;
  57 +
54 58 public BaseResponse addCourese(CourseRequest request, Integer userId) {
55 59  
56 60 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -65,6 +69,7 @@
65 69 model.setModified(new Date());
66 70 model.setStatus(CourseStatusEnums.DFB.getId());
67 71 courseService.addCourse(model);
  72 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加课程");
68 73 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
69 74 objectResponse.setErrormsg("成功");
70 75 return objectResponse;
... ... @@ -92,7 +97,7 @@
92 97 return model;
93 98 }
94 99  
95   - public BaseResponse getCoureseList(String courseTypeId, Integer status,
  100 + public BaseResponse getCoureseList(String courseTypeId, Integer status,String courseName,String courseSpeaker,
96 101 String createdTime, String courseTime,
97 102 Integer page, Integer limit, Integer userId) {
98 103  
... ... @@ -125,6 +130,8 @@
125 130 query.setLimit(limit);
126 131 query.setNeed("true");
127 132 query.setHospitalId(hospitalId);
  133 + query.setCourseSpeaker(courseSpeaker);
  134 + query.setCourseName(courseName);
128 135 List<CourseModel> courseModels = courseService.queryCourseList(query);
129 136  
130 137 CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
131 138  
... ... @@ -254,9 +261,23 @@
254 261  
255 262 public BaseResponse updateCourese(CourseRequest request, Integer userId) {
256 263 BaseResponse objectResponse = new BaseResponse();
  264 +
  265 + CourseQuery query = new CourseQuery();
  266 + query.setYn(YnEnums.YES.getId());
  267 + query.setId(request.getId());
  268 + CourseModel updateModel = null;
  269 + List<CourseModel> courseModels = courseService.queryCourseList(query);
  270 + if (CollectionUtils.isNotEmpty(courseModels)) {
  271 + updateModel = courseModels.get(0);
  272 + }
  273 +
  274 +
257 275 CourseModel model = getCoureseModel(request);
258 276 model.setModified(new Date());
259 277 courseService.updateCourse(model);
  278 +
  279 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  280 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel,model, OptActionEnums.UPDATE.getId(), "修改课程");
260 281 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
261 282 objectResponse.setErrormsg("成功");
262 283 return objectResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java View file @ c8a6000
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.biz.service.CourseService;
5 5 import com.lyms.platform.biz.service.CourseTypeService;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
  7 +import com.lyms.platform.common.enums.OptActionEnums;
7 8 import com.lyms.platform.common.enums.YnEnums;
8 9 import com.lyms.platform.common.result.BaseListResponse;
9 10 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -41,6 +42,9 @@
41 42 @Autowired
42 43 private AutoMatchFacade autoMatchFacade;
43 44  
  45 + @Autowired
  46 + private OperateLogFacade operateLogFacade;
  47 +
44 48 public BaseResponse addCoureseType(CourseTypeRequest request, Integer userId) {
45 49  
46 50 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -55,6 +59,10 @@
55 59 model.setModified(new Date());
56 60  
57 61 courseTypeService.addCourseType(model);
  62 +
  63 + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加课程类型");
  64 +
  65 +
58 66 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
59 67 objectResponse.setErrormsg("成功");
60 68 return objectResponse;
61 69  
62 70  
... ... @@ -115,11 +123,23 @@
115 123 }
116 124  
117 125  
118   - public BaseResponse updateCoureseType(CourseTypeRequest request) {
  126 + public BaseResponse updateCoureseType(CourseTypeRequest request,Integer userId) {
119 127 BaseResponse objectResponse = new BaseResponse();
120 128 CourseTypeModel model = getCoureseTypeModel(request);
121 129 model.setModified(new Date());
  130 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  131 + CourseTypeQuery query = new CourseTypeQuery();
  132 + query.setId(request.getId());
  133 + query.setYn(YnEnums.YES.getId());
  134 +
  135 +
  136 + List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(query);
  137 + if (CollectionUtils.isNotEmpty(typeModels))
  138 + {
  139 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), typeModels.get(0), model, OptActionEnums.UPDATE.getId(), "修改课程类型");
  140 + }
122 141 courseTypeService.updateCourseType(model);
  142 +
123 143 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
124 144 objectResponse.setErrormsg("成功");
125 145 return objectResponse;