Merge remote-tracking branch 'origin/master'

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -567,7 +568,7 @@ public class QuestionnaireCtrl {
         return questionnaireService.selectRecordList1(record);
     }
     /**
-     * 查询问卷管理列表
+     *
      *
      * @param record
      * @return
@@ -578,19 +579,13 @@ public class QuestionnaireCtrl {
         return questionnaireService.AboutViewListCopy(record);
     }
 
-//    ,method = RequestMethod.GET
-    @RequestMapping(value = {"/{realID}"})
+    @RequestMapping({"/AboutViewMethod"})
     @ResponseBody
-    public Record AboutViewCopyVo(@PathVariable("realID") Integer realID) {
-        return questionnaireService.AboutViewListCopyVo(realID);
-    }
-
-    @RequestMapping(value = {"/AboutViewCopys"})
-    @ResponseBody
-    public Long AboutViewCopys(@PathVariable("realID") Questionnaire questionnaire, HttpServletRequest request) {
-        Long recordId = this.questionnaireService.selectRecordId(questionnaire.getId(),
-                request.getSession().getAttribute("realID").toString());
-        return recordId;
+    public List<Record> AboutViewvip(HttpServletRequest request, Record realID) {
+        HttpSession session = request.getSession();
+        session.getAttribute("realID").toString();
+        List<Record> recordList = questionnaireService.AboutViewListCopy((Record) session);
+        return recordList;
     }
 
     /**

src/main/java/com/tiptimes/dao/QuestionnaireDao.java

@@ -120,8 +120,6 @@ public interface QuestionnaireDao {
 
     List<Record> AboutViewListCopy(Record record);
 
-    Record AboutViewListCopyVo(@Param("realID") Integer realID);
-
     List<SiteCondition> selectSiteConditionListTemp(
             @Param("recordId") String recordId,
             @Param("qnYear") Integer qnYear,

src/main/java/com/tiptimes/service/QuestionnaireService.java

@@ -135,8 +135,6 @@ public interface QuestionnaireService {
 
   List<Record> AboutViewListCopy(Record record);
 
-  Record AboutViewListCopyVo(Integer realID);
-
   void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,
                                    Integer id1, Integer id2, Integer id3,
                                    Integer id9, Integer id10, Integer id11, Integer id12, Integer id13, Integer id14,

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -1404,11 +1404,6 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
         return questionnaireDao.AboutViewListCopy(record);
     }
 
-    @Override
-    public Record AboutViewListCopyVo(Integer realID) {
-        return questionnaireDao.AboutViewListCopyVo(realID);
-    }
-
     /**
      * 2023年修改导出问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据
      *

src/main/resources/mapper/Questionnaire.xml

@@ -1098,6 +1098,7 @@
         create_id as 'createId'
         from t_record
         <where>
+                AND create_id = #{realID}
             <if test="createBy != null and createBy != ''">
                 AND create_by like concat(concat('%',#{createBy},'%'))
             </if>
@@ -1117,10 +1118,6 @@
         ORDER BY create_time DESC
     </select>
 
-    <select id="AboutViewListCopyVo" resultType="com.tiptimes.model.Record">
-        select * from t_record where create_id =#{realID}
-    </select>
-
     <!-- 问卷管理-导出基础指标1 众创空间场地情况、是否租赁场地(新)-->
     <select id="selectSiteConditionListTemp" resultType="com.tiptimes.model.exportDTO.SiteCondition">
         SELECT *