代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/activity/ChildActivityRegistrationDao.java

@@ -14,4 +14,7 @@ public interface ChildActivityRegistrationDao extends PagingAndSortingRepository
    @Query("select a from ChildActivityRegistrationDO a where a.patient = ?1 and a.activityType = ?2 ")
    ChildActivityRegistrationDO findByPatientAndActivityType(String patient,String activityType);
    @Query("select a from ChildActivityRegistrationDO a where a.patient = ?1 ")
    ChildActivityRegistrationDO findByPatient(String patient);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/activity/ChildActivityEndpoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.activity;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.service.activity.ChildActivityRegistrationService;
import com.yihu.jw.entity.care.activity.ChildActivityRegistrationDO;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -38,6 +39,22 @@ public class ChildActivityEndpoint  extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "isActivityRegist")
    @ApiOperation(value = "活动报名查询")
    public ObjEnvelop isActivityRegist(
            @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient", required = true) String patient) {
        try{
            ChildActivityRegistrationDO registrationDO = activityRegistrationService.isActivityRegist(patient);
            if(registrationDO==null){
                return ObjEnvelop.getSuccess("查询成功",0);
            }else {
                return ObjEnvelop.getSuccess("查询成功",1);
            }
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }
    }
    @PostMapping("applyActivity")
    @ApiOperation(value = "在线报名-根据教师展示")
    public ObjEnvelop applyActivity(

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/activity/ChildActivityRegistrationService.java

@@ -37,7 +37,7 @@ public class ChildActivityRegistrationService {
     */
    public JSONObject applyActivity(String patient, String activityType){
        JSONObject result = new JSONObject();
        ChildActivityRegistrationDO activityRegistrationDO = childActivityRegistrationDao.findByPatientAndActivityType(patient, activityType);
        ChildActivityRegistrationDO activityRegistrationDO = childActivityRegistrationDao.findByPatient(patient);
        if(activityRegistrationDO != null){
            String failMsg = "您已报名过改类型的活动，请勿重复报名！";
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
@@ -88,8 +88,8 @@ public class ChildActivityRegistrationService {
    }
    public ChildActivityRegistrationDO activityDetail(String id){
        return childActivityRegistrationDao.findOne(id);
    public ChildActivityRegistrationDO isActivityRegist(String patient){
        return childActivityRegistrationDao.findByPatient(patient);
    }
}