springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
@@ -75,7 +75,8 @@ @ApiOperation(value = "查询报道单位列表", response = ComPbCheckUnitVo.class) @PostMapping("/list") public R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) { comPbCheckUnit.setCommunityId(this.getCommunityId()); //comPbCheckUnit.setCommunityId(this.getCommunityId()); comPbCheckUnit.setCommunityId(null); return this.comPbCheckUnitService.queryByList(comPbCheckUnit); }
@@ -286,6 +286,8 @@ @PostMapping("addpartybuildingmember") public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) { Long communityId = this.getCommunityId(); Long userId = this.getUserId(); partyBuildingMemberVO.setUserId(userId); partyBuildingMemberVO.setCommunityId(communityId); R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO); if (R.isOk(r)) { @@ -308,4 +310,9 @@ return communityService.getCommunityLists(); } @ApiOperation(value = "查询当前用户党员信息") @GetMapping("/getPartyMember") public R getPartyMember(){ return partyBuildingService.getPartyMember(this.getUserId()); } } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VillageApi.java
New file @@ -0,0 +1,52 @@ package com.panzhihua.applets.api; import com.alibaba.excel.EasyExcel; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.listen.ComMngVillageServeExcelListen; import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngVillageRegionVO; import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageTotalVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.io.InputStream; import java.util.List; /** * @description: 小区管理 * @author: llming **/ @Slf4j @Api(tags = {"小区管理"}) @RestController @RequestMapping("/villagemanager/") public class VillageApi extends BaseController { @Resource private CommunityService communityService; @Resource private UserService userService; @ApiOperation(value = "查询小区", response = ComMngVillageVO.class) @PostMapping("listvillage") public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) { return communityService.listVillage(comMngVillageVO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -87,6 +87,23 @@ @ApiModelProperty(value = "活动积分") private Integer partyInterval; @ApiModelProperty(value = "帮扶社区id") private Long helpCommunityId; @ApiModelProperty(value = "帮扶社区名字") private String helpCommunityName; @ApiModelProperty(value = "帮扶社区手机号") private String helpCommunityContacts; @ApiModelProperty(value = "帮扶社区联系人") private String helpCommunityContactsName; @ApiModelProperty(value = "小区id") private Long villageId; @ApiModelProperty(value = "小区名字") private String villageName; @ApiModelProperty(value = "报道单位联系人手机号") private String contacts; @ApiModelProperty(value = "报道单位联系人") private String contactName; @ApiModelProperty(value = "分页-当前页数", example = "1") private Long pageNum = 1L;
@@ -9641,6 +9641,15 @@ @GetMapping("/comActAcidRecord/del") R deleteComActAcidRecord(@RequestParam("id") Long id); /** * 删除数据 * * @param id 主键结合 * @return 删除结果 */ @GetMapping("/comActAcidRecord/detailByApp") R detailByApp(@RequestParam("id") Long id); @PostMapping("/comActAcidRecord/export") R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
@@ -610,4 +610,8 @@ */ @PostMapping("/partybuildIng/getPagePbMember") R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO); @GetMapping("/partybuildIng/getPartyMember") public R getPartyMember(@RequestParam("userId")Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -81,11 +81,13 @@ public R listComActVillage(ComMngVillageVO comMngVillageVO) { List<ComMngVillageDO> vos = Lists.newArrayList(); LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda(); param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley()); if(StringUtils.isNotEmpty(comMngVillageVO.getName())){ param.like(ComMngVillageDO::getName, comMngVillageVO.getName()); } param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId()); List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param); BeanUtils.copyProperties(vos, comMngVillageDOS); return R.ok(vos); BeanUtils.copyProperties(comMngVillageDOS, vos); return R.ok(comMngVillageDOS); } @Override springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -782,4 +782,9 @@ public R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){ return comPbMemberService.getPagePbMember(partyBuildingMemberVO); } @GetMapping("/getPartyMember") public R getPartyMember(@RequestParam("userId")Long userId){ return comPbMemberService.getPartyMember(userId); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -194,4 +194,6 @@ * @return */ List<PartyBuildingMemberVO> getDetailByApp(Long id); PartyBuildingMemberVO selectDetail(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
@@ -135,6 +135,11 @@ */ private String orgName; private Long helpCommunityId; private Long villageId; /** * 党员审查结果 0待审核 1 审核通过 3审核失败 */ springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -250,4 +250,6 @@ R checkMember(String idCard); R getPagePbMember(PartyBuildingMemberVO partyBuildingMemberVO); R getPartyMember(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -1095,4 +1095,10 @@ }); return R.ok(memberPage); } @Override public R getPartyMember(Long userId) { return R.ok(comPbMemberDAO.selectDetail(userId)); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -713,5 +713,9 @@ </if> order by m.create_at desc </select> <select id="selectDetail" resultType="com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO"> select t.*,t1.contacts as contactsName,t1.phone as contacts,t1.name as checkUnitName,t2.name as villageName,t3.name as helpCommunityName,t3.contacts as helpCommunityContactsName,t3.contacts_phone as helpCommunityContacts,t4.name as communityName from com_pb_member t left join com_pb_check_unit t1 on t.check_unit_id = t1.id left join com_mng_village t2 on t.village_id = t2.village_id left join com_act t3 on t.help_community_id = t3.community_id left join com_act t4 on t.community_id = t4.community_id where t.user_id=#{userId} </select> </mapper>
