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> 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; } 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") 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("保存失败!"); }