From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml | 21 ++
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 7
flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml | 2
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java | 5
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 7
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 43 ++-
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 55 +++--
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 18 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 14 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 5
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml | 4
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 18 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 30 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java | 1
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 33 +++
flower_city/src/main/resources/mapper/OrganizationChartMapper.xml | 8
flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java | 2
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 5
flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java | 3
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 11 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/WXMessageUtil.java | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml | 86 ++++++++
flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java | 2
flower_city/src/main/resources/mapper/SysUserMapper.xml | 46 +++-
flower_city/src/main/java/com/dg/core/controller/UserController.java | 9
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 14 +
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 11 +
flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java | 2
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java | 22 +
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml | 47 ++-
flower_city/src/main/resources/application.properties | 6
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 5
flower_city/src/main/resources/application-sms.properties | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java | 8
flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java | 2
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 4
39 files changed, 455 insertions(+), 130 deletions(-)
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/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 41fa02c..f461550 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
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -373,19 +374,26 @@
Assert.notNull(pageSize, "pageSize 不能为空");
Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids=null;
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
- {
- userId=null;
- }
- else
- {
- ids=null;
- userId=sysUser.getUserId()+"";
- }
+// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+// {
+// userId=null;
+// }
+// else
+// {
+// ids=null;
+// userId=sysUser.getUserId()+"";
+// }
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
@@ -401,19 +409,26 @@
public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
{
WorkOrder workOrder=new WorkOrder();
- List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<String> ids=null;
String userId=null;
if( StringUtils.equals("2",sysUser.getRoleIds()))
{
- if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
- {
- userId=null;
- }
- else
- {
- ids=null;
- userId=sysUser.getUserId()+"";
- }
+// if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
+// {
+// userId=null;
+// }
+// else
+// {
+// ids=null;
+// userId=sysUser.getUserId()+"";
+// }
+ userId=sysUser.getUserId()+"";
+ ids=new ArrayList<>();
+ ids.add(sysUser.getDepartmentId());
+ }
+ else
+ {
+ ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
}
//状态（1待分配 2 待办结 3 已办结 4 待评价 5 已取消 ）
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 0748d90..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
@@ -42,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));
}
/**
@@ -160,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));
@@ -170,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/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index 0cb1078..489c5d6 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
@@ -44,11 +44,7 @@
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
- }
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
@@ -91,12 +87,12 @@
return ResultData.error("模板名称不能为空");
}
- if(StringUtils.isEmpty(sysUser.getDepartmentId()))
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
{
return ResultData.error("部门id不能为空 请分配部门id");
}
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<String> ids=iOrganizationChartService.getIds(entity.getDepartmentId());
int num=iReplyTemplateService.countNum(entity.getName(),ids);
if(num>0)
@@ -105,7 +101,7 @@
}
entity.setId(null);
- entity.setDepartmentId(sysUser.getDepartmentId());
+ entity.setDepartmentId(entity.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
return toAjax(iReplyTemplateService.insertConfig(entity));
diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
index 8c134dd..6b61c82 100644
--- a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -77,9 +77,9 @@
@ApiOperation("编辑角色")
@PostMapping("/update")
@Authorization
- public ResultData updateConfig(@RequestBody RoleManagementEntity entity)
+ public ResultData updateConfig(@RequestBody RoleManagementEntity entity,@CurrentUser SysUser sysUser)
{
-// entity.setUpdateUserId(sysUser.getUserId()+"");
+ entity.setUpdateUserId(sysUser.getUserId()+"");
return toAjax(iRoleManagementService.updateConfig(entity));
}
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 0c9ae2f..71521b5 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
@@ -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);
@@ -263,6 +266,19 @@
}
+ /**
+ * 办事指南根据分类id筛选
+ * @return
+ */
+ @ApiOperation(value = "办事指南根据分类id筛选",response = ResultData.class)
+ @GetMapping("/selectClassifyList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectClassifyList(@RequestParam("ids") List<String> ids)
+ {
+ return getDataTable(iTransactionEventService.selectClassifyList(ids));
+ }
+
+
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 ac8d71f..42dde42 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
@@ -56,7 +56,14 @@
if(user==null)
{
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
{
//提示用户名或密码错误
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
index 3c246b0..7f82428 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -260,4 +260,18 @@
@ApiModelProperty("是否是部门领导（1是 2不是）")
private String isDivisionHead;
+ @ApiModelProperty("办理事项ids")
+ private String mattersIds;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办理事项名称")
+ private String mattersNames;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办结事项数目")
+ private String transactionEndNum;
+
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
index 1a04d49..47e2e34 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
@@ -18,7 +18,7 @@
{
public List<HuaChengSysUser> selectConfigList();
- public HuaChengSysUser selectData(@Param("userId") String userId,@Param("account") String account,@Param("phone") String phone);
+ public List<HuaChengSysUser> selectData(@Param("userId") String userId,@Param("account") String account,@Param("phone") String phone);
public int selectNum();
}
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 8a0a03b..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);
/**
* 新增机构
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 ffe2848..8d57068 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
@@ -178,6 +178,13 @@
List<TransactionEvent> selectListByIds(String[] list);
/**
+ * 根据分类筛选数据
+ * @param ids
+ * @return
+ */
+ List<TransactionEvent> selectClassifyList(List<String> ids);
+
+ /**
* 根据部门判断是否有事项名称重复
*/
String selectDataIfExist(@Param("departmentId") String departmentId,
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index d06f550..e0b4417 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -19,6 +19,7 @@
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 自定义拦截器，判断此次请求是否有权限
@@ -65,7 +66,15 @@
//如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+
if(huaChengSysUser!=null && !StringUtils.isEmpty(huaChengSysUser.getUserId()) )
{
SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone(),null);
diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
index ff9a7cb..c95f139 100644
--- a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
+++ b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -16,6 +16,8 @@
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.multipart.support.MissingServletRequestPartException;
+import java.util.List;
+
/**
* 增加方法注入，将含有CurrentUser注解的方法参数注入当前登录用户
*/
@@ -53,7 +55,14 @@
return sysUser;
}
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser!=null)
{
sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
diff --git a/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java b/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
index eec9ce3..94172b4 100644
--- a/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
@@ -8,7 +8,7 @@
{
public List<HuaChengSysUser> selectConfigList();
- public HuaChengSysUser selectData(String userId,String account,String phone);
+ public List<HuaChengSysUser> selectData(String userId,String account,String phone);
public int selectNum();
}
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 0d94750..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);
/**
* 新增机构
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 c91a585..3262c8d 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
@@ -144,4 +144,11 @@
List<String> selectclassifyId(String classifyId);
+ /**
+ * 根据分类筛选数据
+ * @param ids
+ * @return
+ */
+ List<TransactionEvent> selectClassifyList(List<String> ids);
+
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
index 1bd13b1..0ee0e73 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
@@ -18,7 +18,7 @@
}
@Override
- public HuaChengSysUser selectData(String userId,String account,String phone) {
+ public List<HuaChengSysUser> selectData(String userId,String account,String phone) {
return baseMapper.selectData(userId,account,phone);
}
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 1d3a243..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()));
@@ -93,7 +101,7 @@
@Override
public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
- return baseMapper.selectConfigList(parentId,grade);
+ return baseMapper.selectConfigList(parentId,grade,null);
}
/**
@@ -106,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 fa35932..565bdd5 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
@@ -65,7 +65,14 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null)
{
SysUser newUser = new SysUser();
@@ -154,7 +161,14 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
SysUser newUser = new SysUser();
if(huaChengSysUser==null)
{
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 031bf93..5bbfd5a 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
@@ -190,6 +190,11 @@
return baseMapper.selectclassifyId(classifyId);
}
+ @Override
+ public List<TransactionEvent> selectClassifyList(List<String> ids) {
+ return baseMapper.selectClassifyList(ids);
+ }
+
@Override
public int countNumByMatterName(String matterName) {
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..9cf2488 100644
--- a/flower_city/src/main/resources/application.properties
+++ b/flower_city/src/main/resources/application.properties
@@ -1,8 +1,6 @@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
-#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
@@ -22,8 +20,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/ClassifyAdministrationMapper.xml b/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
index 0c83b6e..ee2d151 100644
--- a/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
+++ b/flower_city/src/main/resources/mapper/ClassifyAdministrationMapper.xml
@@ -52,7 +52,7 @@
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}))
+ where department_id in (select id from automessage_organization_chart where id=#{departmentId} or parent_id=#{departmentId})) )
</if>
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
index cee93d7..8ae554b 100644
--- a/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
+++ b/flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -82,15 +82,6 @@
<select id="selectConfigList" resultMap="GuideRepairOrderResult">
<include refid="selectGuideRepairOrderVo"/>
<where>
- <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=
- (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%'))) )
- </if>
- <if test="status != null and status != ''">
- AND a.state=#{status}
- </if>
<if test="ids != null">
and department_id IN
<foreach collection="ids" item="param" open="(" close=")" separator=",">
@@ -100,6 +91,20 @@
<if test="guideUserId != null and guideUserId != ''">
AND a.guide_user_id=#{guideUserId}
</if>
+ <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 in
+ (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%')))
+ or (select user_name from automessage_sys_user where a.guide_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or order_num like concat('%', #{matterName}, '%') or
+ (select user_name from automessage_sys_user where a.submit_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or consult_user_name like concat('%', #{matterName}, '%') or
+ guide_department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{matterName}, '%') ) )
+ </if>
+ <if test="status != null and status != ''">
+ AND a.state=#{status}
+ </if>
</where>
order by update_time desc , create_time desc
</select>
@@ -107,15 +112,6 @@
<select id="countConfigList" resultType="integer">
select count(id) from automessage_guide_repair_order
<where>
- <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=
- (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%'))) )
- </if>
- <if test="status != null and status != ''">
- AND automessage_guide_repair_order.state=#{status}
- </if>
<if test="ids != null">
and department_id IN
<foreach collection="ids" item="param" open="(" close=")" separator=",">
@@ -125,6 +121,21 @@
<if test="guideUserId != null and guideUserId != ''">
AND automessage_guide_repair_order.guide_user_id=#{guideUserId}
</if>
+ <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 in
+ (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%')))
+ or (select user_name from automessage_sys_user where automessage_guide_repair_order.guide_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or order_num like concat('%', #{matterName}, '%') or
+ (select user_name from automessage_sys_user where automessage_guide_repair_order.submit_user_id=automessage_sys_user.user_id ) like concat('%', #{matterName}, '%')
+ or consult_user_name like concat('%', #{matterName}, '%') or
+ guide_department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{matterName}, '%') ) )
+ </if>
+ <if test="status != null and status != ''">
+ AND automessage_guide_repair_order.state=#{status}
+ </if>
+
</where>
</select>
diff --git a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
index 131bdc7..f29c436 100644
--- a/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
+++ b/flower_city/src/main/resources/mapper/OrganizationChartMapper.xml
@@ -19,7 +19,6 @@
<id property="updateUserId" column="update_user_id" />
<id property="areaList" column="area_list" />
-
</resultMap>
<sql id="selectOrganizationChartVo">
@@ -89,10 +88,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 75c42c3..26f14f5 100644
--- a/flower_city/src/main/resources/mapper/SysUserMapper.xml
+++ b/flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -37,6 +37,7 @@
<result property="openid" column="openid" />
<result property="transactionNum" column="transaction_num" />
<result property="isDivisionHead" column="is_division_head" />
+ <result property="mattersIds" column="matters_ids" />
</resultMap>
<sql id="selectSysUserVo">
@@ -66,12 +67,20 @@
department_id,
stair_id,
second_level_id,
+ matters_ids,
+ (SELECT GROUP_CONCAT(matter_name) FROM automessage_transaction_event WHERE id in (SELECT
+ substring_index(substring_index(matters_ids,',', b.help_topic_id + 1), ',', -1) result
+ FROM
+ mysql.help_topic b
+ where
+ b.help_topic_id < (LENGTH(matters_ids) - LENGTH(REPLACE(matters_ids, ',', '')) + 1))) as mattersNames,
+
concat(
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select city from automessage_organization_chart
where automessage_organization_chart.id=department_id)),''),
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select district from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select district from automessage_organization_chart
where automessage_organization_chart.id=department_id)),''),
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select village from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select village from automessage_organization_chart
where automessage_organization_chart.id=department_id)),'')
) AS department_area,
leisure_state,
@@ -88,6 +97,9 @@
openid,
(select user_name from automessage_sys_user where automessage_sys_user.user_id=create_by) as createName,
transaction_num,
+ (select count(id) from automessage_guide_repair_order where automessage_guide_repair_order.state='3'
+ and automessage_guide_repair_order.guide_user_id=user_id and
+ automessage_guide_repair_order.guide_department_id=automessage_sys_user.department_id) as transactionEndNum,
(select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName,
(select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,
(select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name
@@ -98,12 +110,6 @@
<select id="selectNum" parameterType="string" resultType="integer">
select count(user_id) from automessage_sys_user
<where>
- <if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%') or
- (department_id in (SELECT id FROM automessage_organization_chart
- WHERE organization_name like concat('%', #{userName}, '%'))) or
- phonenumber like concat('%', #{userName}, '%')
- </if>
<if test="userType != null and userType != ''">
AND user_type=#{userType}
</if>
@@ -113,6 +119,13 @@
#{param}
</foreach>
</if>
+ <if test="userName != null and userName != ''">
+ AND (user_name like concat('%', #{userName}, '%') or
+ (department_id in (SELECT id FROM automessage_organization_chart
+ WHERE organization_name like concat('%', #{userName}, '%'))) or
+ phonenumber like concat('%', #{userName}, '%'))
+ </if>
+
</where>
</select>
@@ -130,12 +143,6 @@
<select id="selectConfigList" parameterType="string" resultMap="SysUserResult">
<include refid="selectSysUserVo"/>
<where>
- <if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%') or
- (department_id in (SELECT id FROM automessage_organization_chart
- WHERE organization_name like concat('%', #{userName}, '%'))) or
- phonenumber like concat('%', #{userName}, '%')
- </if>
<if test="userType != null and userType != ''">
AND user_type=#{userType}
</if>
@@ -144,6 +151,12 @@
<foreach collection="ids" item="param" open="(" close=")" separator=",">
#{param}
</foreach>
+ </if>
+ <if test="userName != null and userName != ''">
+ AND (user_name like concat('%', #{userName}, '%') or
+ (department_id in (SELECT id FROM automessage_organization_chart
+ WHERE organization_name like concat('%', #{userName}, '%'))) or
+ phonenumber like concat('%', #{userName}, '%'))
</if>
</where>
order by create_time desc
@@ -232,6 +245,7 @@
<if test="transactionNames != null and transactionNames != '' ">,transaction_names</if>
<if test="openid != null and openid != '' ">,openid</if>
<if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head</if>
+ <if test="mattersIds != null and mattersIds != '' ">,matters_ids</if>
)values(
sysdate()
<if test="userId != null and userId != '' ">,#{userId}</if>
@@ -266,6 +280,7 @@
<if test="transactionNames != null and transactionNames != '' ">,#{transactionNames}</if>
<if test="openid != null and openid != '' ">,#{openid}</if>
<if test="isDivisionHead != null and isDivisionHead != '' ">,#{isDivisionHead}</if>
+ <if test="mattersIds != null and mattersIds != '' ">,#{mattersIds}</if>
)
</insert>
@@ -304,6 +319,7 @@
<if test="transactionNames != null and transactionNames != '' ">,transaction_names=#{transactionNames}</if>
<if test="openid != null and openid != '' ">,openid=#{openid}</if>
<if test="isDivisionHead != null and isDivisionHead != '' ">,is_division_head=#{isDivisionHead}</if>
+ <if test="mattersIds != null and mattersIds != '' ">,matters_ids=#{mattersIds}</if>
,update_time=sysdate()
</set>
where user_id= #{userId}
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 05dd6ea..aba55d6 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -56,11 +56,11 @@
id,
department_id,
concat(
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select city from automessage_organization_chart
where automessage_organization_chart.id=department_id)),''),
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select district from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select district from automessage_organization_chart
where automessage_organization_chart.id=department_id)),''),
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select village from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select village from automessage_organization_chart
where automessage_organization_chart.id=department_id)),'')
) AS department_area,
(select contact_number from automessage_organization_chart where automessage_organization_chart.id=department_id) as contactNumber,
@@ -120,11 +120,11 @@
id,
department_id,
concat(
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select city from automessage_organization_chart
where automessage_organization_chart.id=department_id)),''),
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select district from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select district from automessage_organization_chart
where automessage_organization_chart.id=department_id)),''),
- IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select village from automessage_organization_chart
+ IFNULL((SELECT name FROM automessage_area_code_2022 WHERE automessage_area_code_2022.code=(select village from automessage_organization_chart
where automessage_organization_chart.id=department_id)),'')
) AS department_area,
classify_id,
@@ -170,6 +170,22 @@
</where>
order by create_time desc
</select>
+
+ <!-- 根据分类筛选数据 -->
+ <select id="selectClassifyList" resultMap="TransactionEventEntityResult">
+ <include refid="selectTransactionEventList"/>
+ <where>
+ <if test="ids != null">
+ and classify_id IN
+ <foreach collection="ids" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ order by create_time desc
+ </select>
+
+
<select id="selectListByIds" resultMap="TransactionEventEntityResult">
<include refid="selectTransactionEventList"/>
@@ -377,7 +393,7 @@
<include refid="selectTransactionEventEntityVo"/>
where (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
<if test="departmentId!=null">
- and department_id=#{departmentId}
+ and department_id in (select id from automessage_organization_chart where id=#{departmentId} or parent_id=#{departmentId})
</if>
order by create_time desc
</select>
@@ -425,14 +441,11 @@
</select>
<select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
- select distinct classify_id, content, type FROM(
- select id,classify_name title,ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name) content,id classify_id,4 type from automessage_classify_administration c UNION
-
- select id,matter_name title,concat((select classify_name from automessage_classify_administration
- where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
- '/',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,classify_id,
- 2 type from automessage_transaction_event) k
- where k.title like concat('%',#{keyWord}, '%')
+ select id, title, content,classify_id, type from ( select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '/',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,classify_id,
+ 2 type from automessage_transaction_event) k
+ where k.title like concat('%',#{keyWord}, '%') or k.content like concat('%',#{keyWord}, '%')
</select>
<select id="selectSearchAssociate" resultType="com.dg.core.db.manual.pojo.Search">
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
index 74dbd17..dcecc66 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActDpcApi.java
@@ -78,7 +78,7 @@
@ApiOperation(value = "人大代表反馈随手拍")
@PostMapping("/feedback")
public R addFeedback(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ LoginUserInfoVO loginUserInfo = userService.getUserInfoByUserId(this.getLoginUserInfo().getUserId().toString()).getData();
Integer isDpcMember = loginUserInfo.getIsDpcMember();
if (isNull(isDpcMember) || !isDpcMember.equals(1)) {
return R.fail("暂无权限");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java
index 98abaa6..b1e363a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDpcDAO.java
@@ -62,4 +62,9 @@
* @return
*/
SysUserVO selectUser(@Param("phone") String phone);
+
+ /**
+ * 插入一条人大代表记录
+ * */
+ int insertComActDpc(@Param("comActDpc") ComActDpc comActDpc);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java
index feac66e..8a218a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java
@@ -24,5 +24,6 @@
* @param easyId
* @return
*/
+
List<ComActEasyPhotoFeedbackVO> getPhotoFeedbackListForDpc(@Param("easyId") Long easyId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java
index f557c9d..505f85f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDpcServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.utlis.Snowflake;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -21,6 +22,7 @@
import com.panzhihua.service_community.service.ComActDpcService;
import javax.annotation.Resource;
+import java.util.Date;
/**
* 人大代表(ComActDpc)表服务实现类
@@ -33,6 +35,8 @@
@Resource
private StringRedisTemplate stringRedisTemplate;
+ @Resource
+ private ComActDpcDAO comActDpcDAO;
/**
* 新增人大代表
@@ -52,8 +56,10 @@
}
}
dpc = new ComActDpc();
+ dpc.setId(Snowflake.getId());
+ dpc.setCreatedAt(new Date());
BeanUtils.copyProperties(addDpcDTO, dpc);
- int result = this.baseMapper.insert(dpc);
+ int result = comActDpcDAO.insertComActDpc(dpc);
if (result > 0) {
refreshAssociateUserCash(addDpcDTO.getPhone());
return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index 1ab0d6d..5965ed5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -308,7 +308,7 @@
cmActEasyPhotoDO.setTransferTime(nowDate);
} else {
- cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
+ cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no );
}
cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
@@ -390,6 +390,9 @@
default:
break;
}
+ if (!ObjectUtils.isEmpty(comActEasyPhotoVO.getIsReportDpc())){
+ cmActEasyPhotoDO.setIsReportDpc(comActEasyPhotoVO.getIsReportDpc());
+ }
if (!type.equals(3)) {
int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
if (update > 0) {
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 c88bb91..627993b 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)){
//调解完成，可以归档,查看
@@ -624,7 +625,7 @@
comEvent.setCurrentOrgId(center.getId().toString());
comEvent.setCurrentProcessType(5);
}
- if (nonNull(comEvent.getCenterId())){
+ if (StringUtils.isNotEmpty(comEvent.getCenterId())){
comEvent.setRequestUserCommunity(null);
}
comEvent.setUserEventStatus(2);
@@ -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);
@@ -1141,11 +1143,11 @@
case 1:
return "行业分中心受理";
case 3:
- return "街道调解站受理";
+ return "镇/街道受理案件";
case 2:
- return "社区调解站受理";
+ return "村/社区受理案件";
case 4:
- return "区三说会堂受理";
+ return "区三说会堂中心受理";
}
return null;
}
@@ -1153,13 +1155,13 @@
public String typeToNameExpert(Integer type){
switch (type){
case 1:
- return "区三说会堂专家";
+ return "区三说会堂中心专家";
case 2:
return "行业分中心专家";
case 3:
- return "街道调解站专家";
+ return "镇/街道调解专家";
case 4:
- return "社区调解站专家";
+ return "村/社区调解专家";
}
return null;
}
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()));
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml
index 707a437..fd4162a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDpcMapper.xml
@@ -64,6 +64,92 @@
SELECT user_id, `name`, phone
FROM sys_user WHERE `type` = 1 AND phone = #{phone}
</select>
+ <insert id="insertComActDpc">
+ insert into com_act_dpc
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="comActDpc.id != null">
+ id,
+ </if>
+ <if test="comActDpc.name != null and comActDpc.name != ''">
+ name,
+ </if>
+ <if test="comActDpc.phone != null and comActDpc.phone != ''">
+ phone,
+ </if>
+ <if test="comActDpc.nation != null and comActDpc.nation != ''">
+ nation,
+ </if>
+ <if test="comActDpc.sex != null">
+ sex,
+ </if>
+ <if test="comActDpc.area != null and comActDpc.area != ''">
+ area,
+ </if>
+ <if test="comActDpc.belong != null and comActDpc.belong != ''">
+ belong,
+ </if>
+ <if test="comActDpc.category != null and comActDpc.category != ''">
+ category,
+ </if>
+ <if test="comActDpc.position != null and comActDpc.position != ''">
+ position,
+ </if>
+ <if test="comActDpc.photo != null and comActDpc.photo != ''">
+ photo,
+ </if>
+ <if test="comActDpc.communityId != null">
+ community_id,
+ </if>
+ <if test="comActDpc.createdBy != null ">
+ created_by,
+ </if>
+ <if test="comActDpc.createdAt != null ">
+ created_at,
+ </if>
+ </trim>
+ values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="comActDpc.id != null">
+ #{comActDpc.id},
+ </if>
+ <if test="comActDpc.name != null and comActDpc.name != ''">
+ #{comActDpc.name},
+ </if>
+ <if test="comActDpc.phone != null and comActDpc.phone != ''">
+ #{comActDpc.phone},
+ </if>
+ <if test="comActDpc.nation != null and comActDpc.nation != ''">
+ #{comActDpc.nation},
+ </if>
+ <if test="comActDpc.sex != null">
+ #{comActDpc.sex},
+ </if>
+ <if test="comActDpc.area != null and comActDpc.area != ''">
+ #{comActDpc.area},
+ </if>
+ <if test="comActDpc.belong != null and comActDpc.belong != ''">
+ #{comActDpc.belong},
+ </if>
+ <if test="comActDpc.category != null and comActDpc.category != ''">
+ #{comActDpc.category},
+ </if>
+ <if test="comActDpc.position != null and comActDpc.position != ''">
+ #{comActDpc.position},
+ </if>
+ <if test="comActDpc.photo != null and comActDpc.photo != ''">
+ #{comActDpc.photo},
+ </if>
+ <if test="comActDpc.communityId != null ">
+ #{comActDpc.communityId},
+ </if>
+ <if test="comActDpc.createdBy != null ">
+ #{comActDpc.createdBy},
+ </if>
+ <if test="comActDpc.createdAt != null ">
+ #{comActDpc.createdAt},
+ </if>
+ </trim>
+ </insert>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml
index 1143a2f..031f2b8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml
@@ -35,4 +35,25 @@
ORDER BY caepf.create_at desc
</select>
+ <select id="getPhotoFeedbackListForDpc"
+ resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO">
+ SELECT
+ caepf.id,
+ caepf.easy_id,
+ caepf.feedback_content,
+ caepf.feedback_img,
+ caepf.create_at,
+ caepf.create_by,
+ dpc.`name` as createByName,
+ dpc.photo as createByImage
+ FROM
+ com_act_easy_photo_feedback AS caepf
+ LEFT JOIN sys_user AS su ON su.user_id = caepf.create_by
+ LEFT JOIN com_act_dpc dpc ON su.phone = dpc.phone
+ WHERE
+ caepf.easy_id = #{easyId} AND caepf.type = 2
+ ORDER BY caepf.create_at desc
+ </select>
+
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 9e9516c..1285e67 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -401,4 +401,9 @@
* 当前账号是否为专家后台账号
* */
int isExpertAccount(String account);
+
+ /**
+ * 是否为党员
+ * */
+ int isDpcMember(@Param("phone") String phone,@Param("name")String name);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 4d1762f..d3eb23b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -364,6 +364,13 @@
set.add(sysRoleDO.getRoleKey());
});
}
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(sysUserDO.getPhone()) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(sysUserDO.getPhone(), sysUserDO.getName());
+ if (i>0){
+ loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
return R.ok(loginUserInfoVO);
}
@@ -511,6 +518,13 @@
if (nonNull(expertVO)){
loginUserInfoVO.setType(13);
}
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(phone) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(phone, sysUserDO.getName());
+ if (i>0){
+ loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
return R.ok(loginUserInfoVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
index cb162e0..1239087 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -824,4 +824,8 @@
<select id="isExpertAccount" resultType="Integer">
select count(id) from com_sanshuo_expert where account=#{account}
</select>
+
+ <select id="isDpcMember" resultType="Integer">
+ select count(id) from com_act_dpc where name =#{name} and phone=#{phone}
+ </select>
</mapper>
--
Gitblit v1.7.1