咨询建议导出

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/EvaluateQO.java

@@ -95,6 +95,8 @@ public class EvaluateQO extends PageQO{
 
     private List<Integer> storeIdList;
 
+    private Integer[] evaluateIds;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -294,4 +296,12 @@ public class EvaluateQO extends PageQO{
     public void setStoreIdList(List<Integer> storeIdList) {
         this.storeIdList = storeIdList;
     }
+
+    public Integer[] getEvaluateIds() {
+        return evaluateIds;
+    }
+
+    public void setEvaluateIds(Integer[] evaluateIds) {
+        this.evaluateIds = evaluateIds;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/ProblemQO.java

@@ -26,6 +26,8 @@ public class ProblemQO extends PageQO {
 
     private List<Integer> storeIdList;
 
+    private Integer[] problemIds;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -97,4 +99,12 @@ public class ProblemQO extends PageQO {
     public void setStoreIdList(List<Integer> storeIdList) {
         this.storeIdList = storeIdList;
     }
+
+    public Integer[] getProblemIds() {
+        return problemIds;
+    }
+
+    public void setProblemIds(Integer[] problemIds) {
+        this.problemIds = problemIds;
+    }
 }

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -57,6 +57,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="null != evaluateIds and evaluateIds.size > 0">
+        and evaluate_id in
+        <foreach collection="evaluateIds" index="index" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="search != null and search != '' ">
         and ( order_number like concat('%', #{search}, '%')
         or member_name like concat('%', #{search}, '%')

gic-evaluate-service/src/main/resources/mapper/TabProblemMapper.xml

@@ -229,6 +229,12 @@
     <include refid="Base_Column_List" />
     from tab_problem
     <where>
+      <if test="null != problemIds and problemIds.size > 0">
+        and problem_id in
+        <foreach collection="problemIds" index="index" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="null != storeIdList and storeIdList.size > 0">
         and store_id in
         <foreach collection="storeIdList" index="index" item="item" open="(" separator="," close=")">
@@ -267,6 +273,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="null != problemIds and problemIds.size > 0">
+        and problem_id in
+        <foreach collection="problemIds" index="index" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
         <if test="search != null and search != '' ">
           and (
           member_name like concat('%', #{search}, '%')

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateExportController.java

@@ -60,6 +60,10 @@ public class EvaluateExportController extends DownloadUtils {
     @RequestMapping("/export-evaluate")
     public RestResponse exportEvaluateRecord(HttpServletRequest request, EvaluateQO evaluateQO, ExportQO exportQO) {
         evaluateQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (evaluateQO.getEvaluateIds() != null && evaluateQO.getEvaluateIds().length == 1 && evaluateQO.getEvaluateIds()[0] == -1) {
+            // 查询全部
+            evaluateQO.setEvaluateIds(null);
+        }
         ServiceResponse<Integer> serviceResponse = evaluateManageApiService.countEvaluate(evaluateQO);
 
         List<String> fieldCodeList = exportQO.getFieldCodeList();

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/ProblemExportController.java

@@ -60,6 +60,10 @@ public class ProblemExportController extends DownloadUtils {
     @RequestMapping("/export-problem")
     public RestResponse exportProblemRecord(HttpServletRequest request, ProblemQO problemQO, ExportQO exportQO) {
         problemQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (problemQO.getProblemIds() != null && problemQO.getProblemIds().length == 1 && problemQO.getProblemIds()[0] == -1) {
+            // 查询全部
+            problemQO.setProblemIds(null);
+        }
         ServiceResponse<Integer> serviceResponse = problemManageApiService.countProblem(problemQO);
 
         List<String> fieldCodeList = exportQO.getFieldCodeList();