Merge remote-tracking branch 'origin/master'

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageInfo;
 import com.tiptimes.model.*;
 
 import com.tiptimes.model.YearId;
-import com.tiptimes.model.exportDTO.SiteCondition;
 import com.tiptimes.service.FileService;
 import com.tiptimes.service.QuestionnaireService;
 import com.tiptimes.util.*;
@@ -582,6 +581,14 @@ public class QuestionnaireCtrl {
         return questionnaireService.AboutViewListCopy(record);
     }
 
+    @RequestMapping(value = {"/AboutViewCopys"})
+    @ResponseBody
+    public Long AboutViewCopys(@RequestBody Questionnaire questionnaire, HttpServletRequest request) {
+        Long recordId = this.questionnaireService.selectRecordId(questionnaire.getId(),
+                request.getSession().getAttribute("realID").toString());
+        return recordId;
+    }
+
     /**
      * 根据年份查询当前年份所有问题id
      *