swagger

ylsf-api/src/main/java/api/controller/cycle/CyclePatientController.java

@@ -118,7 +118,7 @@ public class CyclePatientController extends BaseController {
                 Patients.setSfNumber(0L);
             }
             Patients.setSfNumber(Patients.getSfNumber()+1);
-            if (input.answer!=null)
+            if (input.getAnswer()!=null)
             {
                 String result = cyclepatientService.SaveAnswer( input,Patients, CurrentUser().getUserName());
                 if (Objects.equals(result, ""))

ylsf-entity/src/main/java/api/entity/database/cycle/CycleItem.java

@@ -73,9 +73,9 @@ public class CycleItem {
     @ApiModelProperty("节点id")
     private String nodeId;
     @ApiModelProperty("节点名称")
-    public String name;
+    private String name;
     @ApiModelProperty("节点描述")
-    public String description;
+    private String description;
     @ApiModelProperty("素材类型 1知识库2外部链接")
     private Long materialType;
     @ApiModelProperty("知识库id")

ylsf-entity/src/main/java/api/entity/input/cycle/CycleInput.java

@@ -21,22 +21,22 @@ public class CycleInput {
     private String parentId;
     @ApiModelProperty("节点名称")
     @JsonProperty("name")
-    public String name;
+    private String name;
     @ApiModelProperty("节点描述")
     @JsonProperty("desc")
-    public String desc;
+    private String desc;
     @ApiModelProperty("节点类型1开始2问卷3短信4宣教5外呼")
     @JsonProperty("type")
-    public Long type;
+    private Long type;
     @ApiModelProperty("筛选项")
     @JsonProperty("screen")
-    public String screen;
+    private String screen;
     @ApiModelProperty("开始时间")
     @JsonProperty("startTime")
-    public String startTime;
+    private String startTime;
     @ApiModelProperty("标签")
     @JsonProperty("tags")
-   public List<CycleTagInput>  tags;
+    private List<CycleTagInput>  tags;
     /** 问卷id */
     @ApiModelProperty("问卷id")
     @JsonProperty("questionnaire")

ylsf-entity/src/main/java/api/entity/input/cycle/CycleNodes.java

@@ -11,5 +11,5 @@ import java.util.List;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CycleNodes {
     @JsonProperty("properties")
-    public CycleInput properties;
+    private CycleInput properties;
 }

ylsf-entity/src/main/java/api/entity/input/cycle/CyclePatientInput.java

@@ -10,5 +10,5 @@ import lombok.Data;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CyclePatientInput extends CyclePatient {
     @JsonProperty("answer")
-    public AnswerSheetView answer;
+    private AnswerSheetView answer;
 }

ylsf-entity/src/main/java/api/entity/input/cycle/CycleTagInput.java

@@ -17,8 +17,8 @@ public class CycleTagInput {
     private List<Answer> answerlist;
     @ApiModelProperty("标签")
     @JsonProperty("name")
-    public String  name;
+    private String  name;
     @ApiModelProperty("下级节点id")
     @JsonProperty("nodeId")
-    public String  nodeId;
+    private String  nodeId;
 }

ylsf-service/src/main/java/api/service/cycle/impl/CyclePatientServiceImpl.java

@@ -81,30 +81,30 @@ public class CyclePatientServiceImpl extends BaseServiceImpl<CyclePatientMapper,
                 catch (Exception ignored){}
 
             }
-            Survey s= surveyService.getEntity(Patient.answer.  getSurveyid());
+            Survey s= surveyService.getEntity(Patient.getAnswer().  getSurveyid());
             Date currentDate = new Date(System.currentTimeMillis());
             AnswerSheet answerSheet=new AnswerSheet();
-            answerSheet.setAnsweruser(Patient.answer.getAnsweruser());
+            answerSheet.setAnsweruser(Patient.getAnswer().getAnsweruser());
             answerSheet.setCreatetime(currentDate);
-            answerSheet.setSurveyid(Patient.answer.getSurveyid());
-            answerSheet.setEndtime(Patient.answer.getEndtime());
-            answerSheet.setStarttime(Patient.answer.getStarttime());
-            answerSheet.setEntername(Patient.answer.getEntername());
-            answerSheet.setEnterphone(Patient.answer.getEnterphone());
+            answerSheet.setSurveyid(Patient.getAnswer().getSurveyid());
+            answerSheet.setEndtime(Patient.getAnswer().getEndtime());
+            answerSheet.setStarttime(Patient.getAnswer().getStarttime());
+            answerSheet.setEntername(Patient.getAnswer().getEntername());
+            answerSheet.setEnterphone(Patient.getAnswer().getEnterphone());
             answerSheet.setDeleteflag(0L);
-            answerSheet.setNickname(Patient.answer.getNickname());
-            answerSheet.setImgurl(Patient.answer.getImgurl());
+            answerSheet.setNickname(Patient.getAnswer().getNickname());
+            answerSheet.setImgurl(Patient.getAnswer().getImgurl());
             answerSheet.setPlanId(Patient.getCycleId());
             answerSheet.setTaskId(Patient.getPatientCycleId());
             boolean result = answersheetService.insert(answerSheet);
             if (result) {
                 LambdaUpdateWrapper<Survey> sqw=new LambdaUpdateWrapper<>();
-                sqw.eq(Survey::getSurveyId,Patient.answer.getSurveyid());
+                sqw.eq(Survey::getSurveyId,Patient.getAnswer().getSurveyid());
                 sqw.set(Survey::getAnswercount,s.getAnswercount()==null?1:s.getAnswercount()+1);
                 surveyService.updateBatch(sqw);
-                if(Patient.answer.getAnswerlist()!=null&& (long) Patient.answer.getAnswerlist().size() >0)
+                if(Patient.getAnswer().getAnswerlist()!=null&& (long) Patient.getAnswer().getAnswerlist().size() >0)
                 {
-                    List<Answer> answers=Patient.answer.getAnswerlist();
+                    List<Answer> answers=Patient.getAnswer().getAnswerlist();
                     for (Answer as:answers){
                         as.setCreatetime(currentDate);
                         as.setDeleteflag(0L);