From bef5db91f4a45436b731c43fb13575155a9fe1e7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 11 Apr 2024 17:26:59 +0800
Subject: [PATCH] 我的小区查询出党组织信息
---
src/main/java/org/springblade/modules/district/vo/DistrictVO.java | 16 ++++++++++++++++
src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml | 16 +++++++++++-----
src/main/java/org/springblade/modules/task/controller/TaskNoFraudReportingController.java | 10 ++++++++++
src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java | 18 +++++++++++++-----
4 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
index 244a2c4..9528bdf 100644
--- a/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
+++ b/src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml
@@ -82,13 +82,19 @@
<!--小区自定义获取详情查询-->
<select id="getDetail" resultType="org.springblade.modules.district.vo.DistrictVO">
- SELECT
- jd.*,
- jda.nei_code as communityCode,jda.nei_name as communityName
+ SELECT jd.*,
+ jda.nei_code as communityCode,
+ jda.nei_name as communityName,
+ jpo.organization_name,
+ jpo.organization_type,
+ jpo.branch_type,
+ jpo.charge_person,
+ jpo.phone
FROM jczz_district jd
- left join jczz_doorplate_address jda on jda.aoi_code = jd.aoi_code
+ left join jczz_doorplate_address jda on jda.aoi_code = jd.aoi_code
+ LEFT JOIN jczz_party_organization jpo on jpo.area_id = jda.nei_code
where jd.is_deleted = 0
- and jda.address_code = #{district.houseCode}
+ and jda.address_code = #{district.houseCode}
</select>
diff --git a/src/main/java/org/springblade/modules/district/vo/DistrictVO.java b/src/main/java/org/springblade/modules/district/vo/DistrictVO.java
index 9a5fe0c..7bd2a4f 100644
--- a/src/main/java/org/springblade/modules/district/vo/DistrictVO.java
+++ b/src/main/java/org/springblade/modules/district/vo/DistrictVO.java
@@ -75,4 +75,20 @@
@ApiModelProperty(value = "社区编号")
private String communityCode;
+
+ private String organizationName;
+
+ //组织类型
+ private String organizationType;
+
+
+ //支部类型
+ private String branchType;
+
+ //负责人姓名
+ private String chargePerson;
+
+ //负责人手机号
+ private String phone;
+
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskNoFraudReportingController.java b/src/main/java/org/springblade/modules/task/controller/TaskNoFraudReportingController.java
index 6bb5116..d165122 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskNoFraudReportingController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskNoFraudReportingController.java
@@ -142,6 +142,16 @@
}
/**
+ * 无炸上报任务表 修改
+ */
+ @PostMapping("/updateTwo")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入taskNoFraudReporting")
+ public R updateTwo(@Valid @RequestBody TaskNoFraudReportingVO taskNoFraudReporting) {
+ return R.status(taskNoFraudReportingService.updateTaskNoFraudReporting(taskNoFraudReporting));
+ }
+
+ /**
* 无炸上报任务表 新增或修改
*/
@PostMapping("/submit")
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
index 23f6702..70c686b 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskNoFraudReportingServiceImpl.java
@@ -120,6 +120,11 @@
return taskNoExplosionExcels;
}
+ /**
+ * 更新
+ * @param taskNoFraudReporting
+ * @return
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateTaskNoFraudReporting(TaskNoFraudReportingVO taskNoFraudReporting){
@@ -132,14 +137,17 @@
// 2.更新任务详情
boolean save = updateById(taskNoFraudReporting);
if (save) {
- // 3.更新题目记录
+ // 3.更新或新增题目记录
List<TaskPlaceRecordVO> taskPlaceRecordList = taskNoFraudReporting.getTaskPlaceRecordVOList();
if (taskPlaceRecordList != null && taskPlaceRecordList.size() > 0) {
ITaskPlaceRecordService bean = SpringUtil.getBean(ITaskPlaceRecordService.class);
- List<TaskPlaceRecordEntity> copy = BeanUtil.copy(taskPlaceRecordList, TaskPlaceRecordEntity.class);
- boolean b = bean.saveOrUpdateBatch(copy);
- if (b) {
- return b;
+ List<TaskPlaceRecordEntity> recordEntityList = BeanUtil.copy(taskPlaceRecordList, TaskPlaceRecordEntity.class);
+ for (TaskPlaceRecordEntity taskPlaceRecordEntity : recordEntityList) {
+ taskPlaceRecordEntity.setType("2");
+ }
+ boolean result = bean.saveOrUpdateBatch(recordEntityList);
+ if (result) {
+ return result;
}
throw new CustomException("保存失败！");
}
--
Gitblit v1.9.3