From e76d382202ed5c8286b09593e05b2c36acde1c0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 15:50:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 6
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 22 +++-
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 13 ++
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 8 +
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 1
flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java | 6
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java | 2
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java | 5
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 5
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 12 ++
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 21 +++-
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 18 ++
flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java | 7
flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml | 12 ++
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 9 +
flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml | 12 ++
flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java | 9 +
flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java | 5
flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java | 4
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 12 ++
flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java | 9 +
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 37 ++++---
flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java | 13 +-
23 files changed, 176 insertions(+), 72 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index e724a24..9d6036b 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -254,9 +254,11 @@
guideEvolveEntity.setState("3");
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
- iGuideEvolveService.insertConfig(guideEvolveEntity);
-
- return toAjax(iGuideRepairOrderService.updateConfig(entity));
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
diff --git a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
index 5559527..35912db 100644
--- a/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java
@@ -36,7 +36,6 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- @Authorization
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index c992dba..7cb1f51 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -3,8 +3,11 @@
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.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IElseAccessoryService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,6 +26,8 @@
@Autowired
IElseAccessoryService iElseAccessoryService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 获取附件列表
@@ -36,11 +41,13 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name)
+ @RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name);
- int num=iElseAccessoryService.countNum(Name);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name,ids);
+ int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -51,10 +58,13 @@
*/
@ApiOperation("获取附件列表接口(全部)")
@GetMapping(path = "/getAllList")
- public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name)
+ @Authorization
+ public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
{
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name);
- int num=iElseAccessoryService.countNum(Name);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 940b9f7..fdf7c33 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -9,6 +9,7 @@
import com.dg.core.db.gen.entity.*;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,6 +35,9 @@
@Autowired
private IGuideEvolveService iGuideEvolveService;
+
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 提交导办订单
@@ -301,9 +305,11 @@
guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
guideEvolveEntity.setGuideId(entity.getId().toString());
- iGuideEvolveService.insertConfig(guideEvolveEntity);
-
- return toAjax(iGuideRepairOrderService.updateConfig(entity));
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
@@ -329,13 +335,16 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "matterName",required = false) String matterName)
+ @RequestParam(value = "matterName",required = false) String matterName,
+ @CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
- List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
- int num=iGuideRepairOrderService.countConfigList(matterName);
+
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName,ids);
+ int num=iGuideRepairOrderService.countConfigList(matterName,ids);
return getDataTable(list,num);
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index bfd7e48..7bd2b3d 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -6,6 +6,7 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.ReplyTemplateEntity;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.IReplyTemplateService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -25,6 +26,10 @@
@Autowired
IReplyTemplateService iReplyTemplateService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
+
/**
* 获取模板列表
* @return
@@ -34,11 +39,13 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name)
+ @RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name);
- int num=iReplyTemplateService.countNum(Name);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
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 b65c6b6..66b8fda 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
@@ -10,6 +10,7 @@
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -29,6 +30,10 @@
@Autowired(required = true)
ITransactionEventService iTransactionEventService;
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询导办事务详情
* @param Id
@@ -36,7 +41,7 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- @Authorization
+
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
@@ -50,16 +55,20 @@
*/
@ApiOperation("导办事物列表")
@GetMapping("/getList")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "matterAndUser",required = false) String matterAndUser,
- @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
+ @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,classifyGrade);
- int num=iTransactionEventService.countNum(matterAndUser,classifyGrade);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
+ classifyGrade,ids);
+ int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
return getDataTable(list,num);
}
@@ -123,6 +132,7 @@
*/
@ApiOperation(value = "导办事务搜索",response = QueryResults.class)
@GetMapping("/queryKeyWordList")
+ @Authorization
public QueryResults queryMatterNameList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "recommendSize",required = false) Integer recommendSize,
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java
index 6f37b3f..6e3f940 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ElseAccessoryMapper.java
@@ -17,14 +17,17 @@
* @param Name
* @return
*/
- public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state, @Param("Name") String Name);
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ @Param("Name") String Name,
+ @Param("ids") List<String> ids);
/**
* 获取附件列表全部
* @param Name
* @return
*/
- public List<ElseAccessoryEntity> selectConfigList(@Param("Name") String Name);
+ public List<ElseAccessoryEntity> selectConfigList(@Param("Name") String Name,
+ @Param("ids") List<String> ids);
/**
@@ -53,7 +56,7 @@
* @param Name
* @return
*/
- public int countNum(String Name);
+ public int countNum(@Param("Name") String Name,@Param("ids") List<String> ids);
/**
* 按ids查找相关附件列表
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
index ec2aac0..ceac5b4 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
@@ -49,14 +49,15 @@
* @param matterName
* @return
*/
- List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName);
+ List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName,
+ @Param("ids") List<String> ids);
/**
* 获取工单列表(求和)
* @param matterName
* @return
*/
- int countConfigList(@Param("matterName") String matterName);
+ int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java
index 1f8a4f9..5a5cece 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java
@@ -14,7 +14,9 @@
* 获取模板列表
* @return
*/
- public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state, @Param("Name") String Name);
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
+ @Param("Name") String Name,
+ @Param("ids") List<String> ids);
/**
@@ -49,7 +51,7 @@
* 获取数量
* @return
*/
- public int countNum(String Name);
+ public int countNum(@Param("Name") String Name,@Param("ids") List<String> ids);
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 079a943..247dc2b 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
@@ -25,7 +25,8 @@
*/
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
@Param("matterAndUser") String matterAndUser,
- @Param("classifyGrade") String classifyGrade);
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
/**
* 新增导办事务
@@ -54,7 +55,8 @@
* @return
*/
public int countNum(@Param("matterAndUser") String matterAndUser,
- @Param("classifyGrade") String classifyGrade);
+ @Param("classifyGrade") String classifyGrade,
+ @Param("ids") List<String> ids);
/**
* 导办事务搜索
diff --git a/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java b/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java
index 1e617c6..871fdd2 100644
--- a/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IElseAccessoryService.java
@@ -15,14 +15,15 @@
* @param Name
* @return
*/
- public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state, @Param("Name") String Name);
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ String Name,List<String> ids);
/**
* 获取附件列表全部
* @param Name
* @return
*/
- public List<ElseAccessoryEntity> selectConfigList(String Name);
+ public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids);
/**
@@ -51,7 +52,7 @@
* @param Name
* @return
*/
- public int countNum(String Name);
+ public int countNum(String Name,List<String> ids);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java b/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
index c80dbfb..5836825 100644
--- a/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
@@ -40,7 +40,7 @@
* @param matterName
* @return
*/
- List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,String matterName);
+ List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,String matterName,List<String> ids);
/**
@@ -48,6 +48,6 @@
* @param matterName
* @return
*/
- int countConfigList(@Param("matterName") String matterName);
+ int countConfigList(String matterName,List<String> ids);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java b/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java
index 5b8ad7a..71cf13c 100644
--- a/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java
@@ -11,7 +11,8 @@
* 获取模板列表
* @return
*/
- public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,String Name);
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
+ String Name,List<String> ids);
/**
* 获取详情
@@ -45,6 +46,6 @@
* 获取数量
* @return
*/
- public int countNum(String Name);
+ public int countNum(String Name,List<String> ids);
}
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 c52eebf..61d6b81 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
@@ -23,7 +23,8 @@
* @return
*/
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
- String matterAndUser, String classifyGrade);
+ String matterAndUser, String classifyGrade,
+ List<String> ids);
/**
* 新增导办事务
@@ -50,7 +51,7 @@
* 统计数量
* @return
*/
- public int countNum(String matterAndUser,String classifyGrade);
+ public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
/**
* 导办事务搜索
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
index e92397a..dd1f290 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
@Service
@@ -26,6 +27,7 @@
@Override
public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
+// HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
eq(TransactionEvent::getId, transactionId));
OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
index a8f0f32..7ba6a71 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ElseAccessoryImpl.java
@@ -15,13 +15,14 @@
{
@Override
- public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state, String Name) {
- return baseMapper.selectConfigList(page,state,Name);
+ public List<ElseAccessoryEntity> selectConfigList(IPage<ElseAccessoryEntity> page, Integer state,
+ String Name,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,Name, ids);
}
@Override
- public List<ElseAccessoryEntity> selectConfigList(String Name) {
- return baseMapper.selectConfigList(Name);
+ public List<ElseAccessoryEntity> selectConfigList(String Name,List<String> ids) {
+ return baseMapper.selectConfigList(Name,ids);
}
@Override
@@ -40,7 +41,7 @@
}
@Override
- public int countNum(String Name) {
- return baseMapper.countNum(Name);
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
}
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index dc96213..7d504cc 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -37,6 +37,7 @@
guideRepairOrder.setMatterName(transactionEvent.getMatterName());
guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
+ sysUserMapper.selectListByDepartmentId(null, "," + guideRepairOrder.getMatterId(), guideRepairOrder.getMatterId() + ",")
guideRepairOrder.setState("1");
guideRepairOrder.setCreateTime(LocalDateTime.now());
guideRepairOrder.setUpdateTime(LocalDateTime.now());
@@ -91,13 +92,13 @@
}
@Override
- public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName) {
- return baseMapper.selectConfigList(page,state,matterName);
+ public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,matterName, ids);
}
@Override
- public int countConfigList(String matterName) {
- return baseMapper.countConfigList(matterName);
+ public int countConfigList(String matterName,List<String> ids) {
+ return baseMapper.countConfigList(matterName,ids);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
index 36e0d66..1920baf 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -15,8 +15,9 @@
{
@Override
- public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,String Name) {
- return baseMapper.selectConfigList(page,state,Name);
+ public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
+ Integer state,String Name,List<String> ids) {
+ return baseMapper.selectConfigList(page,state,Name,ids);
}
@Override
@@ -40,7 +41,7 @@
}
@Override
- public int countNum(String Name) {
- return baseMapper.countNum(Name);
+ public int countNum(String Name,List<String> ids) {
+ return baseMapper.countNum(Name,ids);
}
}
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 a92723e..110dc0c 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
@@ -38,32 +38,35 @@
@Override
public TransactionEvent selectConfigData(String Id,SysUser sysUser) {
TransactionEvent transactionEvent = baseMapper.selectConfigData(Id);
- LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
- LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
- AutomessageTransactionEventInterview automessageTransactionEventInterview = automessageTransactionEventInterviewMapper.selectOne(new QueryWrapper<AutomessageTransactionEventInterview>()
+ //如果当前没有登录用户则不增加浏览次数
+ if (sysUser!=null){
+ LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
+ LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
+ AutomessageTransactionEventInterview automessageTransactionEventInterview = automessageTransactionEventInterviewMapper.selectOne(new QueryWrapper<AutomessageTransactionEventInterview>()
.lambda().eq(AutomessageTransactionEventInterview::getTransactionEventId, Id)
.eq(AutomessageTransactionEventInterview::getUserId, sysUser.getUserId())
.orderByDesc(AutomessageTransactionEventInterview::getInterviewTime)
.last("limit 1"));
- transactionEvent.setQueryTime(LocalDateTime.now());
- //判断上次访问时间是不是今天 如果
- if (automessageTransactionEventInterview==null||(!(transactionEvent.getQueryTime().isAfter(startTime)&&transactionEvent.getQueryTime().isBefore(endTime)))) {
- transactionEvent.setBrowseNum(transactionEvent.getBrowseNum()+1);
- baseMapper.updateById(transactionEvent);
- AutomessageTransactionEventInterview automessageTransactionEventInterviewNew =
+ transactionEvent.setQueryTime(LocalDateTime.now());
+ //判断上次访问时间是不是今天 如果是今天不增加浏览次数
+ if (automessageTransactionEventInterview==null||(!(transactionEvent.getQueryTime().isAfter(startTime)&&transactionEvent.getQueryTime().isBefore(endTime)))) {
+ transactionEvent.setBrowseNum(transactionEvent.getBrowseNum()+1);
+ baseMapper.updateById(transactionEvent);
+ AutomessageTransactionEventInterview automessageTransactionEventInterviewNew =
new AutomessageTransactionEventInterview();
- automessageTransactionEventInterviewNew.setTransactionEventId(Integer.valueOf(Id));
- automessageTransactionEventInterviewNew.setUserId(new Long(sysUser.getUserId()));
- automessageTransactionEventInterviewNew.setInterviewTime(LocalDateTime.now());
- automessageTransactionEventInterviewMapper.insert(automessageTransactionEventInterviewNew);
+ automessageTransactionEventInterviewNew.setTransactionEventId(Integer.valueOf(Id));
+ automessageTransactionEventInterviewNew.setUserId(new Long(sysUser.getUserId()));
+ automessageTransactionEventInterviewNew.setInterviewTime(LocalDateTime.now());
+ automessageTransactionEventInterviewMapper.insert(automessageTransactionEventInterviewNew);
+ }
}
return transactionEvent;
}
@Override
public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
- String matterAndUser, String classifyGrade) {
- return baseMapper.selectConfigList(page, state, matterAndUser, classifyGrade);
+ String matterAndUser, String classifyGrade,List<String> ids) {
+ return baseMapper.selectConfigList(page, state, matterAndUser, classifyGrade,ids);
}
@Override
@@ -82,8 +85,8 @@
}
@Override
- public int countNum(String matterAndUser,String classifyGrade) {
- return baseMapper.countNum( matterAndUser, classifyGrade);
+ public int countNum(String matterAndUser,String classifyGrade,List<String> ids) {
+ return baseMapper.countNum( matterAndUser, classifyGrade, ids);
}
@Override
diff --git a/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml b/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml
index b98ff64..6cbdd71 100644
--- a/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml
+++ b/flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml
@@ -31,6 +31,12 @@
<if test="Name != null and Name != ''">
AND automessage_else_accessory.name like concat('%', #{Name}, '%')
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
order by create_time desc
</select>
@@ -85,6 +91,12 @@
<if test="Name != null and Name != ''">
AND automessage_else_accessory.name like concat('%', #{Name}, '%')
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index cabe123..a37968d 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -76,6 +76,12 @@
<if test="matterName != null and matterName != ''">
AND matter_name like concat('%', #{matterName}, '%')
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
order by update_time desc , create_time desc
</select>
@@ -86,6 +92,12 @@
<if test="matterName != null and matterName != ''">
AND matter_name like concat('%', #{matterName}, '%')
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml b/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
index c6d133f..9648072 100644
--- a/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
+++ b/flower_city/src/main/resources/mapper/ReplyTemplateMapper.xml
@@ -52,6 +52,12 @@
<if test="Name != null and Name != ''">
AND name=#{Name}
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
@@ -133,6 +139,12 @@
<if test="Name != null and Name != ''">
AND name=#{Name}
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index c287111..cdacd8e 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -125,6 +125,12 @@
<if test="classifyGrade != null and classifyGrade != ''">
AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
order by create_time desc
</select>
@@ -268,6 +274,12 @@
<if test="classifyGrade != null and classifyGrade != ''">
AND (select classify_grade from classify_administration where classify_grade.id=classify_id) = #{classifyGrade}
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
--
Gitblit v1.7.1