民意征集修改

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollect/controller/IcPublicOpinionCollectController.java

@@ -18,6 +18,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.unis.interactiveCommunication.modular.icPublicOpinionCollect.param.*;
 import com.unis.interactiveCommunication.modular.icPublicOpinionCollect.vo.IcPublicOpinionCollectVO;
+import com.unis.interactiveCommunication.modular.icPublicOpinionCollectMessage.param.IcPublicOpinionCollectMessageIdParam;
 import com.unis.openGovernment.modular.ogAdministrativeDocument.param.OgAdministrativeDocumentAndStatusParam;
 import com.unis.organization.modular.iodepartmentfunction.entity.BizIoDepartmentFunction;
 import io.swagger.annotations.Api;
@@ -42,7 +43,7 @@ import java.util.List;
  * 互动交流-民意征集管理表控制器
  *
  * @author hjc
- * @date  2024/05/23 19:44
+ * @date 2024/05/23 19:44
  */
 @Api(tags = "互动交流-民意征集管理表控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
@@ -57,7 +58,7 @@ public class IcPublicOpinionCollectController {
      * 获取互动交流-民意征集管理表分页
      *
      * @author hjc
-     * @date  2024/05/23 19:44
+     * @date 2024/05/23 19:44
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取互动交流-民意征集管理表分页")
@@ -71,7 +72,7 @@ public class IcPublicOpinionCollectController {
      * 启用，禁用
      *
      * @author hjc
-     * @date  2024/05/20 16:18
+     * @date 2024/05/20 16:18
      */
     @ApiOperationSupport(order = 4)
     @ApiOperation("启用，禁用")
@@ -88,7 +89,7 @@ public class IcPublicOpinionCollectController {
      * 获取互动交流-民意征集管理表详情
      *
      * @author hjc
-     * @date  2024/05/23 19:44
+     * @date 2024/05/23 19:44
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取互动交流-民意征集管理表详情")
@@ -99,10 +100,25 @@ public class IcPublicOpinionCollectController {
     }
 
     /**
+     * 审核留言-通过、不通过
+     *
+     * @author hjc
+     * @date 2024/05/23 23:40
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("审核留言-通过、不通过")
+    //@SaCheckPermission("/interactiveCommunication/icPublicOpinionCollectMessage/detail")
+    @PostMapping("/interactiveCommunication/icPublicOpinionCollect/auditStatus")
+    public CommonResult<String> auditStatus(@RequestBody @Valid IcPublicOpinionAuditStatusParam icPublicOpinionAuditStatusParam) {
+        icPublicOpinionCollectService.auditStatus(icPublicOpinionAuditStatusParam);
+        return CommonResult.ok();
+    }
+
+    /**
      * 获取征集部门信息
      *
      * @author hjc
-     * @date  2024/05/23 19:44
+     * @date 2024/05/23 19:44
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取征集部门信息")
@@ -111,11 +127,12 @@ public class IcPublicOpinionCollectController {
     public CommonResult<List<BizIoDepartmentFunction>> getIoDepartmentFunction() {
         return CommonResult.data(icPublicOpinionCollectService.getIoDepartmentFunction());
     }
+
     /**
      * 添加互动交流-民意征集管理表
      *
      * @author hjc
-     * @date  2024/05/23 19:44
+     * @date 2024/05/23 19:44
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加互动交流-民意征集管理表")
@@ -132,7 +149,7 @@ public class IcPublicOpinionCollectController {
      * 网站-分页展示
      *
      * @author hjc
-     * @date  2024/05/23 19:44
+     * @date 2024/05/23 19:44
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("网站-分页展示")
@@ -141,7 +158,21 @@ public class IcPublicOpinionCollectController {
     public CommonResult<Page<IcPublicOpinionCollect>> getSitePage(IcPublicOpinionCollectPageParam icPublicOpinionCollectPageParam) {
         return CommonResult.data(icPublicOpinionCollectService.getSitePage(icPublicOpinionCollectPageParam));
     }
-/*    *
+
+    /**
+     * 网站-详情
+     *
+     * @author hjc
+     * @date 2024/05/23 19:44
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("网站-详情")
+    // @SaCheckPermission("/interactiveCommunication/icPublicOpinionCollect/detail")
+    @GetMapping("/interactiveCommunication/icPublicOpinionCollect/siteDetail")
+    public CommonResult<JSONObject> siteDetail(@Valid IcPublicOpinionCollectIdParam icPublicOpinionCollectIdParam) {
+        return CommonResult.data(icPublicOpinionCollectService.siteDetail(icPublicOpinionCollectIdParam));
+    }
+    /*    *
      * 编辑互动交流-民意征集管理表
      *
      * @author hjc
@@ -156,15 +187,15 @@ public class IcPublicOpinionCollectController {
         icPublicOpinionCollectService.edit(icPublicOpinionCollectEditParam);
         return CommonResult.ok();
     }
-/*
+    /*
 
-    */
+     */
 /**
-     * 删除互动交流-民意征集管理表
-     *
-     * @author hjc
-     * @date  2024/05/23 19:44
-     *//*
+ * 删除互动交流-民意征集管理表
+ *
+ * @author hjc
+ * @date 2024/05/23 19:44
+ *//*
 
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除互动交流-民意征集管理表")
@@ -179,8 +210,4 @@ public class IcPublicOpinionCollectController {
 */
 
 
-
-
-
-
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollect/mapper/mapping/IcPublicOpinionCollectMapper.xml

@@ -6,9 +6,28 @@
     <select id="selectMyPage"
             resultType="com.unis.interactiveCommunication.modular.icPublicOpinionCollect.vo.IcPublicOpinionCollectVO">
 
-        SELECT t1.*,t3.department_name, count( t2.public_opinion_collect_id ) viewsNumber FROM biz_ic_public_opinion_collect t1 LEFT JOIN
-        biz_ic_public_opinion_collect_message t2 ON t1.id = t2.public_opinion_collect_id
-              left join biz_io_department_function t3 on t1.io_department_function_id=t3.id
+        SELECT
+        t1.*,
+        t3.department_name,
+        ifnull( count( t2.public_opinion_collect_id ), 0 ) viewsNumber,
+        ifnull( t4.auditPassStatusNumber, 0 ) auditPassStatusNumber
+        FROM
+        biz_ic_public_opinion_collect t1
+        LEFT JOIN biz_ic_public_opinion_collect_message t2 ON t1.id = t2.public_opinion_collect_id
+        LEFT JOIN biz_io_department_function t3 ON t1.io_department_function_id = t3.id
+        LEFT JOIN (
+        SELECT
+        t1.id,
+        ifnull( count( t2.audit_status ), 0 ) auditPassStatusNumber
+        FROM
+        biz_ic_public_opinion_collect t1
+        LEFT JOIN biz_ic_public_opinion_collect_message t2 ON t1.id = t2.public_opinion_collect_id
+        WHERE
+        t2.audit_status = '1'
+        GROUP BY
+        t1.id
+        ) t4 ON t1.id = t4.id
+
         <where>
 
             <if test="collectionTitle!=null and collectionTitle!=''">

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollect/param/IcPublicOpinionAuditStatusParam.java

@@ -0,0 +1,26 @@
+package com.unis.interactiveCommunication.modular.icPublicOpinionCollect.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author hjc
+ * @date 2024/7/30 11:02
+ */
+@Data
+public class IcPublicOpinionAuditStatusParam {
+
+
+    /** 留言记录唯一标识符 */
+    @ApiModelProperty(value = "留言记录唯一标识符", required = true)
+    @NotBlank(message = "id不能为空")
+    private String id;
+
+    /** 状态 0：未审核；1：审核通过；2：审核不通过； */
+    @ApiModelProperty(value = "状态 1：审核通过；2：审核不通过；", position = 10)
+    @NotNull(message = "审核状态不能为空")
+    private Integer auditStatus;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollect/service/IcPublicOpinionCollectService.java

@@ -101,4 +101,20 @@ public interface IcPublicOpinionCollectService extends IService<IcPublicOpinionC
      * @date  2024/05/23 19:44
      */
     Page<IcPublicOpinionCollect> getSitePage(IcPublicOpinionCollectPageParam icPublicOpinionCollectPageParam);
+
+    /**
+     * 审核留言-通过、不通过
+     *
+     * @author hjc
+     * @date  2024/05/23 23:40
+     */
+    void auditStatus(IcPublicOpinionAuditStatusParam icPublicOpinionAuditStatusParam);
+
+    /**
+     * 获取网站-详情
+     *
+     * @author hjc
+     * @date 2024/05/23 19:44
+     */
+    JSONObject siteDetail(IcPublicOpinionCollectIdParam icPublicOpinionCollectIdParam);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollect/service/impl/IcPublicOpinionCollectServiceImpl.java

@@ -17,7 +17,10 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -63,24 +66,9 @@ public class IcPublicOpinionCollectServiceImpl extends ServiceImpl<IcPublicOpini
 
     @Override
     public Page<IcPublicOpinionCollectVO> page(IcPublicOpinionCollectPageParam pageParam) {
-      /*  QueryWrapper<IcPublicOpinionCollect> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(icPublicOpinionCollectPageParam.getCollectionTitle())) {
-            queryWrapper.like("collection_title", icPublicOpinionCollectPageParam.getCollectionTitle());
-        }
-        if (ObjectUtil.isNotEmpty(icPublicOpinionCollectPageParam.getProgressStatus())) {
-            queryWrapper.eq("progress_status", icPublicOpinionCollectPageParam.getProgressStatus());
-        }
-        if (ObjectUtil.isAllNotEmpty(icPublicOpinionCollectPageParam.getSortField(), icPublicOpinionCollectPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(icPublicOpinionCollectPageParam.getSortOrder());
-            queryWrapper.orderBy(true, icPublicOpinionCollectPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(icPublicOpinionCollectPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(IcPublicOpinionCollect::getId);
-        }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);*/
+
 
         Page<IcPublicOpinionCollectVO> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-        /* return bizIoDepartmentFunctionMapper.selectMyPage(page, pageParam.getCollectionTitle(), pageParam.getProgressStatus());*/
         return icPublicOpinionCollectMapper.selectMyPage(page, pageParam.getCollectionTitle(), pageParam.getProgressStatus());
 
     }
@@ -98,10 +86,10 @@ public class IcPublicOpinionCollectServiceImpl extends ServiceImpl<IcPublicOpini
             if (date.compareTo(startTime) == 0 || startTime.before(date)) {
                 icPublicOpinionCollect.setProgressStatus(1);
             }
-            if (date.before(startTime)){
+            if (date.before(startTime)) {
                 icPublicOpinionCollect.setProgressStatus(0);
             }
-            if ( date.after(endTime)) {
+            if (date.after(endTime)) {
                 icPublicOpinionCollect.setProgressStatus(2);
             }
         }
@@ -195,7 +183,7 @@ public class IcPublicOpinionCollectServiceImpl extends ServiceImpl<IcPublicOpini
                 if (date.compareTo(startTime) == 0 || startTime.before(date) && endTime.after(date)) {
                     icPublicOpinionCollect.setProgressStatus(1);
                 }
-                if (date.after(endTime)){
+                if (date.after(endTime)) {
                     throw new CommonException("已结束收集，不能进行启用");
                 }
             }
@@ -207,7 +195,7 @@ public class IcPublicOpinionCollectServiceImpl extends ServiceImpl<IcPublicOpini
                 if (startTime.after(date)) {
                     icPublicOpinionCollect.setProgressStatus(0);
                 }
-                if (endTime.before(date)){
+                if (endTime.before(date)) {
                     icPublicOpinionCollect.setProgressStatus(2);
                 }
             }
@@ -235,4 +223,44 @@ public class IcPublicOpinionCollectServiceImpl extends ServiceImpl<IcPublicOpini
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
+
+    /**
+     * 审核留言-通过、不通过
+     *
+     * @author hjc
+     * @date 2024/05/23 23:40
+     */
+    @Override
+    public void auditStatus(IcPublicOpinionAuditStatusParam icPublicOpinionAuditStatusParam) {
+
+        icPublicOpinionCollectMessageMapper.update(null, new LambdaUpdateWrapper<IcPublicOpinionCollectMessage>()
+                .eq(IcPublicOpinionCollectMessage::getId, icPublicOpinionAuditStatusParam.getId())
+                .set(IcPublicOpinionCollectMessage::getAuditStatus, icPublicOpinionAuditStatusParam.getAuditStatus()));
+    }
+
+    /**
+     * 获取网站-详情
+     *
+     * @author hjc
+     * @date 2024/05/23 19:44
+     */
+    @Override
+    public JSONObject siteDetail(IcPublicOpinionCollectIdParam icPublicOpinionCollectIdParam) {
+        JSONObject jsonObject = new JSONObject();
+
+        IcPublicOpinionCollect icPublicOpinionCollect = icPublicOpinionCollectMapper.selectById(icPublicOpinionCollectIdParam.getId());
+        if (ObjectUtil.isEmpty(icPublicOpinionCollect)) {
+            throw new CommonException("暂无对应数据，id为{}", icPublicOpinionCollectIdParam.getId());
+        }
+        jsonObject.put("icPublicOpinionCollect", icPublicOpinionCollect);
+
+        //意见征集数据
+        List<IcPublicOpinionCollectMessage> icPublicOpinionCollectMessages = icPublicOpinionCollectMessageMapper
+                .selectList(Wrappers.lambdaQuery(IcPublicOpinionCollectMessage.class)
+                        .eq(IcPublicOpinionCollectMessage::getPublicOpinionCollectId, icPublicOpinionCollect.getId())
+                        .eq(IcPublicOpinionCollectMessage::getAuditStatus, 1));
+        jsonObject.put("icPublicOpinionCollectMessages", icPublicOpinionCollectMessages);
+
+        return jsonObject;
+    }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollect/vo/IcPublicOpinionCollectVO.java

@@ -19,4 +19,7 @@ public class IcPublicOpinionCollectVO extends IcPublicOpinionCollect {
     @ApiModelProperty(value = "征集部门名称")
     private String departmentName;
 
+    @ApiModelProperty(value = "审核通过意见数量")
+    private Integer auditPassStatusNumber;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollectMessage/entity/IcPublicOpinionCollectMessage.java

@@ -70,4 +70,8 @@ public class IcPublicOpinionCollectMessage {
     /** 留言内容 */
     @ApiModelProperty(value = "留言内容", position = 9)
     private String content;
+
+    /** 状态 0：未审核；1：审核通过；2：审核不通过； */
+    @ApiModelProperty(value = "状态 0：未审核；1：审核通过；2：审核不通过；", position = 10)
+    private Integer auditStatus;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollectMessage/param/IcPublicOpinionCollectMessageAddParam.java

@@ -47,4 +47,8 @@ public class IcPublicOpinionCollectMessageAddParam {
     @ApiModelProperty(value = "留言内容", position = 9)
     private String content;
 
+    /** 状态 0：未审核；1：审核通过；2：审核不通过； */
+    @ApiModelProperty(value = "状态 0：未审核；1：审核通过；2：审核不通过；", position = 10)
+    private Integer auditStatus;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/interactiveCommunication/modular/icPublicOpinionCollectMessage/param/IcPublicOpinionCollectMessageEditParam.java

@@ -52,4 +52,7 @@ public class IcPublicOpinionCollectMessageEditParam {
     @ApiModelProperty(value = "留言内容", position = 9)
     private String content;
 
+    /** 状态 0：未审核；1：审核通过；2：审核不通过； */
+    @ApiModelProperty(value = "状态 0：未审核；1：审核通过；2：审核不通过；", position = 10)
+    private Integer auditStatus;
 }