新创SQL

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

@@ -612,7 +612,7 @@ public class QuestionnaireCtrl {
      */
     @RequestMapping(value = {"/exportFullTimeWorkPersonNew"})
     @ResponseBody
-    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,
+    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,String createId,
                                             Integer id1, Integer id2, Integer id3,//基础指标1
                                             Integer id9, Integer id10, Integer id11, Integer id12, Integer id13, Integer id14,//基础指标2
                                             Integer id16, Integer id17, Integer id18, Integer id19, Integer id20,//基础指标3
@@ -635,7 +635,7 @@ public class QuestionnaireCtrl {
                                             Integer id97, Integer id98, //奖励指标4，5
                                             Integer qnYear
     ) {
-        questionnaireService.exportFullTimeWorkPersonNew(request, response, index, recordId, qnYear,
+        questionnaireService.exportFullTimeWorkPersonNew(request, response, index, recordId, qnYear, createId,
                 id1, id2, id3,//基础指标1
                 id9, id10, id11, id12, id13, id14,//基础指标2
                 id16, id17, id18, id19, id20,//基础指标3

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

@@ -127,7 +127,8 @@ public interface QuestionnaireDao {
             @Param("qnYear") Integer qnYear,
             @Param("id1") Integer id1,
             @Param("id2") Integer id2,
-            @Param("id3") Integer id3
+            @Param("id3") Integer id3,
+            @Param("createId") String createId
     );
 
     List<FullTimeWorkPerson> selectFullTimeWorkPersonListNew(

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

@@ -142,7 +142,7 @@ public interface QuestionnaireService {
 
   List<Record> AboutCopy(Record record);
 
-  void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,
+  void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,String createId,
                                    Integer id1, Integer id2, Integer id3,
                                    Integer id9, Integer id10, Integer id11, Integer id12, Integer id13, Integer id14,
                                    Integer id16, Integer id17, Integer id18, Integer id19, Integer id20,

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

@@ -48,7 +48,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     /**
      * 根据上报人和问卷id查询上报记录id
      *
-     * @param questionnaireUuid 问卷id
+//     * @param questionnaireUuid 问卷id
      * @param createId          上报人唯一标识
      * @return
      */
@@ -1427,7 +1427,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
      * @param recordId 上报记录id
      */
     @Override
-    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId, Integer qnYear,
+    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId, Integer qnYear,String createId,
                                             Integer id1, Integer id2, Integer id3,
                                             Integer id9, Integer id10, Integer id11, Integer id12, Integer id13, Integer id14,
                                             Integer id16, Integer id17, Integer id18, Integer id19, Integer id20,
@@ -1487,7 +1487,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                             new String((fileName_a).getBytes("gb2312"),
                                     "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> siteConditionList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3);
+                    List<SiteCondition> siteConditionList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3, createId);
                     if (siteConditionList != null) {
                         for (int i = 0; i < siteConditionList.size(); i++) {
                             //excel生成序号
@@ -1669,7 +1669,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_aa = "引导指标一";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_aa).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> leadingIndicatorOneList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3);
+                    List<SiteCondition> leadingIndicatorOneList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3, createId);
                     if (leadingIndicatorOneList != null) {
                         for (int i = 0; i < leadingIndicatorOneList.size(); i++) {
                             //excel生成序号
@@ -1690,7 +1690,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_bb = "引导指标二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_bb).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> leadingIndicatorTwoList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3);
+                    List<SiteCondition> leadingIndicatorTwoList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3,createId);
                     if (leadingIndicatorTwoList != null) {
                         for (int i = 0; i < leadingIndicatorTwoList.size(); i++) {
                             //excel生成序号

src/main/resources/mapper/Questionnaire.xml

@@ -1141,6 +1141,9 @@
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
             t_record.process_status = 3
+            <if test="createId != null or createId != ''">
+                AND create_id = #{createId}
+            </if>
             <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
                 AND qn_year = YEAR(NOW())
             </if>