巡堂

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/CoursePatrolEvaluationWrapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.conditions.update.Update;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -82,6 +83,10 @@ public class CoursePatrolEvaluationWrapper {
         @ApiModelProperty("巡堂ID")
         private Integer id;
 
+        @JsonIgnore
+        // 必须存在巡堂
+        private Boolean patrolFlag;
+
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }
@@ -260,6 +265,8 @@ public class CoursePatrolEvaluationWrapper {
         @ApiModelProperty("附件")
         private String attachmentUrl;
 
+        @ApiModelProperty("合作单位ID")
+        private Integer cooperationOrganId;
 
         public String jsonString() {
             return JSON.toJSONString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CoursePatrolEvaluationServiceImpl.java

@@ -154,12 +154,19 @@ public class CoursePatrolEvaluationServiceImpl extends ServiceImpl<CoursePatrolE
             throw new BizException("课程未开始，不允许做巡堂评价");
         }
 
+        CoursePatrolEvaluation one = this.lambdaQuery().eq(CoursePatrolEvaluation::getCourseScheduleId, coursePatrolEvaluation.getCourseScheduleId())
+                .last("limit 1")
+                .one();
+
         CoursePatrolEvaluation evaluation = JSON.parseObject(coursePatrolEvaluation.jsonString(), CoursePatrolEvaluation.class);
+        if (one != null) {
+            evaluation.setId(one.getId());
+        }
         evaluation.setCreateTime(new Date());
         evaluation.setUpdateTime(new Date());
         evaluation.setHandleStatus(false);
         evaluation.setUserId(sysUserFeignService.queryUserInfo().getId());
-        return this.save(evaluation);
+        return this.saveOrUpdate(evaluation);
     }
 
     /**
@@ -176,7 +183,7 @@ public class CoursePatrolEvaluationServiceImpl extends ServiceImpl<CoursePatrolE
             throw new BizException("巡堂评价不存在");
         }
         // 处理建议
-        if(StringUtils.isBlank(coursePatrolEvaluation.getSuggestion())) {
+        if(!StringUtils.isBlank(coursePatrolEvaluation.getSuggestion())) {
             evaluation.setSuggestion(coursePatrolEvaluation.getSuggestion());
             evaluation.setHandleStatus(true);
         }

mec-biz/src/main/resources/config/mybatis/CoursePatrolEvaluationMapper.xml

@@ -9,7 +9,7 @@
              , cs.id_                   as courseScheduleId
              , cs.type_                 as courseType
              , cs.name_                 as courseName
-             , cs.class_date_           as classDate
+             , cs.class_date_           as courseDate
              , cs.start_class_time_     as startClassTime
              , cs.end_class_time_       as endClassTime
              , cs.status_               as courseStatus
@@ -29,6 +29,9 @@
             left join sys_user su on cs.actual_teacher_id_ = su.id_
         </if>
         <where>
+            <if test="param.patrolFlag != null and param.patrolFlag">
+                and t.id_ is not null
+            </if>
             <if test="param.keyword != null and param.keyword != ''">
                 and (su.real_name_ like concat('%', #{param.keyword}, '%')
                 or su.id_ like concat('%', #{param.keyword}, '%')

mec-web/src/main/java/com/ym/mec/web/controller/school/CoursePatrolEvaluationController.java

@@ -59,6 +59,7 @@ public class CoursePatrolEvaluationController extends BaseController {
     public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo>> webPage(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query) {
 
         query.setOrganId(organizationService.getEmployeeOrgan(query.getOrganId()));
+        query.setPatrolFlag(true);
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
 
         return succeed(QueryInfo.pageInfo(pages));
@@ -78,8 +79,11 @@ public class CoursePatrolEvaluationController extends BaseController {
     
     @ApiOperation(value = "学校端-添加巡堂信息", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluation")
 	@PostMapping("/save")
-	public HttpResponseResult<JSONObject> add(@Validated(value = ValidGroups.Add.class) @RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluation coursePatrolEvaluation) {
-        
+	public HttpResponseResult<JSONObject> add(@Validated(value = ValidGroups.Add.class) @RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluation coursePatrolEvaluation,@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed();
+        }
+        coursePatrolEvaluation.setCooperationOrganId(coopId);
         // 新增数据
         coursePatrolEvaluationService.add(coursePatrolEvaluation);