From e9ea612a7e4754d3036ce0386f542a9dba1141d0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 10:03:28 +0800
Subject: [PATCH] 普达纠纷管理，物业公司接口处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml | 3 ++-
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 1 +
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
index 2ccd97d..4ca1282 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
@@ -48,6 +48,7 @@
comActProceedings.setCreateTime(new Date());
comActProceedings.setDelFlag(0);
comActProceedings.setStatus(0);
+ BeanUtils.copyProperties(comActProceedingsDTO, comActProceedings);
int i = comActProceedingsDao.insert(comActProceedings);
if (i>0){
return R.ok();
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 f84d418..d6b9b4d 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
@@ -1005,6 +1005,7 @@
}
}
log.info("当前userType===="+comEvent.getUserType());
+ comEvent.setAppId(loginUserInfoVO.getAppId());
List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
comEventCalculateVO.setStatus("0");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
index 07c0a8b..0f20a74 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -63,7 +63,7 @@
if (comPropertyVO.getCommunityId().equals(10172)){
administratorsUserVO.setType(20);
}
- administratorsUserVO.setAccount(comPropertyVO.getAccount());
+ administratorsUserVO.setAccount(comPropertyVO.getAccount());
administratorsUserVO.setPassword(comPropertyVO.getPassword());
administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
index 56377ee..c560acd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -164,6 +164,7 @@
from com_sanshuo_event_info
<where>
event_process_status not in (9)
+ AND app_id=#{comEvent.appId}
<if test="comEvent.userType == 1">
AND request_user_id=#{comEvent.requestUserId}
</if>
@@ -195,7 +196,7 @@
from com_sanshuo_event_info
<where>
event_process_status not in (9)
-
+ AND app_id=#{comEvent.appId}
<if test="comEvent.userType == 1">
AND request_user_id=#{comEvent.requestUserId}
</if>
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 4b98fb9..4cc9264 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
@@ -838,7 +838,7 @@
<select id="isDpcMember" resultType="Integer">
select count(id) from com_act_dpc where name =#{name} and phone=#{phone}
</select>
- <select id="isPropertyAccount" resultType="Integer">
+ <select id="isPropertyAccount" resultType="java.lang.Long">
select id from com_property where phone=#{phone}
</select>
</mapper>
--
Gitblit v1.7.1