/tBoardStatistic/getBoardSurvey 获取展板统计概况

加上区域条件

src/main/java/cn/chnmuseum/party/model/TBoardSurvey.java

@@ -14,6 +14,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -58,4 +59,13 @@ public class TBoardSurvey implements Serializable {
     @ApiModelProperty("机构编码")
     private String organCode;
 
+    @ApiModelProperty("地区编码")
+    private String areaCode;
+
+    /**
+     * 地区id集合
+     */
+    @ApiModelProperty(hidden = true)
+    private List<String> areaIds;
+
 }

src/main/java/cn/chnmuseum/party/web/controller/LearningProjectController.java

@@ -146,7 +146,8 @@ public class LearningProjectController extends BaseController {
     })
     @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
     public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
-        this.learningContentService.remove(Wrappers.<LearningContent>lambdaUpdate().eq(LearningContent::getLearningProjectId, id));
+        //按照王亭亭的要求 删除学习项目，不删除学习内容 所以注释掉下面一行代码
+//        this.learningContentService.remove(Wrappers.<LearningContent>lambdaUpdate().eq(LearningContent::getLearningProjectId, id));
         this.learningProjectService.removeById(id);
         return getSuccessResult();
     }

src/main/java/cn/chnmuseum/party/web/controller/TBoardStatisticController.java

@@ -69,6 +69,9 @@ public class TBoardStatisticController extends BaseController {
         if (StringUtils.isEmpty(survey.getStatisticDate())) {
             survey.setStatisticDate(DateUtil.getCurrentDate("yyyyMM"));
         }
+        //加上区域条件
+        List<String> areaIds = findAllAreaIdByParentCode(survey.getAreaCode());
+        survey.setAreaIds(areaIds);
         TBoardSurvey result = this.tBoardStatisticService.getBoardSurvey(survey);
 
         return getResult(result);

src/main/resources/mapper/TBoardStatisticMapper.xml

@@ -194,6 +194,14 @@
             <if test="organId != null">
                 and s.organ_id = #{organId}
             </if>
+
+            <if test="areaIds !=null and areaIds.size() > 0">
+                AND s.area_id IN
+                <foreach collection="areaIds" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+
             <if test="organCode != null">
                 and o.code LIKE concat(#{organCode}, '%')
             </if>
@@ -220,6 +228,14 @@
                         <if test="organCode != null">
                             and o.code LIKE concat(#{organCode}, '%')
                         </if>
+
+                        <if test="areaIds !=null and areaIds.size() > 0">
+                            AND s.area_id IN
+                            <foreach collection="areaIds" separator="," open="(" close=")" item="item">
+                                #{item}
+                            </foreach>
+                        </if>
+
                     </where>
                     GROUP BY s.board_id ) a
     </select>
@@ -244,6 +260,14 @@
                 <if test="organCode != null">
                     and o.code LIKE concat(#{organCode}, '%')
                 </if>
+
+                <if test="areaIds !=null and areaIds.size() > 0">
+                    AND s.area_id IN
+                    <foreach collection="areaIds" separator="," open="(" close=")" item="item">
+                        #{item}
+                    </foreach>
+                </if>
+
             </where>
 	        GROUP BY s.organ_id ) a
     </select>
@@ -264,6 +288,14 @@
             <if test="organCode != null">
                 and o.code LIKE concat(#{organCode}, '%')
             </if>
+
+            <if test="areaIds !=null and areaIds.size() > 0">
+                AND o.area_id IN
+                <foreach collection="areaIds" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+
         </where>
     </select>
     <!-- 互动频次统计 -->