Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentVisit.java

@@ -189,7 +189,7 @@ public class StudentVisit extends BaseEntity {
 
     private Long objectId;
 
-    private int probStatus;
+    private Integer probStatus;
 
     private String visitCyCle;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentVisitQueryInfo.java

@@ -18,6 +18,8 @@ public class StudentVisitQueryInfo extends QueryInfo {
 
     private Integer studentId;
 
+    private Integer probStatus;
+
     @ApiModelProperty(value = "分部id", required = false)
     private String organId;
 
@@ -137,4 +139,12 @@ public class StudentVisitQueryInfo extends QueryInfo {
     public void setPurpose(String purpose) {
         this.purpose = purpose;
     }
+
+    public Integer getProbStatus() {
+        return probStatus;
+    }
+
+    public void setProbStatus(Integer probStatus) {
+        this.probStatus = probStatus;
+    }
 }

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

@@ -155,10 +155,10 @@
             <if test="endTime != null">
                 AND sv.visit_time_ &lt;= #{endTime}
             </if>
-            <if test="visitCyCle != null and visitCyCle != ''">
+            <if test="visitCyCle != null ">
                 AND CONVERT (VARCHAR,sv.visit_time,120) LIKE CONCAT('%',#{visitCyCle},'%')
             </if>
-            <if test="probStatus != null and probStatus != ''">
+            <if test="probStatus != null">
                 AND sv.prob_status = #{probStatus}
             </if>
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VisitController.java

@@ -80,9 +80,9 @@ public class VisitController extends BaseController {
     public HttpResponseResult<String> updateProbStatus(@RequestParam("id")Integer id,@RequestParam("probStatus")Integer probStatus) {
         String s = studentVisitService.updateProbStatus(id, probStatus);
         if(s.equals("成功")){
-            return succeed(studentVisitService.updateProbStatus(id,probStatus));
+            return succeed(s);
         }else{
-            return failed(studentVisitService.updateProbStatus(id,probStatus));
+            return failed(s);
         }
 
     }

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -621,7 +621,7 @@ public class TaskController extends BaseController {
 	@GetMapping(value = "/findAllWaitVisit")
 	public void findAllWaitVisit(){
 		Integer tenantId = TenantContextHolder.getTenantId();
-		//查出所有在服务的学员
+		//查出所有在运营的学员
 		List<Student4operating> operatingStudents = studentDao.getOperatingStudents(new HashMap<>());
 		studentPreVisitService.batchInsert(operatingStudents);
 	}

mec-web/src/main/java/com/ym/mec/web/controller/VisitController.java

@@ -64,9 +64,9 @@ public class VisitController extends BaseController {
     public HttpResponseResult<String> updateProbStatus(@RequestParam("id")Integer id,@RequestParam("probStatus")Integer probStatus) {
         String s = studentVisitService.updateProbStatus(id, probStatus);
         if(s.equals("成功")){
-            return succeed(studentVisitService.updateProbStatus(id,probStatus));
+            return succeed(s);
         }else{
-            return failed(studentVisitService.updateProbStatus(id,probStatus));
+            return failed(s);
         }
 
     }