修改导出

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

@@ -39,10 +39,13 @@ public class Group {
     private int relevance;
 
 
+    private int maxPoint;
+
+
     public Group() {
     }
 
-    public Group(int groupId, String groupTitle, int qnYear, int groupType, String questionId, int questionnaireId, int relevance) {
+    public Group(int groupId, String groupTitle, int qnYear, int groupType, String questionId, int questionnaireId, int relevance,int maxPoint) {
         this.groupId = groupId;
         this.groupTitle = groupTitle;
         this.qnYear = qnYear;
@@ -50,6 +53,15 @@ public class Group {
         this.questionId = questionId;
         this.questionnaireId = questionnaireId;
         this.relevance = relevance;
+        this.maxPoint = maxPoint;
+    }
+
+    public int getMaxPoint() {
+        return maxPoint;
+    }
+
+    public void setMaxPoint(int maxPoint) {
+        this.maxPoint = maxPoint;
     }
 
     public int getGroupId() {

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

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static org.apache.commons.lang.math.NumberUtils.max;
 
@@ -1206,7 +1207,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                 newGroup.setQuestionId(ids.substring(0, ids.toString().length() - 1));
                 newGroup.setQuestionnaireId(questionnaireId);
                 newGroup.setRelevance(group.getRelevance());
-
+                newGroup.setMaxPoint(group.getMaxPoint());
                 newGroups.add(newGroup);
             }
 
@@ -2129,16 +2130,22 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                                 row.setIsSubmitCertificate(getSplitValue(isSubmitCertificates, i));
                                 row.setIsSubmitIncubation(getSplitValue(isSubmitIncubations, i));
                                 row.setIsEntryYear(getSplitValue(isEntryYears, i));
-
                                 splitIncubatedEnterprisesList.add(row);
                             }
                         }
+                        List<IncubatedEnterprises> finalList = new ArrayList<>();
+
+                        for (IncubatedEnterprises enterprise : splitIncubatedEnterprisesList) {
+                            if ("是".equals(enterprise.getIsEntryYear())) {
+                                finalList.add(enterprise);
+                            }
+                        }
                         //生成excel
                         EasyExcel.write(response.getOutputStream(), IncubatedEnterprises.class).sheet("引导指标四").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex, mergeColumnIndex))
-                                .doWrite(splitIncubatedEnterprisesList);
+                                .doWrite(finalList);
                         response.flushBuffer();
                     }
                     break;
@@ -2364,12 +2371,26 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                                 list.add(row);
                             }
                         }
+
+                        // 用于保存过滤结果
+                        List<SigningMentors> finalList = new ArrayList<>();
+
+                        for (SigningMentors item : list) {
+
+                            // 判断两个字段
+                            if ("是".equals(item.getParticipated()) &&
+                                    "是".equals(item.getMentor())) {
+                                // 添加到结果列表
+                                finalList.add(item);
+                            }
+
+                        }
                         //生成excel
                         EasyExcel.write(response.getOutputStream(), SigningMentors.class).sheet("引导指标七").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex, mergeColumnIndex))
-                                .doWrite(list);
+                                .doWrite(finalList);
                         response.flushBuffer();
                     }
                     break;

src/main/resources/mapper/Questionnaire.xml

@@ -118,10 +118,12 @@
     </select>
 
     <insert id="addQuestionsList" parameterType="com.tiptimes.model.Group">
-        INSERT INTO t_group(group_title, qn_year, group_type, question_id, questionnaire_id,relevance)
+        INSERT INTO t_group(group_title, qn_year, group_type, question_id, questionnaire_id,relevance,max_point)
         VALUES
         <foreach collection="newGroups" item="item" separator=",">
-             (#{item.groupTitle}, #{item.qnYear}, #{item.groupType}, #{item.questionId}, #{item.questionnaireId},#{item.relevance})
+             (#{item.groupTitle}, #{item.qnYear}, #{item.groupType}, #{item.questionId}, #{item.questionnaireId},#{item.relevance},
+            #{item.maxPoint}
+              )
         </foreach>
     </insert>
 
@@ -1316,7 +1318,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=2
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1330,6 +1332,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.area IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
     <!-- 问卷管理-基础指标2 众创空间配备专职工作人员情况(新)-->
@@ -1347,7 +1351,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=3
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1361,6 +1365,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.name IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1378,7 +1384,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=4
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1392,6 +1398,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1408,7 +1416,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=5
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1422,6 +1430,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1444,7 +1454,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=6
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1458,6 +1468,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.courseName IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1488,7 +1500,7 @@
         LEFT JOIN t_record
         ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=7
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1502,6 +1514,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.mentorName IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1519,7 +1533,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=8
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1533,6 +1547,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.activityTime IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1548,7 +1564,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=9
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1562,6 +1578,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.eventName IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>
 
@@ -1575,7 +1593,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=10
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1589,6 +1607,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.funding IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName;
     </select>
 
@@ -1999,7 +2019,7 @@
         LEFT JOIN t_record
         ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=17
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -2013,6 +2033,7 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.mentorName IS NOT NULL
+        group by spaceName
         ORDER BY spaceName
     </select>
     <select id="selectIncubatedEnterprisesListFour"
@@ -2029,7 +2050,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3 and t_answer.`group`=14
+            t_record.process_status = 3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -2043,6 +2064,8 @@
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
+        GROUP BY
+        spaceName
         ORDER BY spaceName
     </select>