From f0cbcb0bced4b126d27d209a3d1aa3d5ea7d9e6d Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 27 九月 2022 17:03:31 +0800
Subject: [PATCH] 1.小程序首页相关代码 2.修改bug
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 17 ++
flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java | 2
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 28 +++
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml | 4
flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java | 2
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java | 2
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 18 ++
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 2
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 32 ++++
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java | 9 +
flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java | 63 +++++++
flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml | 49 ++++++
flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java | 24 +++
flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java | 68 ++++++++
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 18 +
flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java | 2
flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java | 2
flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java | 2
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 16 ++
flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java | 19 ++
flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java | 8 +
flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java | 39 ++++
22 files changed, 413 insertions(+), 13 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
index 840c607..b2fdc75 100644
--- a/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java
@@ -1,15 +1,20 @@
package com.dg.core.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.AreaCode2022;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IAutomessageCommonProblemService;
+import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -27,9 +32,64 @@
* 获取常见问题列表(不分页)
* @return
*/
- @ApiOperation(value = "根据指南id获取所属地区",response = AutomessageCommonProblem.class)
+ @ApiOperation(value = "获取常见问题列表(不分页)",response = AutomessageCommonProblem.class)
@GetMapping("/selectList")
public ResultData selectList(){
return ResultData.success(iAutomessageCommonProblemService.selectList());
}
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param title
+ * @param content
+ * @return
+ */
+ @ApiOperation(value = "获取常见问题列表（分页）",response = AutomessageCommonProblem.class)
+ @GetMapping("/selectConfigList")
+ @Authorization
+ public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "title",required = false) String title,
+ @RequestParam(value = "content",required = false) String content){
+ Page<AutomessageCommonProblem> pageParam = new Page<>(pageNum,pageSize);
+ List<AutomessageCommonProblem> list = iAutomessageCommonProblemService.selectConfigList(pageParam,pageSize,title,content);
+ int num=iAutomessageCommonProblemService.countAutomessageCommonProblem(title,content);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 添加常见问题数据
+ * @return
+ */
+ @ApiOperation(value = "添加常见问题数据）",response = AutomessageCommonProblem.class)
+ @PostMapping("/add")
+ @Authorization
+ ResultData add(@RequestBody AutomessageCommonProblem automessageCommonProblem,@CurrentUser SysUser sysUser){
+ automessageCommonProblem.setCreateUserId(sysUser.getUserId().toString());
+ automessageCommonProblem.setUpdateUserId(sysUser.getUserId().toString());
+ return iAutomessageCommonProblemService.add(automessageCommonProblem);
+ }
+
+ /**
+ * 修改常见问题数据
+ * @return
+ */
+ @ApiOperation(value = "修改常见问题数据）",response = AutomessageCommonProblem.class)
+ @PostMapping("/update")
+ @Authorization
+ ResultData update(@RequestBody AutomessageCommonProblem automessageCommonProblem,@CurrentUser SysUser sysUser){
+ automessageCommonProblem.setUpdateUserId(sysUser.getUserId().toString());
+ return iAutomessageCommonProblemService.update(automessageCommonProblem);
+ }
+
+ /**
+ * 删除常见问题数据
+ * @return
+ */
+ @ApiOperation(value = "删除常见问题数据）",response = AutomessageCommonProblem.class)
+ @GetMapping("/delete")
+ @Authorization
+ ResultData delete( @RequestParam(value = "id") Integer id){
+ return iAutomessageCommonProblemService.delete(id);
+ }
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
index 4ebc218..b8123f3 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -48,7 +48,6 @@
*/
@ApiOperation(value = " 获取管理菜单列表(已分级)",response = ClassifyAdministration.class)
@GetMapping("/getListByParentId")
- @Authorization
public TableDataInfo selectConfigListByParentId(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "parentId",required = false) String parentId,
@@ -58,6 +57,20 @@
int num=iClassifyAdministrationService.countNum("",null);
Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
return getDataTable(iClassifyAdministrationService.selectRootList(pageParam,pageSize,parentId,departmentId),num);
+ }
+
+ /**
+ * 获取管理菜单列表(无分页已分级)
+ * @return
+ */
+ @ApiOperation(value = " 获取管理菜单列表(无分页已分级))",response = ClassifyAdministration.class)
+ @GetMapping("/selectListByParentId")
+ public TableDataInfo selectListByParentId(@RequestParam(value = "parentId",required = false) String parentId,
+ @RequestParam(value = "departmentId",required = false) Integer departmentId){
+ int num=iClassifyAdministrationService.countNum("",null);
+ if (parentId==null)
+ parentId="0";
+ return getDataTable(iClassifyAdministrationService.selectConfigListByParentId(parentId, departmentId),num);
}
@@ -129,4 +142,17 @@
}
return toAjax(iClassifyAdministrationService.deleteConfigById(Id));
}
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ @ApiOperation("获取分类根据id 如果是二级id则获取的是办事指南,不传参默认是0")
+ @GetMapping("/queryListById")
+ @Authorization
+ ResultData queryListById(@RequestParam(value = "id",required = false) Integer id){
+ if(id==null)
+ id=0;
+ return iClassifyAdministrationService.queryListById(id);
+ }
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 95430e0..e39a1c3 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -137,6 +137,21 @@
return queryResults;
}
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ * @param keyWord
+ * @return
+ */
+ @ApiOperation(value = "导办事务搜索(无分页用于小程序)",response = QueryResults.class)
+ @GetMapping("/queryKeyWord")
+ @Authorization
+ public QueryResults queryKeyWord(@RequestParam(value = "keyWord",required = false) String keyWord)
+ {
+ QueryResults queryResults = iTransactionEventService.queryMatterNameList(keyWord);
+ return queryResults;
+ }
+
+
/**
* 根据分离查询导办事务
@@ -150,6 +165,23 @@
}
/**
+ * 根据分类id查询导办事务(分页)
+ * @param classifyId
+ * @return
+ */
+ @ApiOperation(value = "根据分类id查询导办事务(分页)",response = TransactionEvent.class)
+ @GetMapping("/queryByClassifyIdConfigList")
+ public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam("classifyId") String classifyId,
+ @RequestParam(required = false,name="departmentId") Integer departmentId){
+ Assert.notNull(pageNum, "pageNum 不能为空");
+ Assert.notNull(pageSize, "pageSize 不能为空");
+ Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
+ return getDataTable(iTransactionEventService.queryByClassifyIdList(pageParam,pageSize,classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId));
+ }
+
+ /**
* 根据查询时间查询导办事务
* @return
*/
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java
index 067074c..bad2de1 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java
@@ -1,6 +1,7 @@
package com.dg.core.db.gen.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -68,5 +69,13 @@
@ApiModelProperty("创建人id")
private String createUserId;
+ @TableField(exist = false)
+ @ApiModelProperty(name = "updateUserName", value = "上次修改人")
+ private String updateUserName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(name = "createUserName", value = "创建人")
+ private String createUserName;
+
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java
index c82063e..648365f 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ClassifyAdministration.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -16,6 +17,7 @@
@ApiModel("分类管理实体类")
@Data
+@TableName("automessage_classify_administration")
public class ClassifyAdministration implements Serializable
{
/**
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java
index 59a8597..eb8ea4d 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ElseAccessoryEntity.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -15,6 +16,7 @@
@Data
@ApiModel("其他附件管理实体类")
+@TableName("automessage_else_accessory")
public class ElseAccessoryEntity implements Serializable
{
/**
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
index d20d3c1..793f30f 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -14,6 +15,7 @@
@Data
@ApiModel("导办工单进展记录表")
+@TableName("automessage_guide_evolve")
public class GuideEvolveEntity implements Serializable
{
/**
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
index 1639421..1f8e899 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -14,6 +15,7 @@
@ApiModel("菜单实体类")
@Data
+@TableName("automessage_menu")
public class MenuEntity implements Serializable
{
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
index 77f2e3e..04949bc 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/ReplyTemplateEntity.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -15,6 +16,7 @@
@ApiModel("回复模板实体类")
@Data
+@TableName
public class ReplyTemplateEntity implements Serializable
{
/**
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java
index aef9290..f8a5d7c 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageCommonProblemMapper.java
@@ -1,7 +1,11 @@
package com.dg.core.db.gen.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+ import org.springframework.data.repository.query.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +17,19 @@
*/
public interface AutomessageCommonProblemMapper extends BaseMapper<AutomessageCommonProblem> {
+ /**
+ * 获取常见问题列表（分页）
+ * @param page
+ * @param state
+ * @return
+ */
+ List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, @Param("title") String title, @Param("content") String content);
+
+
+ /**
+ * 获取常见问题列表统计数量
+ * @return
+ */
+ Integer countConfigList(@Param("title") String title, @Param("content") String content);
+
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
index acb9b84..4714b29 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
@@ -98,6 +98,15 @@
*/
List<TransactionEvent> queryByClassifyIdList(@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
+ /**
+ * 根据分离查询导办事务(分页)
+ * @param classifyId
+ * @return
+ *
+ */
+ List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,@Param("classifyId") String classifyId,@Param("departmentId") Integer departmentId);
+
/**
* 查询导办事务求和
* @return
@@ -111,6 +120,14 @@
*/
List<Search> selectSearch(IPage<Search> page, Integer state, String keyWord);
+
+ /**
+ * 根据关键词导办事务(部门也会统计进去)搜索(分页)(小程序)
+ * @param keyWord
+ * @return
+ */
+ List<Search> selectSearchList(String keyWord);
+
/**
* 根据关键词导办事务(部门也会统计进去)搜索(不分页)
* @param keyWord
diff --git a/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java b/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
index 035fc23..1976c07 100644
--- a/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
+++ b/flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java
@@ -20,6 +20,6 @@
@ApiModelProperty("浏览次数")
private Integer views;
- @ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南")
+ @ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南4.分类")
private Integer type;
}
diff --git a/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java b/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java
index e98cb2d..17fc359 100644
--- a/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IAutomessageCommonProblemService.java
@@ -1,6 +1,9 @@
package com.dg.core.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
+import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -11,4 +14,40 @@
* @return
*/
List<AutomessageCommonProblem> selectList();
+
+ /**
+ * 获取常见问题列表（分页）
+ * @param page
+ * @param state
+ * @return
+ */
+ List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, String title, String content);
+
+
+ /**
+ * 获取常见问题列表统计数量
+ * @return
+ */
+ Integer countAutomessageCommonProblem( String title, String content);
+
+
+ /**
+ * 添加常见问题数据
+ * @return
+ */
+ ResultData add(AutomessageCommonProblem automessageCommonProblem);
+
+ /**
+ * 修改常见问题数据
+ * @return
+ */
+ ResultData update(AutomessageCommonProblem automessageCommonProblem);
+
+ /**
+ * 删除常见问题数据
+ * @return
+ */
+ ResultData delete(Integer id);
+
+
}
diff --git a/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java b/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java
index c3c43f1..18de323 100644
--- a/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IClassifyAdministrationService.java
@@ -1,6 +1,7 @@
package com.dg.core.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.TransactionEvent;
import org.springframework.data.repository.query.Param;
@@ -63,4 +64,11 @@
* @return
*/
List<ClassifyAdministration> selectRootList (IPage<ClassifyAdministration> page, Integer stat,String parentId,Integer departmentId);
+
+
+ /**
+ * 获取分类根据id 如果是二级id则获取的是办事指南
+ * @return
+ */
+ ResultData queryListById(Integer id);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
index edbd43a..c52eebf 100644
--- a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -59,6 +59,14 @@
*/
QueryResults queryMatterNameList(IPage<Search> page, Integer state,Integer recommendSize, String keyWord);
+
+ /**
+ * 导办事务搜索(无分页用于小程序)
+ * @param keyWord
+ * @return
+ */
+ QueryResults queryMatterNameList(String keyWord);
+
/**
* 导办事务搜索统计数量
* @param matterName
@@ -67,12 +75,20 @@
int countNumByMatterName(String matterName);
/**
- * 根据分离查询导办事务
+ * 根据分类id查询导办事务
* @param classifyId
* @return
*/
List<TransactionEvent> queryByClassifyIdList(String classifyId,Integer departmentId);
+
+ /**
+ * 根据分类id查询导办事务(分页)
+ * @param classifyId
+ * @return
+ */
+ List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,String classifyId,Integer departmentId);
+
/**
* 根据查询时间查询导办事务
* @return
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java
index c8f7434..0a6e0f8 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AutomessageCommonProblemServiceImpl.java
@@ -1,12 +1,15 @@
package com.dg.core.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
import com.dg.core.db.gen.mapper.AutomessageCommonProblemMapper;
import com.dg.core.service.IAutomessageCommonProblemService;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -16,4 +19,64 @@
public List<AutomessageCommonProblem> selectList(){
return baseMapper.selectList(new QueryWrapper<AutomessageCommonProblem>().lambda());
}
+
+ @Override
+ public List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, String title, String content) {
+ return baseMapper.selectConfigList(page,state,title,content);
+ }
+
+ @Override
+ public Integer countAutomessageCommonProblem( String title, String content){
+ return baseMapper.countConfigList(title,content);
+ }
+
+ @Override
+ public ResultData add(AutomessageCommonProblem automessageCommonProblem){
+ if (automessageCommonProblem.getContent()==null){
+ return ResultData.error("常见问题不能空");
+ }
+ if (automessageCommonProblem.getTitle()==null){
+ return ResultData.error("回答内容题不能空");
+ }
+ automessageCommonProblem.setCreateTime(LocalDateTime.now());
+ automessageCommonProblem.setUpdateTime(LocalDateTime.now());
+ int insert = baseMapper.insert(automessageCommonProblem);
+ if (insert>0){
+ return ResultData.success();
+ }
+ else {
+ return ResultData.error("添加失败");
+ }
+
+ }
+
+ @Override
+ public ResultData update(AutomessageCommonProblem automessageCommonProblem){
+ if (automessageCommonProblem.getContent()==null){
+ return ResultData.error("常见问题不能空");
+ }
+ if (automessageCommonProblem.getTitle()==null){
+ return ResultData.error("回答内容题不能空");
+ }
+ automessageCommonProblem.setUpdateTime(LocalDateTime.now());
+ int i = baseMapper.updateById(automessageCommonProblem);
+ if (i>0){
+ return ResultData.success();
+ }
+ else {
+ return ResultData.error("修改失败");
+ }
+
+ }
+
+ @Override
+ public ResultData delete(Integer id){
+ int i = baseMapper.deleteById(id);
+ if (i>0){
+ return ResultData.success();
+ }
+ else {
+ return ResultData.error("删除失败");
+ }
+ }
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java
index 74f4505..5c1a81c 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ClassifyAdministrationImpl.java
@@ -3,18 +3,25 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.gen.mapper.ClassifyAdministrationMapper;
+import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IClassifyAdministrationService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
@Service
public class ClassifyAdministrationImpl extends ServiceImpl<ClassifyAdministrationMapper, ClassifyAdministration>
implements IClassifyAdministrationService
{
+
+
+ @Resource
+ private TransactionEventMapper transactionEventMapper;
@Override
public List<ClassifyAdministration> selectConfigList(String classifyName, String classifyGrade) {
@@ -46,6 +53,23 @@
}
@Override
+ public ResultData queryListById(Integer id){
+ if (id.equals(0)){
+ return ResultData.success(baseMapper.selectList(new QueryWrapper<ClassifyAdministration>().lambda()
+ .eq(ClassifyAdministration::getParentId,0)));
+ }
+ ClassifyAdministration classifyAdministration = baseMapper.selectOne(new QueryWrapper<ClassifyAdministration>().lambda()
+ .eq(ClassifyAdministration::getId, id));
+ if (classifyAdministration.getClassifyGrade().equals("1")){
+ return ResultData.success(baseMapper.selectList(new QueryWrapper<ClassifyAdministration>().lambda()
+ .eq(ClassifyAdministration::getParentId,classifyAdministration.getId())));
+ }else if (classifyAdministration.getClassifyGrade().equals("2")){
+ return ResultData.success(transactionEventMapper.queryByClassifyIdList(id.toString(),null));
+ }
+ return ResultData.error();
+ }
+
+ @Override
public int insertConfig(ClassifyAdministration entity) {
return baseMapper.insertConfig(entity);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index 7374151..a92723e 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -98,6 +98,17 @@
return queryResults;
}
+ @Override
+ public QueryResults queryMatterNameList(String keyWord) {
+ QueryResults queryResults = new QueryResults();
+ List<Search> searches = baseMapper.selectSearchList(keyWord);
+ queryResults.setSearchList(searches);
+ List<Search> searchesAssociate = baseMapper.selectSearchAssociate(keyWord);
+ queryResults.setTransactionEventList(searchesAssociate);
+ queryResults.setKeywordEntityList( keywordMapper.selectByName(keyWord));
+ return queryResults;
+ }
+
@Override
public RecommendResult smartConsulting(String keyWord){
@@ -131,6 +142,11 @@
}
@Override
+ public List<TransactionEvent> queryByClassifyIdList(IPage<TransactionEvent> page, Integer state,String classifyId,Integer departmentId) {
+ return baseMapper.queryByClassifyIdList(page,state,classifyId,departmentId);
+ }
+
+ @Override
public List<TransactionEvent> queryByQueryTime() {
List<TransactionEvent> transactionEvents = baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().orderByDesc(TransactionEvent::getQueryTime));
return transactionEvents;
diff --git a/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml b/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml
index 3c1a597..91435f6 100644
--- a/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml
+++ b/flower_city/src/main/resources/mapper/AutomessageCommonProblemMapper.xml
@@ -1,5 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dg.core.db.gen.mapper.AutomessageCommonProblemMapper">
+ <resultMap type="com.dg.core.db.gen.entity.AutomessageCommonProblem" id="AutomessageCommonProblemResult">
+ <id property="id" column="id" />
+ <id property="title" column="title" />
+ <id property="content" column="content" />
+ <id property="createTime" column="create_time" />
+ <id property="updateTime" column="update_time" />
+ <id property="updateUserId" column="update_user_id" />
+ <id property="createUserId" column="create_user_id" />
+
+ </resultMap>
+
+ <sql id="selectAutomessageCommonProblemResul">
+ SELECT
+ id,
+ title,
+ content,
+ create_time,
+ update_time,
+ (select user_name from automessage_sys_user where user_id=a.update_user_id)updateUserName,
+ update_user_id,
+ (select user_name from automessage_sys_user where user_id=a.create_user_id)createUserName,
+ create_user_id
+ FROM
+ automessage_common_problem a
+ </sql>
+
+ <select id="selectConfigList" resultMap="AutomessageCommonProblemResult">
+ <include refid="selectAutomessageCommonProblemResul" />
+ <where>
+ <if test="title!=null and title!=''">
+ and title like concat('%', #{title}, '%')
+ </if>
+ <if test="content!=null and content!=''">
+ and content like concat('%', #{content}, '%')
+ </if>
+ </where>
+ </select>
+
+ <select id="countConfigList" resultType="integer">
+ select count(*) from automessage_common_problem
+ <where>
+ <if test="title!=null and title!=''">
+ and title like concat('%', #{title}, '%')
+ </if>
+ <if test="content!=null and content!=''">
+ and content like concat('%', #{content}, '%')
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml b/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
index ed99221..7aff0fe 100644
--- a/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
+++ b/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
@@ -46,8 +46,8 @@
parent_id=#{parentId}
<if test="departmentId!=null">
and id in (
- select classify_id from transaction_event where department_id=#{departmentId} UNION
- select parent_id from classify_administration where id in (select classify_id FROM transaction_event where department_id=#{departmentId}) )
+ select classify_id from automessage_transaction_event where department_id=#{departmentId} UNION
+ select parent_id from automessage_classify_administration where id in (select classify_id FROM automessage_transaction_event where department_id=#{departmentId}) )
</if>
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
index 2221f27..7a7ca8d 100644
--- a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -16,6 +16,8 @@
<id property="resume" column="resume" />
<id property="contactNumber" column="contact_number" />
<id property="departmentalApplication" column="departmental_application" />
+ <id property="updateUserId" column="update_user_id" />
+
</resultMap>
@@ -45,6 +47,19 @@
where id= #{id}
</select>
+ <select id="selectList" resultMap="OrganizationChartResult">
+ <include refid="selectOrganizationChartVo"/>
+ <where>
+ <if test="parentId != null and parentId != ''">
+ AND parent_id=#{parentId}
+ </if>
+
+ <if test="grade != null and grade != ''">
+ AND grade=#{grade}
+ </if>
+ </where>
+ </select>
+
<select id="selectConfigList" resultMap="OrganizationChartResult">
<include refid="selectOrganizationChartVo"/>
<where>
@@ -55,10 +70,7 @@
<if test="grade != null and grade != ''">
AND grade=#{grade}
</if>
-
</where>
-
-
</select>
<select id="selectByKeyWord" resultMap="OrganizationChartResult">
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 91eaa40..7cd0e7d 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -329,7 +329,7 @@
where k.title like concat('%',#{keyWord}, '%') or k.content like concat('%', #{keyWord}, '%')
</select>
- <select id="selectSearch" resultType="com.dg.core.db.manual.pojo.Search">
+ <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
select id,title,content,views, type FROM(
select id,organization_name title,resume content,null views,1 type from automessage_organization_chart UNION
select id,classify_name title,null content,null views,4 type from automessage_classify_administration UNION
--
Gitblit v1.7.1