From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java | 3 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml | 9 +++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml | 9 +++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java | 10 +++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml | 9 +++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java | 7 +++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java | 18 ++++++---
7 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
index 637ebeb..66f7fb8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
@@ -221,6 +221,9 @@
@ApiModelProperty("隐患or安全记录（1.隐患 2.安全记录）")
private Integer dangerOrRecord;
+ @ApiModelProperty("社区名字")
+ private String communityName;
+
/**
* 巡查类型
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
index 09b5ed0..d792b1d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java
@@ -92,8 +92,10 @@
@ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
@PostMapping("/pagePatrolRecord")
public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
- Long communityId = this.getCommunityId();
- comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ if(comSwPatrolRecordPageDTO.getCommunityId()==null){
+ Long communityId = this.getCommunityId();
+ comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ }
return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
}
@@ -151,8 +153,10 @@
@ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
@PostMapping("/pageSafetyWorkRecord")
public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
- Long communityId = this.getCommunityId();
- comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ if(comSwPatrolRecordPageDTO.getCommunityId()==null){
+ Long communityId = this.getCommunityId();
+ comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ }
return communityService.pageSafetyWorkRecord(comSwPatrolRecordPageDTO);
}
@@ -209,8 +213,10 @@
@ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
@PostMapping("/pageDangerReport")
public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
- Long communityId = this.getCommunityId();
- comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ if(comSwPatrolRecordPageDTO.getCommunityId()==null){
+ Long communityId = this.getCommunityId();
+ comSwPatrolRecordPageDTO.setCommunityId(communityId);
+ }
return communityService.pageDangerReport(comSwPatrolRecordPageDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
index 8352b86..7be2c3b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
+import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.model.dos.ComSwSafetyWorkRecordDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -56,6 +57,9 @@
@Resource
private UserService userService;
+
+ @Resource
+ private ComActDAO comActDAO;
@Override
public R pageDangerReport(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
@@ -229,6 +233,9 @@
comSwDangerReportVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwDangerReportVO.getCreateBy()));
}
+ // 所属社区名称
+ comSwDangerReportVO.setCommunityName(comActDAO.selectById(comSwDangerReportVO.getCommunityId()).getName());
+
// 查询指派人名称
if (StringUtils.isNotEmpty(comSwDangerReportVO.getAssignPerson())) {
StringBuilder sb = new StringBuilder();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
index f3664e9..d922778 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
+import com.panzhihua.service_community.dao.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -24,10 +25,6 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
-import com.panzhihua.service_community.dao.ComSwPatrolRecordDAO;
-import com.panzhihua.service_community.dao.ComSwPatrolRecordReportDAO;
-import com.panzhihua.service_community.dao.ComSwSafetyWorkRecordDAO;
import com.panzhihua.service_community.model.dos.ComSwDangerReportDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordDO;
import com.panzhihua.service_community.model.dos.ComSwPatrolRecordReportDO;
@@ -60,6 +57,9 @@
@Resource
private ComSwPatrolRecordReportDAO comSwPatrolRecordReportDAO;
+
+ @Resource
+ private ComActDAO comActDAO;
@Override
public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
@@ -304,6 +304,8 @@
if (comSwPatrolRecordVO.getCreateBy() != null) {
comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy()));
}
+ // 所属社区名称
+ comSwPatrolRecordVO.setCommunityName(comActDAO.selectById(comSwPatrolRecordVO.getCommunityId()).getName());
ComSwPatrolRecordReportDO recordReportDO =
comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda()
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
index 40f8f26..b95947d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwDangerReportMapper.xml
@@ -69,15 +69,20 @@
csdr.street_suggestion AS streetSuggestion,
csdr.undertake_record AS undertakeRecord,
csdr.leader_suggestion AS leaderSuggestion,
- csdr.assign_person AS assignPerson
+ csdr.assign_person AS assignPerson,
+ t.name as communityName
FROM
com_sw_danger_report as csdr
left join com_sw_patrol_record_report as csprr on csprr.report_id = csdr.id
left join com_sw_patrol_record as cspr on csprr.patrol_record_id = cspr.id
+ left join com_act t on csdr.community_id =t.community_id
<where>
- <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != ""'>
+ <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != 0'>
AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
</if>
+ <if test='comSwPatrolRecordDTO.communityId == 0'>
+ AND t.street_id in (12,14,15,16,17,19)
+ </if>
<if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
</if>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
index a86f54d..a846d4d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
@@ -48,14 +48,19 @@
cspr.succession_time AS successionTime,
cspr.create_at AS createAt,
cspr.create_by AS createBy,
- csprr.report_id AS reportId
+ csprr.report_id AS reportId,
+ t.name as communityName
FROM
com_sw_patrol_record as cspr
left join com_sw_patrol_record_report as csprr on csprr.patrol_record_id = cspr.id
+ left join com_act t on cspr.community_id = t.community_id
<where>
- <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != ""'>
+ <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != 0'>
AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
</if>
+ <if test='comSwPatrolRecordDTO.communityId == 0'>
+ AND t.street_id in (12,14,15,16,17,19)
+ </if>
<if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
</if>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
index dfdf633..6c4f852 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwSafetyWorkRecordMapper.xml
@@ -30,15 +30,20 @@
cspr.record_photo AS recordPhoto,
csswr.remark,
cspr.create_at AS createAt,
- cspr.create_by AS createBy
+ cspr.create_by AS createBy,
+ t.name as communityName
FROM
com_sw_safety_work_record as csswr
left join com_sw_patrol_record_report as csprr on csprr.report_id = csswr.id
left join com_sw_patrol_record as cspr on csprr.patrol_record_id = cspr.id
+ left join com_act t on cspr.community_id = t.community_id
<where>
- <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != ""'>
+ <if test='comSwPatrolRecordDTO.communityId != null and comSwPatrolRecordDTO.communityId != 0'>
AND cspr.community_id = #{comSwPatrolRecordDTO.communityId}
</if>
+ <if test='comSwPatrolRecordDTO.communityId == 0'>
+ AND t.street_id in (12,14,15,16,17,19)
+ </if>
<if test='comSwPatrolRecordDTO.patrolPerson != null and comSwPatrolRecordDTO.patrolPerson != ""'>
AND cspr.person_name LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
</if>
--
Gitblit v1.7.1