From 8236752800e2b7a6013d05db30659f6450666bda Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 17 Apr 2024 14:25:20 +0800
Subject: [PATCH] 题目
---
src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java | 9 ++
src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java | 4 +
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 3
src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java | 2
src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java | 33 +++++++
src/main/java/org/springblade/modules/patrol/vo/PatrolGroupVO.java | 4 +
src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java | 12 +++
src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java | 31 +++++++
src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml | 1
src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.xml | 103 +++++++++----------------
src/main/java/org/springblade/modules/article/service/impl/ArticleIntegralServiceImpl.java | 5 +
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 1
12 files changed, 139 insertions(+), 69 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml
index d3d485b..48724b9 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleIntegralMapper.xml
@@ -34,6 +34,7 @@
<if test="articleIntegral.articleId!=null">
and jai.article_id = #{articleIntegral.articleId}
</if>
+ order by jai.create_time desc
</select>
diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleIntegralServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleIntegralServiceImpl.java
index af9501a..5e9a136 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleIntegralServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleIntegralServiceImpl.java
@@ -8,6 +8,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 文章浏览积分表 服务实现类
*
@@ -19,7 +21,8 @@
@Override
public IPage<ArticleIntegralVO> selectArticleIntegralPage(IPage<ArticleIntegralVO> page, ArticleIntegralVO articleIntegral) {
- return page.setRecords(baseMapper.selectArticleIntegralPage(page, articleIntegral));
+ List<ArticleIntegralVO> articleIntegralVOS = baseMapper.selectArticleIntegralPage(page, articleIntegral);
+ return page.setRecords(articleIntegralVOS);
}
diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index b40e43e..8f6aef1 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -233,6 +233,7 @@
integralEntity.setScore(article.getScore());
integralEntity.setArticleId(id);
integralEntity.setHouseCode(houseCode);
+ integralEntity.setCreateUser(AuthUtil.getUserId());
// 插入记录
update = SpringUtils.getBean(IArticleIntegralService.class).save(integralEntity);
}
diff --git a/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java b/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
index 42f0e0a..495d2d1 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
@@ -53,6 +53,10 @@
@ExcelProperty( "候选人")
private String optionContent;
+ @ExcelProperty(value = "投票时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
}
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index 2422490..0948f0c 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -255,7 +255,7 @@
FROM
jczz_house jh
LEFT JOIN jczz_household jhd ON jhd.house_code = jh.house_code
- AND jh.is_deleted = 0
+ AND jh.is_deleted = 0 jhd.relationship = 1
LEFT JOIN jczz_user_topics jut on jut.household_id = jhd.id
<where>
<if test="aoiCodeList != null and aoiCodeList.size() > 0">
@@ -265,6 +265,7 @@
</foreach>
</if>
</where>
+ GROUP BY id
</select>
diff --git a/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java b/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java
index aa3fa25..a3efbc6 100644
--- a/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java
+++ b/src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java
@@ -1,5 +1,7 @@
package org.springblade.modules.patrol.controller;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -10,6 +12,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.modules.patrol.entity.PatrolGroup;
import org.springblade.modules.patrol.service.IPatrolGroupService;
+import org.springblade.modules.patrol.vo.PatrolGroupVO;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -39,6 +42,20 @@
return R.data(pageList);
}
+
+ /**
+ * 检查内容组 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入patrolGroup")
+ public R<IPage<PatrolGroupVO>> page(PatrolGroupVO patrolGroup, Query query) {
+ IPage<PatrolGroupVO> pages = patrolGroupService.selectPatrolGroupPage(Condition.getPage(query), patrolGroup);
+ return R.data(pages);
+ }
+
+
+
/**
* 添加
*
@@ -51,6 +68,20 @@
return R.data(patrolGroupService.save(patrolGroup));
}
+
+ /**
+ * 添加
+ *
+ * @param patrolGroup
+ * @return
+ */
+ @ApiOperation(value = "巡查指标组-添加", notes = "巡查指标组-添加")
+ @PostMapping(value = "/addTwo")
+ public R addTwo(@RequestBody PatrolGroupVO patrolGroup) {
+ return R.data(patrolGroupService.addTwo(patrolGroup));
+ }
+
+
/**
* 编辑
*
diff --git a/src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java b/src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java
index 2b08975..a36c900 100644
--- a/src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java
+++ b/src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java
@@ -34,7 +34,7 @@
/** 内容组id */
@ApiModelProperty(value = "内容组id", example = "")
@TableField("group_id")
- private Integer groupId;
+ private Long groupId;
/** 名称 */
@ApiModelProperty(value = "名称", example = "")
diff --git a/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java b/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java
index b6aba73..fcd1520 100644
--- a/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java
+++ b/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.tool.node.TreeNode;
import org.springblade.modules.patrol.dto.PatrolGroupDTO;
@@ -16,6 +17,14 @@
public interface PatrolGroupMapper extends BaseMapper<PatrolGroup> {
List<PatrolGroup> getPatrolGroupByProjectId(@Param("projectId") String projectId);
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param patrolGroup
+ * @return
+ */
+ List<PatrolGroupVO> selectPatrolGroupPage(IPage page, @Param("patrolGroup") PatrolGroupVO patrolGroup);
/**
* 查询巡查项树数据
diff --git a/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.xml b/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.xml
index 680e025..c410487 100644
--- a/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.xml
+++ b/src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.xml
@@ -9,34 +9,45 @@
AND g.project_id = #{projectId}
</select>
- <!--查询巡查项树数据-->
-<!-- <select id="getPatrolGroupTree" resultType="org.springblade.core.tool.node.TreeNode" >-->
-<!-- (-->
-<!-- SELECT-->
-<!-- spg.id,-->
-<!-- spg.name,-->
-<!-- 0 as parentId,-->
-<!-- (-->
-<!-- SELECT-->
-<!-- CASE WHEN count(1) > 0 THEN 1 ELSE 0 END-->
-<!-- FROM-->
-<!-- jczz_patrol_group_item-->
-<!-- WHERE-->
-<!-- group_id = spg.id and is_deleted = 0-->
-<!-- ) AS "has_children"-->
-<!-- FROM jczz_patrol_group spg where spg.is_deleted = 0-->
-<!-- )-->
-<!-- union all-->
-<!-- (-->
-<!-- SELECT-->
-<!-- spgi.id,-->
-<!-- spgi.items_name as name,-->
-<!-- spgi.group_id as parentId,-->
-<!-- false AS hasChildren-->
-<!-- FROM jczz_patrol_group_item spgi where spgi.is_deleted = 0-->
-<!-- )-->
-<!-- </select>-->
+ <!-- 通用查询映射结果 -->
+ <resultMap id="patrolGroupResultMap" type="org.springblade.modules.patrol.vo.PatrolGroupVO">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <collection property="patrolGroupItemList" javaType="java.util.List" select="selectPatrolGroupItem"
+ column="id"
+ ofType="org.springblade.modules.patrol.vo.PatrolGroupItemVO" autoMapping="true">
+ </collection>
+ </resultMap>
+
+ <select id="selectPatrolGroupItem" resultType="org.springblade.modules.patrol.vo.PatrolGroupItemVO">
+ select
+ id,
+ group_id,
+ items_name,
+ description,
+ create_user,
+ create_time,
+ update_time,
+ is_deleted,
+ type
+ from
+ jczz_patrol_group_item
+ where group_id = #{houseCode} and is_deleted = 0
+ </select>
+
+ <select id="selectPatrolGroupPage" resultMap="patrolGroupResultMap">
+ select * from jczz_patrol_group
+ <where>
+ <if test="patrolGroup.id != null "> and id = #{patrolGroup.id}</if>
+ <if test="patrolGroup.name != null and patrolGroup.name != ''"> and name = #{patrolGroup.name}</if>
+ <if test="patrolGroup.createUser != null "> and create_user = #{patrolGroup.createUser}</if>
+ <if test="patrolGroup.createTime != null "> and create_time = #{patrolGroup.createTime}</if>
+ <if test="patrolGroup.updateTime != null "> and update_time = #{patrolGroup.updateTime}</if>
+ <if test="patrolGroup.isDeleted != null "> and is_deleted = #{patrolGroup.isDeleted}</if>
+ <if test="patrolGroup.type != null "> and type = #{patrolGroup.type}</if>
+ </where>
+ </select>
<!--查询巡查项树数据-->
<select id="getPatrolGroupTree" resultType="org.springblade.core.tool.node.TreeNode" >
@@ -109,18 +120,6 @@
<resultMap id="patrolGroupDTO" type="org.springblade.modules.patrol.dto.PatrolGroupDTO">
<id property="id" column="id"/>
<result property="name" column="gname"/>
- <collection property="patrolRecordVOList" javaType="java.util.List" ofType="org.springblade.modules.patrol.vo.PatrolRecordVO">
- <result property="id" column="rId"/>
- <result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
- <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
- <result property="status" column="status"/>
- <result property="isDeleted" column="isDeleted"/>
- <result property="itemId" column="itemId"/>
- <result property="itemsName" column="itemsName"/>
- <result property="taskId" column="taskId"/>
- <result property="solution" column="solution"/>
- <result property="content" column="content"/>
- </collection>
</resultMap>
@@ -176,30 +175,6 @@
</select>
-<!-- <resultMap type="org.springblade.modules.dto.PatrolGroupItemDTO" id="PatrolGroupItemDTOResult">-->
-<!-- <result property="id" column="id" />-->
-<!-- <result property="groupId" column="group_id" />-->
-<!-- <result property="itemsName" column="items_name" />-->
-<!-- <result property="description" column="description" />-->
-<!-- <result property="createUser" column="create_user" />-->
-<!-- <result property="createTime" column="create_time" />-->
-<!-- <result property="updateTime" column="update_time" />-->
-<!-- <result property="isDeleted" column="is_deleted" />-->
-<!-- </resultMap>-->
-
- <sql id="selectPatrolGroupItem">
- select
- id,
- group_id,
- items_name,
- description,
- create_user,
- create_time,
- update_time,
- is_deleted
- from
- jczz_patrol_group_item
- </sql>
<!-- <select id="selectPatrolGroupItemById" parameterType="long" resultMap="PatrolGroupItemDTOResult">-->
<!-- <include refid="selectPatrolGroupItem"/>-->
@@ -207,7 +182,7 @@
<!-- id = #{id}-->
<!-- </select>-->
-<!-- <select id="selectPatrolGroupItemList" parameterType="org.springblade.modules.dto.PatrolGroupItemDTO" resultMap="PatrolGroupItemDTOResult">-->
+<!-- <select id="selectPatrolGroupItemList" parameterType="org.springblade.modules.patrol.dto.PatrolGroupItemDTO" resultMap="PatrolGroupItemDTOResult">-->
<!-- <include refid="selectPatrolGroupItem"/>-->
<!-- <where>-->
<!-- <if test="id != null "> and id = #{id}</if>-->
diff --git a/src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java b/src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java
index 4e4aa42..5c788be 100644
--- a/src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java
+++ b/src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java
@@ -21,6 +21,16 @@
*/
IPage<PatrolGroup> selectPatrolConfig(IPage<Object> page, PatrolGroup patrolGroup);
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param patrolGroup
+ * @return
+ */
+ IPage<PatrolGroupVO> selectPatrolGroupPage(IPage<PatrolGroupVO> page, PatrolGroupVO patrolGroup);
+
+
List<PatrolGroup> getPatrolGroupByProjectId(String projectId);
/**
@@ -43,4 +53,6 @@
List<PatrolGroup> getPatrolGroupByTaskId(String taskId);
List<PatrolGroupDTO> getGroupDTORecord(String taskId);
+
+ boolean addTwo(PatrolGroupVO patrolGroup);
}
diff --git a/src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java b/src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java
index 326c7e1..5e34fa8 100644
--- a/src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java
+++ b/src/main/java/org/springblade/modules/patrol/service/impl/PatrolGroupServiceImpl.java
@@ -5,11 +5,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.tool.node.TreeNode;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.patrol.dto.PatrolGroupDTO;
import org.springblade.modules.patrol.entity.PatrolGroup;
+import org.springblade.modules.patrol.entity.PatrolGroupItem;
import org.springblade.modules.patrol.mapper.PatrolGroupMapper;
+import org.springblade.modules.patrol.service.IPatrolGroupItemService;
import org.springblade.modules.patrol.service.IPatrolGroupService;
+import org.springblade.modules.patrol.vo.PatrolGroupItemVO;
import org.springblade.modules.patrol.vo.PatrolGroupVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -19,6 +24,15 @@
*/
@Service
public class PatrolGroupServiceImpl extends ServiceImpl<PatrolGroupMapper, PatrolGroup> implements IPatrolGroupService {
+ @Autowired
+ private IPatrolGroupItemService patrolGroupItemService;
+
+ @Override
+ public IPage<PatrolGroupVO> selectPatrolGroupPage(IPage<PatrolGroupVO> page, PatrolGroupVO patrolGroup) {
+ patrolGroup.setIsDeleted(0);
+ List<PatrolGroupVO> patrolGroupVOS = baseMapper.selectPatrolGroupPage(page, patrolGroup);
+ return page.setRecords(patrolGroupVOS);
+ }
@Override
public IPage<PatrolGroup> selectPatrolConfig(IPage<Object> page, PatrolGroup patrolGroup) {
@@ -32,16 +46,17 @@
/**
* 查询巡查项树数据
+ *
* @return
*/
@Override
- public Object getPatrolGroupTree(String type,String childType) {
+ public Object getPatrolGroupTree(String type, String childType) {
// 查询父树目录
List<TreeNode> patrolGroupTree = baseMapper.getPatrolGroupTree(type);
// 查询孩子树目录
List<TreeNode> patrolGroupItemTree = baseMapper.getPatrolGroupItemTree(childType);
// 数据处理
- return NodeTreeUtil.getNodeTree(patrolGroupTree,patrolGroupItemTree);
+ return NodeTreeUtil.getNodeTree(patrolGroupTree, patrolGroupItemTree);
}
@Override
@@ -68,4 +83,18 @@
public List<PatrolGroupDTO> getGroupDTORecord(String taskId) {
return baseMapper.getGroupDTORecord(taskId);
}
+
+ @Override
+ public boolean addTwo(PatrolGroupVO patrolGroup) {
+ boolean orUpdate = saveOrUpdate(patrolGroup);
+ if (orUpdate) {
+ List<PatrolGroupItemVO> patrolGroupItemList = patrolGroup.getPatrolGroupItemList();
+ for (PatrolGroupItemVO patrolGroupItemVO : patrolGroupItemList) {
+ patrolGroupItemVO.setGroupId(patrolGroup.getId());
+ }
+ List<PatrolGroupItem> patrolGroupItems = BeanUtil.copy(patrolGroupItemList, PatrolGroupItem.class);
+ patrolGroupItemService.saveOrUpdateBatch(patrolGroupItems);
+ }
+ return false;
+ }
}
diff --git a/src/main/java/org/springblade/modules/patrol/vo/PatrolGroupVO.java b/src/main/java/org/springblade/modules/patrol/vo/PatrolGroupVO.java
index 9fb7d37..b263a2a 100644
--- a/src/main/java/org/springblade/modules/patrol/vo/PatrolGroupVO.java
+++ b/src/main/java/org/springblade/modules/patrol/vo/PatrolGroupVO.java
@@ -3,6 +3,8 @@
import lombok.Data;
import org.springblade.modules.patrol.entity.PatrolGroup;
+import java.util.List;
+
/**
* 巡查组vo
*/
@@ -19,4 +21,6 @@
*/
private Integer problemCount;
+ private List<PatrolGroupItemVO> patrolGroupItemList;
+
}
--
Gitblit v1.9.3