From 07c7f39a97f4ea8f84d32e2e2075dfc9d6a1dd04 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 24 十月 2022 18:14:14 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java | 2
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 4
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java | 7 +
flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java | 4
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 5
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 6
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 2
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 15 +-
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 18 ++-
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 41 +++++++-
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 19 +++
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 7 +
flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java | 8 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java | 1
flower_city/src/main/resources/mapper/SysUserMapper.xml | 13 ++
flower_city/src/main/java/com/dg/core/controller/UserController.java | 4
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 2
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 23 +++-
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 4
flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java | 3
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 6
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 31 ++++--
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 4
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java | 3
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java | 5 +
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml | 14 ++
flower_city/src/main/resources/application.properties | 4
flower_city/src/main/resources/application-sms.properties | 12 +-
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java | 3
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java | 1
31 files changed, 202 insertions(+), 77 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 7602041..06b3110 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
@@ -287,8 +287,8 @@
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
guideEvolveEntity.setState("13");
- guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
- guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
guideEvolveEntity.setGuideId(entity.getId().toString());
int i = iGuideRepairOrderService.updateConfig(entity);
if (i>0)
diff --git a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
index 96c36db..0b1388c 100644
--- a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
@@ -28,7 +28,7 @@
@GetMapping("/getList")
public TableDataInfo selectConfigList()
{
- return getDataTable(iOrganizationChartService.selectConfigList("",""));
+ return getDataTable(iOrganizationChartService.selectConfigList("","" ,null));
}
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 35912db..c480df8 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
@@ -50,9 +50,9 @@
*/
@ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
@GetMapping("/selectList")
- public TableDataInfo selectList()
+ public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
{
- return getDataTable(iTransactionEventService.selectList());
+ return getDataTable(iTransactionEventService.selectList(keyWord));
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 4e38b2e..4cd935e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -3,9 +3,12 @@
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.SysUser;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ISysUserService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -33,6 +36,9 @@
@Autowired
IGuideRepairOrderService iGuideRepairOrderService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询列表
*
@@ -43,14 +49,16 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "keyword",required = false) String keyword)
+ @RequestParam(value = "keyword",required = false) String keyword,
+ @CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);
- int num=IUserService.selectNum("2",keyword);
+ int num=IUserService.selectNum("2",keyword,ids);
return getDataTable(list,num);
}
@@ -104,7 +112,7 @@
user.setPhonenumber(config.getPhonenumber());
user.setLoginName(config.getLoginName());
user.setMasterIds(config.getMasterIds());
- user.setRoleIds(2+"");
+ user.setRoleIds("2");
user.setUserType("2");
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
@@ -170,8 +178,10 @@
{
return error("该人员有工单未处理完不能删除");
}
-
- return toAjax(IUserService.deleteConfigById(userId));
+ SysUser user=IUserService.selectData(userId,null,null);
+ user.setUserType("3");
+ user.setRoleIds("3");
+ return toAjax(IUserService.updateConfig(user));
}
/**
@@ -222,4 +232,5 @@
public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
return ResultData.success(IUserService.queryList(2,keyWord));
}
+
}
diff --git a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
index 31ed007..57ce7f3 100644
--- a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -352,7 +352,7 @@
int num=0;
if(ids!=null&&ids.size()>0)
{
- num=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null,null,null);
+ num=homeStatisticsService.rangeStatistics(ids);
}
range.setNum(num+"");
rangeStatistics.add(range);
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 4699d53..c55fa12 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -9,6 +9,7 @@
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -41,7 +42,19 @@
@GetMapping("/getList")
public TableDataInfo selectConfigList()
{
- return getDataTable(iOrganizationChartService.selectConfigList("",""));
+ return getDataTable(iOrganizationChartService.selectConfigList("","",null));
+ }
+
+
+ /**
+ * 查询机构列表(权限)
+ */
+ @ApiOperation(value = "查询机构列表(权限 选择用 ) ",response = OrganizationChartEntity.class)
+ @GetMapping("/selectJurisdiction")
+ @Authorization
+ public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
}
/**
@@ -138,11 +151,14 @@
@Authorization
public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "organizationName",required = false)String organizationName){
+ @RequestParam(value = "organizationName",required = false)String organizationName,
+ @CurrentUser SysUser sysUser){
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
- return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName));
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName,ids),
+ iOrganizationChartService.countList(organizationName,ids));
}
@@ -156,7 +172,17 @@
public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
+ List<OrganizationChartEntity> lists=null;
+ if(StringUtils.isEmpty(departmentId))
+ {
+ lists= iOrganizationChartService.selectParentList(null,"1");
+
+ }
+ else
+ {
+ lists= iOrganizationChartService.selectParentList(departmentId,null);
+ }
+
if(lists.size()<1)
{
lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -166,7 +192,12 @@
{
return null;
}
- ids.add(iOrganizationChartService.selectConfigById(departmentId));
+
+ if(!StringUtils.isEmpty(departmentId))
+ {
+ ids.add(iOrganizationChartService.selectConfigById(departmentId));
+ }
+
return getDataTable(ids);
}
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 4ae077e..dcb6a73 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
@@ -66,10 +66,10 @@
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+// List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
- classifyGrade,ids);
- int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+ classifyGrade,null);
+ int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
return getDataTable(list,num);
}
@@ -80,9 +80,9 @@
*/
@ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
@GetMapping("/selectList")
- public TableDataInfo selectList()
+ public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
{
- return getDataTable(iTransactionEventService.selectList());
+ return getDataTable(iTransactionEventService.selectList(keyWord));
}
/**
@@ -244,7 +244,8 @@
*/
@ApiOperation(value = "办事指南复制",response = ResultData.class)
@GetMapping("/copy")
- public ResultData copy(@RequestParam("Id") String Id)
+ @Authorization
+ public ResultData copy(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
if(StringUtils.isEmpty(Id))
{
@@ -256,6 +257,8 @@
{
return ResultData.error("复制项不存在");
}
+
+ transactionEvent.setDepartmentId(sysUser.getDepartmentId());
transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
transactionEvent.setId(null);
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index ff8f6f1..ac8d71f 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -182,9 +182,9 @@
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
- int num=IUserService.selectNum("3",keyword);
+ int num=IUserService.selectNum("3",keyword,null);
return getDataTable(list,num);
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
index 9fcc6f6..cb6f473 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
@@ -4,6 +4,7 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -49,12 +50,14 @@
* 修改时间
*/
@ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
index 4f9affd..c1b311b 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
@@ -90,6 +90,9 @@
List<String> countId(String district);
+ int rangeStatistics(List<String> ids);
+
+
/**
* 首页统计用
* @return
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
index 679fbce..cfdd1e5 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java
@@ -14,7 +14,8 @@
* 查询机构列表
*/
public List<OrganizationChartEntity> selectConfigList(@Param("parentId") String parentId,
- @Param("grade") String grade);
+ @Param("grade") String grade,
+ @Param("ids") List<String> ids);
/**
* 新增机构
@@ -50,13 +51,14 @@
/**
* 查询机构列表(分页)
*/
- List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
+ List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ @Param("organizationName") String organizationName,@Param("ids") List<String> ids);
/**
* 统计数量(部门应用)
*/
- int countList(String organizationName);
+ int countList(@Param("organizationName") String organizationName,@Param("ids") List<String> ids);
/**
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
index c4b69ad..a5144dc 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -28,7 +28,8 @@
*/
public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
@Param("userType") String userType,
- @Param("userName") String userName);
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids);
@@ -67,7 +68,9 @@
*
* @return 结果
*/
- public int selectNum(@Param("userType") String userType,@Param("userName") String userName);
+ public int selectNum(@Param("userType") String userType,
+ @Param("userName") String userName,
+ @Param("ids") List<String> ids);
/**
* 根据部门id及分类id获取导办用户
diff --git a/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java b/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
index d3c44ba..c6f13ca 100644
--- a/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
+++ b/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
@@ -93,4 +93,7 @@
*/
int reversionRate(String state,String isTimeout);
+
+ int rangeStatistics(List<String> ids);
+
}
diff --git a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
index 6bf74b7..990a9a5 100644
--- a/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java
@@ -10,7 +10,7 @@
/**
* 查询机构列表
*/
- public List<OrganizationChartEntity> selectConfigList(String parentId,String grade);
+ public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids);
/**
* 新增机构
@@ -46,13 +46,13 @@
/**
* 查询机构列表(分页)
*/
- List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
+ List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName,List<String> ids);
/**
* 统计数量(部门应用)
*/
- int countList(String organizationName);
+ int countList(String organizationName,List<String> ids);
/**
* 获取部门下子部门的全部id
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
index 218bf8f..ad5aa5d 100644
--- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -14,7 +14,8 @@
*
* @return 参数配置信息
*/
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
+ String userName,List<String> ids);
SysUser selectData(String userId,String phonenumber,String loginName);
@@ -48,7 +49,7 @@
*
* @return 结果
*/
- public int selectNum(String userType,String userName);
+ public int selectNum(String userType,String userName,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 f12a26e..c91a585 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
@@ -122,7 +122,7 @@
* 导办事物列表(不分页)
* @return
*/
- List<TransactionEvent> selectList();
+ List<TransactionEvent> selectList(String keyWord);
/**
* 智能咨询
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 402927e..7c68f6d 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
@@ -315,7 +315,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
@@ -324,7 +324,7 @@
DateTime dateTime = td.nextWeekDay(dateTimeUser);
Calendar calendar = dateTime.toCalendar();
LocalDateTime localDateTime = LocalDateTime.of(calendar.get(Calendar.YEAR),
- calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE),
+ calendar.get(Calendar.MONTH)+1, calendar.get(Calendar.DATE),
9 + automessageSysSettings.getTimeoutNotificationNum(), 0);//设置时间为下一个工作日时间的9点+设置超时时间
guideRepairOrder.setTimeoutTime(localDateTime);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
index 2374ed3..94c0c61 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
@@ -85,4 +85,9 @@
return baseMapper.reversionRate(state,isTimeout);
}
+ @Override
+ public int rangeStatistics(List<String> ids) {
+ return baseMapper.rangeStatistics(ids);
+ }
+
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
index 0751fdc..a4b8ad2 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
@@ -6,6 +6,7 @@
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.mapper.OrganizationChartMapper;
import com.dg.core.service.IOrganizationChartService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -17,13 +18,20 @@
{
@Override
- public List<OrganizationChartEntity> selectConfigList(String parentId,String grade)
+ public List<OrganizationChartEntity> selectConfigList(String parentId,String grade,List<String> ids)
{
- List<OrganizationChartEntity> ocList=baseMapper.selectConfigList("","1");
+ List<OrganizationChartEntity> ocList=baseMapper.selectConfigList(parentId,"1",ids);
+
+ if(ocList==null || ocList.size()<1)
+ {
+ List<String> id=new ArrayList<>();
+ id.add(parentId);
+ ocList=baseMapper.selectConfigList(null,null,id);
+ }
for (OrganizationChartEntity entity:ocList)
{
- entity.setChild(baseMapper.selectConfigList(entity.getId()+"",""));
+ entity.setChild(baseMapper.selectConfigList(entity.getId()+"","",null));
if (entity.getChild()!=null)
{
@@ -57,9 +65,9 @@
public List<OrganizationChartEntity> selectConfigList(String parentsId) {
- List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"");
+ List<OrganizationChartEntity> list =baseMapper.selectConfigList(parentsId,"",null);
for (OrganizationChartEntity sysStreet:list) {
- sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),""));
+ sysStreet.setChild(baseMapper.selectConfigList(sysStreet.getId().toString(),"",null));
if (sysStreet.getChild()!=null)
{
sysStreet.setChild(this.selectConfigList(sysStreet.getId().toString()));
@@ -80,19 +88,20 @@
}
@Override
- public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName) {
- return baseMapper.queryList(page,state,organizationName);
+ public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
+ String organizationName,List<String> ids) {
+ return baseMapper.queryList(page,state,organizationName,ids);
}
@Override
- public int countList(String organizationName) {
- return baseMapper.countList(organizationName);
+ public int countList(String organizationName,List<String> ids) {
+ return baseMapper.countList(organizationName,ids);
}
@Override
public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
- return baseMapper.selectConfigList(parentId,grade);
+ return baseMapper.selectConfigList(parentId,grade,null);
}
/**
@@ -105,7 +114,7 @@
public List<String> getIds(String id)
{
List<String> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"");
+ List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"",null);
if(lists.size()<1)
{
lists.add(baseMapper.selectConfigById(id));
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index d2ff786..fa35932 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -240,8 +240,8 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
- return baseMapper.selectConfigList(page, state,userType,userName);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
+ return baseMapper.selectConfigList(page, state,userType,userName,ids);
}
@Override
@@ -284,8 +284,8 @@
}
@Override
- public int selectNum(String userType,String userName) {
- return baseMapper.selectNum(userType,userName);
+ public int selectNum(String userType,String userName,List<String> ids) {
+ return baseMapper.selectNum(userType,userName,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 ef4f73f..031bf93 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
@@ -229,7 +229,12 @@
}
@Override
- public List<TransactionEvent> selectList() {
+ public List<TransactionEvent> selectList(String keyWord) {
+ if (keyWord!=null&&keyWord!=""){
+ return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord));
+ }
+ else {
return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
+ }
}
}
diff --git a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
index 1c70b56..8c489ee 100644
--- a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
@@ -18,7 +18,7 @@
public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
{
- if (StringUtils.equals("3", sysUser.getRoleIds())) {
+ if (StringUtils.equals("3", sysUser.getUserType())) {
if (StringUtils.isEmpty(sysUser.getDataPermission())) {
return null;
}
@@ -37,13 +37,13 @@
return ids;
}
}
- else if(StringUtils.equals("2", sysUser.getRoleIds()))
+ else if(StringUtils.equals("2", sysUser.getUserType()))
{
//导办人员
List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
return ids;
}
- else if(StringUtils.equals("1", sysUser.getRoleIds()))
+ else if(StringUtils.equals("1", sysUser.getUserType()))
{
//管理员
List<String> ids=iOrganizationChartService.getIds("");
diff --git a/flower_city/src/main/resources/application-sms.properties b/flower_city/src/main/resources/application-sms.properties
index 946295a..fb5484e 100644
--- a/flower_city/src/main/resources/application-sms.properties
+++ b/flower_city/src/main/resources/application-sms.properties
@@ -7,19 +7,19 @@
#??????????,???????????????????????????????????
#??????
-#aliyun.TemplateCodeOvertime=SMS_254460011
+aliyun.TemplateCodeOvertime=SMS_254460011
#??????
-aliyun.TemplateCodeOvertime=SMS_254460012
+#aliyun.TemplateCodeOvertime=SMS_254460012
#??????
-#aliyun.TemplateCodeComplete=SMS_254875101
+aliyun.TemplateCodeComplete=SMS_254875101
#??????
-aliyun.TemplateCodeComplete=SMS_254875102
+#aliyun.TemplateCodeComplete=SMS_254875102
#??????
-#aliyun.TemplateCodeSubmit=SMS_254880764
+aliyun.TemplateCodeSubmit=SMS_254880764
#??????
-aliyun.TemplateCodeSubmit=SMS_254880763
+#aliyun.TemplateCodeSubmit=SMS_254880763
diff --git a/flower_city/src/main/resources/application.properties b/flower_city/src/main/resources/application.properties
index cebf6e4..2bbe9df 100644
--- a/flower_city/src/main/resources/application.properties
+++ b/flower_city/src/main/resources/application.properties
@@ -22,8 +22,8 @@
spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-spring.servlet.multipart.max-file-size=20MB
-spring.servlet.multipart.max-request-size=50MB
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=150MB
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index cee93d7..21b38bf 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -85,7 +85,7 @@
<if test="matterName != null and matterName != ''">
AND (matter_name like concat('%', #{matterName}, '%')) or
( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
- or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id=
+ or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id in
(SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%'))) )
</if>
<if test="status != null and status != ''">
@@ -110,7 +110,7 @@
<if test="matterName != null and matterName != ''">
AND (matter_name like concat('%', #{matterName}, '%')) or
( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
- or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id=
+ or (classify_id in (SELECT id FROM automessage_classify_administration WHERE automessage_classify_administration.parent_id in
(SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%'))) )
</if>
<if test="status != null and status != ''">
diff --git a/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml b/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
index ad0b433..b4fc35d 100644
--- a/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
+++ b/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
@@ -155,5 +155,19 @@
+ <!-- 首页统计 区域统计 勿动 -->
+ <select id="rangeStatistics" parameterType="string" resultType="integer">
+ select count(id) from automessage_guide_repair_order
+ <where>
+ <if test="ids != null">
+ and guide_department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+
</mapper>
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
index f608c71..8f87191 100644
--- a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -59,6 +59,12 @@
<if test="organizationName != null and organizationName != ''">
AND organization_name like concat('%', #{organizationName}, '%')
</if>
+ <if test="ids != null">
+ and id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
@@ -67,6 +73,12 @@
<where>
<if test="organizationName != null and organizationName != ''">
AND organization_name like concat('%', #{organizationName}, '%')
+ </if>
+ <if test="ids != null">
+ and id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
</if>
</where>
</select>
@@ -77,10 +89,15 @@
<if test="parentId != null and parentId != ''">
AND parent_id=#{parentId}
</if>
-
<if test="grade != null and grade != ''">
AND grade=#{grade}
</if>
+ <if test="ids != null">
+ and id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/SysUserMapper.xml b/flower_city/src/main/resources/mapper/SysUserMapper.xml
index 84002c1..75c42c3 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -107,6 +107,12 @@
<if test="userType != null and userType != ''">
AND user_type=#{userType}
</if>
+ <if test="ids != null">
+ and department_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
</where>
</select>
@@ -133,7 +139,12 @@
<if test="userType != null and userType != ''">
AND user_type=#{userType}
</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>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
index b22190e..418b823 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -750,6 +750,7 @@
Long communityId = this.getCommunityId();
comActDynVO.setCommunityId(communityId);
Integer category = comActDynVO.getCategory();
+ log.info("当前登录的社区id"+communityId);
if (isNull(category)) {
comActDynVO.setCategory(1);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index de40874..070873e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -373,7 +373,8 @@
comEvent.setSolve(0);
comEvent.setDistribution(0);
//comEvent.setChangeExpert(0);
- comEvent.setArchive(0);
+ //comEvent.setArchive(0);
+ comEvent.setConciliation(0);
}
else if (comEvent.getEventProcessStatus().equals(6) && comEvent.getEventSucceed().equals(2)){
//调解完成，可以归档,查看
@@ -617,7 +618,7 @@
comEvent.setCurrentOrgId(community.getCommunityId().toString());
comEvent.setCurrentProcessType(5);
}
- if (!StringUtils.isEmpty(comEvent.getCenterId())) {
+ if (!StringUtils.isEmpty(comEvent.getCenterId())) {
//创建时处理级别都是专家
ComSanshuoIndustryCenter center = comSanShuoIndustryCenterService.getById(comEvent.getCenterId());
comEvent.setCurrentOrgName(center.getName());
@@ -658,11 +659,12 @@
ComSanshuoExpert expert = comSanShuoExpertService.getById(expertId);
SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1).eq(SysUser::getAppId,"wx0cef797390444b75" ));
SanShuoMessageVO vo=new SanShuoMessageVO();
- if (nonNull(sysUser)){
- if (isNull(sysUser.getOpenid())){
- log.info("专家未登陆APP，无法推送");
- return;
- }
+ if (isNull(sysUser)){
+ return;
+ }
+ if (isNull(sysUser.getOpenid())){
+ log.info("专家未登陆APP，无法推送");
+ return;
}
vo.setTouser(sysUser.getOpenid());
vo.setThing1(commediateTypeService.getById(comEvent.getEventCategory()).getName());
@@ -851,7 +853,7 @@
|| comEvent.getEventProcessStatus() == SanShuoEventStatusEnum.VALID.getCode().intValue()) {
comEvent.setId(id);
comEvent.setUserEventStatus(4);
- comEvent.setEventProcessStatus(8);
+ comEvent.setEventProcessStatus(9);
comEvent.setRevokeDes("用户手动取消");
comEvent.setRevokeDate(new Date());
int flag = baseMapper.updateById(comEvent);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java
index dc61b56..c86af40 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java
@@ -32,6 +32,7 @@
Map<String,Object> param=new HashMap<>();
param.put("touser", vo.getTouser());
param.put("template_id", TEMPLATE_ID);
+ param.put("page","packageE/page/sanShuo/mediationRoom/mediationRoom");
Map<String,Object> data=new HashMap<>();
data.put("thing1", formData(vo.getThing1()));
data.put("thing5", formData(vo.getThing5()));
--
Gitblit v1.7.1