新项目提交

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

@@ -52,8 +52,9 @@ public class QuestionnaireCtrl {
         int result;
         Map<String, Object> map = new HashMap();
         //1.通过上报人和问卷id查询上报记录id
-        Long recordId = this.questionnaireService.selectRecordId(questionnaire.getId(),
-                request.getSession().getAttribute("realID").toString());
+//        Long recordId = this.questionnaireService.selectRecordId(questionnaire.getId(),
+//                request.getSession().getAttribute("realID").toString());
+          Long recordId = this.questionnaireService.selectRecordIds(questionnaire.getCreateId());
         //2.若recordId为空去添加上报记录，并返回自增id
         if (recordId == null) {
             recordId = this.questionnaireService.insertRecord(new Record(questionnaire.getId(), questionnaire.getQuestionnaireName(),
@@ -579,6 +580,12 @@ public class QuestionnaireCtrl {
         return questionnaireService.AboutViewListCopy(record);
     }
 
+    @RequestMapping(value = {"/AboutCopy"})
+    @ResponseBody
+    public List<Record> AbouCopy(@RequestBody Record record) {
+        return questionnaireService.AboutCopy(record);
+    }
+
     @RequestMapping({"/AboutViewMethod"})
     @ResponseBody
     public List<Record> AboutViewvip(HttpServletRequest request, Record realID) {

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

@@ -26,6 +26,8 @@ public interface QuestionnaireDao {
     Long selectRecordId(@Param("questionnaireUuid") Long questionnaireUuid,
                         @Param("createId") String createId);
 
+    Long selectRecordIds(String createId);
+
     Long insertRecord(Record record);
 
     Integer delAnswer(@Param("recordId") Long recordId);
@@ -120,6 +122,8 @@ public interface QuestionnaireDao {
 
     List<Record> AboutViewListCopy(Record record);
 
+    List<Record> AboutCopy(Record record);
+
     List<SiteCondition> selectSiteConditionListTemp(
             @Param("recordId") String recordId,
             @Param("qnYear") Integer qnYear,

src/main/java/com/tiptimes/model/Record.java

@@ -135,8 +135,8 @@ public class Record {//上报记录表
         this.writePeople = writePeople;
     }
 
-    public Record(Long questionnaireUuid, String questionnaireName, Integer processStatus, String phoneNumber,
-                  String createBy,String writePeople, Date createTime, String createId,Integer qnYear) {
+    public Record(Long questionnaireUuid, String questionnaireName, Integer processStatus, String writePeople,
+                  String phoneNumber, String createBy, Date createTime, String createId,Integer qnYear) {
         this.questionnaireUuid = questionnaireUuid;
         this.questionnaireName = questionnaireName;
         this.processStatus = processStatus;

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

@@ -20,6 +20,14 @@ public interface QuestionnaireService {
    */
   Long selectRecordId(Long questionnaireUuid,String createId);
 
+  /**
+   * 根据上报人和问卷id查询上报记录id
+   * @param questionnaireUuid 问卷id
+   * @param createId 上报人唯一标识
+   * @return
+   */
+  Long selectRecordIds(String createId);
+
   /**
    * 添加上报记录数据
    * @param record 上报记录
@@ -135,6 +143,8 @@ public interface QuestionnaireService {
 
   List<Record> AboutViewListCopy(Record record);
 
+  List<Record> AboutCopy(Record record);
+
   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

@@ -45,6 +45,19 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
         return questionnaireDao.selectRecordId(questionnaireUuid, createId);
     }
 
+    /**
+     * 根据上报人和问卷id查询上报记录id
+     *
+     * @param questionnaireUuid 问卷id
+     * @param createId          上报人唯一标识
+     * @return
+     */
+    @Override
+    @Transactional(readOnly = true)
+    public Long selectRecordIds(String createId) {
+        return questionnaireDao.selectRecordIds(createId);
+    }
+
     /**
      * 添加上报记录
      *
@@ -1404,6 +1417,11 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
         return questionnaireDao.AboutViewListCopy(record);
     }
 
+    @Override
+    public List<Record> AboutCopy(Record record) {
+        return questionnaireDao.AboutCopy(record);
+    }
+
     /**
      * 2023年修改导出问卷管理-审批页面根据基础指标、引导指标和奖励指标导出所有空间的数据
      *

src/main/resources/mapper/Questionnaire.xml

@@ -102,6 +102,12 @@
           AND create_id = #{createId}
     </select>
 
+    <select id="selectRecordIds" resultType="java.lang.Long">
+        SELECT id
+        FROM t_record
+        WHERE create_id = #{createId}
+    </select>
+
     <select id="selectAnswerByRecordId" resultType="com.tiptimes.model.Answer">
         SELECT options_id AS 'optionsId',`value`, `group`
         FROM t_answer