springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java
@@ -17,10 +17,10 @@ @ExcelProperty(value = "姓名",index = 0) private String name; /** * 社工证编号 列: social_worker_code * 身份证 列: social_worker_code */ @ExcelProperty(value = "社工证号码",index = 1) private String socialWorkerCode; @ExcelProperty(value = "身份证号码",index = 1) private String idCard; /** * 性别0女1男 列: gen @@ -28,10 +28,10 @@ @ExcelProperty(value = "性别0女1男",index = 2) private String gen; /** * 出生日期 列: birthday * 入职时间 */ @ExcelProperty(value = "出生日期",index = 3) private Date birthday; @ExcelProperty(value = "入职时间",index = 3) private Date joinTime; /** * 联系电话 列: telephone */ @@ -39,10 +39,10 @@ private String telephone; /** * 所属街道 列: street_id * 学历 列: street_id */ @ExcelProperty(value = "所属街道",index = 5) private String streetId; @ExcelProperty(value = "学历",index = 5) private String education; /** * 所属社区 列: community_id */ @@ -50,28 +50,32 @@ private String communityId; /** * 所属组织ID 列: social_org_id * 政治面貌 */ @ExcelProperty(value = "所属机构",index = 7) private String socialOrgId; @ExcelProperty(value = "政治面貌",index = 7) private String politicalOutlook; /** * 社工资质 列: social_qua * 民族 列: social_qua */ @ExcelProperty(value = "社工资质",index = 8) private String socialQua; @ExcelProperty(value = "民族",index = 8) private String nation; /** * 技能领域 列: skill_field * 社工证 */ @ExcelProperty(value = "技能领域",index = 9) private String skillField; @ExcelProperty(value = "社工证",index = 9) private String credential; /** * 业务范围 列: business_scope * 住址 */ @ExcelProperty(value = "业务范围",index = 10) private String businessScope; @ExcelProperty(value = "住址",index = 10) private String address; /** * 年龄 */ @ExcelProperty(value = "年龄",index = 11) private Integer age;
New file @@ -0,0 +1,29 @@ package com.panzhihua.common.model.vos.community.bigscreen; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author zzj */ @Data @ApiModel("大屏首页数据") public class BigScreenHmkBaseInfo { @ApiModelProperty("项目管理") private BigScreenHmkProjectInfo bigScreenHmkProjectInfo; @ApiModelProperty("项目数") private Integer projectCount; @ApiModelProperty("活动数") private Integer activityCount; @ApiModelProperty("社工数") private Integer socialWorkerCount; @ApiModelProperty("居民数") private Integer userCount; @ApiModelProperty("社会组织数") private Integer socialOrgCount; @ApiModelProperty("社会组织管理") private BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo; @ApiModelProperty("社工分析数据") private BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.vos.community.bigscreen; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @author zzj */ @Data @ApiModel("项目数据") public class BigScreenHmkProjectInfo { @ApiModelProperty("项目数") private Integer count; @ApiModelProperty("项目类型饼状图") private List<BigScreenHmkProjectTypeInfo> typeInfoList; @ApiModelProperty("项目活动类型饼状图") private List<BigScreenHmkProjectTypeInfo> activityTypeInfoList; @ApiModelProperty("已分派") private Integer assigned; @ApiModelProperty("待分派") private Integer assign; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.common.model.vos.community.bigscreen; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author zzj */ @Data @ApiModel("项目饼状图") public class BigScreenHmkProjectTypeInfo { @ApiModelProperty("名字") private String name; @ApiModelProperty("数量") private Integer count; @ApiModelProperty("百分比") private Integer percent; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java
New file @@ -0,0 +1,21 @@ package com.panzhihua.common.model.vos.community.bigscreen; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @author zzj */ @Data @ApiModel("社会组织饼状图") public class BigScreenHmkSocialOrgInfo { @ApiModelProperty("总数") private Integer count; @ApiModelProperty("服务数") private Integer serviceCount; @ApiModelProperty("组织分类图") List<BigScreenHmkProjectTypeInfo> typeInfoList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.common.model.vos.community.bigscreen; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @author zzj */ @Data @ApiModel("社工基础数据") public class BigScreenHmkSocialWorkerInfo { @ApiModelProperty("社工年龄分布") private List<BigScreenHmkProjectTypeInfo> socialWorkerAge; @ApiModelProperty("社工技能分析") private List<BigScreenHmkProjectTypeInfo> socialWorkerSkill; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java
@@ -9,6 +9,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; /** @@ -73,4 +74,9 @@ @ApiModelProperty(value = "人员Id") private Long paramId; @ApiModelProperty(value = "ids") private List<Long> ids; private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java
@@ -71,4 +71,7 @@ @ApiModelProperty(value="责任方") private String responsibility; @ApiModelProperty(value = "街道名字") private String streetName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -7740,6 +7740,15 @@ public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember); /** * 批量新增数据 * * @param comActSocialMember 实体对象 * @return 新增结果 */ @PostMapping("/comActSocialProjectMember/batch") public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember); /** * 修改数据 * * @param comActSocialMember 实体对象 @@ -7920,7 +7929,7 @@ * @param id 主键 * @return 单条数据 */ @GetMapping("/comActSocialProjectPublicity/{id}") @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}") public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.ComActSocialMemberVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -65,7 +66,6 @@ public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) { return this.communityService.comActSocialMemberInsert(comActSocialMember); } /** * 修改数据 * springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java
@@ -1,6 +1,7 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.social.SocialProjectVO; @@ -24,7 +25,7 @@ @Api(tags = {"项目管理"}) @RestController @RequestMapping("comActSocialProject") public class ComActSocialProjectApi { public class ComActSocialProjectApi extends BaseController { /** * 服务对象 */ @@ -72,6 +73,12 @@ @ApiOperation(value = "新增数据") @PostMapping public R insert(@RequestBody SocialProjectVO socialProjectVO) { if(this.getLoginUserInfo().getStreetId()!=null){ socialProjectVO.setStreetId(this.getLoginUserInfo().getStreetId()); } else { socialProjectVO.setCommunityId(this.getCommunityId()); } return communityService.insertComActSocialProject(socialProjectVO); }
@@ -1,6 +1,7 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO; @@ -23,7 +24,7 @@ @Api(tags = {"项目成员管理"}) @RestController @RequestMapping("comActSocialProjectMember") public class ComActSocialProjectMemberApi { public class ComActSocialProjectMemberApi extends BaseController { /** * 服务对象 */ @@ -63,8 +64,21 @@ @ApiOperation("新增数据") @PostMapping public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) { comActSocialProjectMemberVO.setCommunityId(this.getCommunityId()); return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO); } /** * 批量新增数据 * * @param comActSocialMember 实体对象 * @return 新增结果 */ @ApiOperation("批量新增数据") @PostMapping("/batch") public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember) { comActSocialMember.setCommunityId(this.getCommunityId()); return this.communityService.comActSocialMemberInsertBatch(comActSocialMember); } /** * 修改数据 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -296,4 +296,8 @@ return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO); } @PostMapping("/hmk/baseInfo") public R getHmkBaseInfo(){ return null; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
@@ -72,6 +72,11 @@ ComActSocialProject comActSocialProject=new ComActSocialProject(); BeanUtils.copyProperties(socialProjectVO,comActSocialProject); comActSocialProject.setCreateTime(new Date()); if(socialProjectVO.getLevel()>1){ ComActSocialProject comActSocialProject1=comActSocialProjectService.getById(socialProjectVO.getParentId()); comActSocialProject.setColumnId(comActSocialProject1.getColumnId()); comActSocialProject.setSecondColumnId(comActSocialProject1.getSecondColumnId()); } return R.ok(this.comActSocialProjectService.save(comActSocialProject)); }
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.api.ApiController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.dtos.property.CommonPage; @@ -87,4 +88,9 @@ public R delete(@RequestParam("id") Long id) { return R.ok(this.comActSocialProjectMemberService.removeById(id)); } @PostMapping("/batch") public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO){ return R.ok(this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectPublicityApi.java
@@ -65,7 +65,7 @@ ComActSocialProjectPublicity comActSocialProjectPublicity=this.comActSocialProjectPublicityService.getById(id); comActSocialProjectPublicity.setViews(comActSocialProjectPublicity.getViews()+1); this.comActSocialProjectPublicityService.updateById(comActSocialProjectPublicity); return R.ok(this.comActSocialProjectPublicityService.getById(id)); return this.comActSocialProjectPublicityService.selectOne(id); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.community.ComActSocialOrgVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.ComActSocialOrg; import org.apache.ibatis.annotations.Param; import java.util.List; /** * 社会组织(ComActSocialOrg)表数据库访问层 @@ -31,4 +35,17 @@ * @return */ ComActSocialOrgVO detail(Long id); /** * 查询社会组织数据 * @return */ BigScreenHmkSocialOrgInfo selectInfo(); /** * 查询社会组织饼状图 * @return */ List<BigScreenHmkProjectTypeInfo> selectType(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java
@@ -4,10 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo; import com.panzhihua.common.model.vos.community.social.SocialProjectVO; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.ComActSocialProject; import org.apache.ibatis.annotations.Param; import java.util.List; /** * 三社联动项目表(ComActSocialProject)表数据库访问层 @@ -33,4 +38,29 @@ */ SocialProjectVO getByApplet(Long id); /** * 河门口大屏项目基础数据 * @return */ BigScreenHmkProjectInfo selectBaseInfo(); /** * 河门口大屏项目分类 * @return */ List<BigScreenHmkProjectTypeInfo> selectType(); /** * 根据活动类型查询数量 * @param type * @return */ Integer selectActivity(Integer type); /** * 首页基础数据 * @return */ BigScreenHmkBaseInfo selectIndexBaseInfo(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectPublicityDao.java
@@ -24,4 +24,11 @@ * @return */ IPage<ComActSocialProjectPublicityVO> pageList(Page page, @Param("commonPage")CommonPage commonPage); /** * 详情 * @param id * @return */ ComActSocialProjectPublicityVO selectOne(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO; import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO; import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.ComActSocialWorker; import org.apache.ibatis.annotations.Param; @@ -28,5 +29,23 @@ */ IPage<ComActSocialWorkerVO> findByPage(Page page, @Param("pageComActSocialWorkerDTO") PageComActSocialWorkerDTO pageComActSocialWorkerDTO); /** * 导出 * @param comActSocialWorkerDO * @return */ List<ComActSocialWorkerExcelVO> queryAll(ComActSocialExportVO comActSocialWorkerDO); /** * 查询社工人数 * @param type * @return */ Integer selectType(Integer type); /** * 社工技能分布查询 * @return */ List<BigScreenHmkProjectTypeInfo> selectSkillType(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java
@@ -75,4 +75,6 @@ @ApiModelProperty(value = "项目id") private Long projectId; private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
@@ -123,4 +123,10 @@ * @return */ R indexQuestionnaireList(PageBaseDTO pageBaseDTO); /** * 河门口大屏首页 * @return */ R hmkBaseInfo(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectMemberService.java
@@ -27,4 +27,11 @@ * @return */ R insert(ComActSocialProjectMemberVO comActSocialProjectMemberVO); /** * 批量添加 * @param comActSocialProjectMemberVO * @return */ R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectPublicityService.java
@@ -19,4 +19,11 @@ * @return */ R pageList(CommonPage commonPage); /** * 详情 * @param id * @return */ R selectOne(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -14,6 +14,8 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.bigscreen.*; import com.panzhihua.service_community.dao.*; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,29 +24,10 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.StatisticsCommVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO; import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO; import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO; import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO; import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO; import com.panzhihua.service_community.dao.ComActDiscussDAO; import com.panzhihua.service_community.dao.ComActDynDAO; import com.panzhihua.service_community.dao.ComActEasyPhotoDAO; import com.panzhihua.service_community.dao.ComActMicroWishDAO; import com.panzhihua.service_community.dao.ComActNeighborCircleDAO; import com.panzhihua.service_community.dao.ComActQuestnaireDAO; import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.dao.ComPropertyDao; import com.panzhihua.service_community.dao.ConvenientMerchantDAO; import com.panzhihua.service_community.service.BigScreenStatisticsService; import lombok.extern.slf4j.Slf4j; @@ -91,6 +74,15 @@ @Resource private ComActDynDAO comActDynDAO; @Resource private ComActSocialProjectDao comActSocialProjectDao; @Resource private ComActSocialOrgDao comActSocialOrgDao; @Resource private ComActSocialWorkerDao comActSocialWorkerDao; /** * 大数据分析平台-居民自治 @@ -649,6 +641,84 @@ return R.ok(comActQuestnaireDAO.selectQuestionnaireDisplayList(page, pageBaseDTO)); } @Override public R hmkBaseInfo() { BigScreenHmkBaseInfo bigScreenHmkBaseInfo=comActSocialProjectDao.selectIndexBaseInfo(); //项目数据 BigScreenHmkProjectInfo bigScreenHmkProjectInfo=comActSocialProjectDao.selectBaseInfo(); List<BigScreenHmkProjectTypeInfo> typeInfo=comActSocialProjectDao.selectType(); if(bigScreenHmkProjectInfo.getCount()>0){ typeInfo.forEach(bigScreenHmkProjectTypeInfo -> { bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/bigScreenHmkProjectInfo.getCount()); }); } bigScreenHmkProjectInfo.setTypeInfoList(typeInfo); //活动数据 Integer countAll=comActSocialProjectDao.selectActivity(0); BigScreenHmkProjectTypeInfo jm=new BigScreenHmkProjectTypeInfo(); jm.setName("居民活动"); jm.setCount(comActSocialProjectDao.selectActivity(2)); if(countAll>0){ jm.setPercent(jm.getCount()/countAll); } BigScreenHmkProjectTypeInfo zyz=new BigScreenHmkProjectTypeInfo(); zyz.setName("志愿者活动"); zyz.setCount(comActSocialProjectDao.selectActivity(1)); if(countAll>0){ zyz.setPercent(zyz.getCount()/countAll); } List<BigScreenHmkProjectTypeInfo> activityList=new ArrayList<>(); activityList.add(jm); activityList.add(zyz); bigScreenHmkProjectInfo.setActivityTypeInfoList(activityList); //社会组织数据 BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo=comActSocialOrgDao.selectInfo(); List<BigScreenHmkProjectTypeInfo> typeInfoList= comActSocialOrgDao.selectType(); if(bigScreenHmkSocialOrgInfo.getCount()>0){ typeInfoList.forEach(bigScreenHmkProjectTypeInfo -> { bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/bigScreenHmkSocialOrgInfo.getCount()); }); } bigScreenHmkSocialOrgInfo.setTypeInfoList(typeInfoList); bigScreenHmkBaseInfo.setBigScreenHmkSocialOrgInfo(bigScreenHmkSocialOrgInfo); //社工数据 BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo=new BigScreenHmkSocialWorkerInfo(); List<BigScreenHmkProjectTypeInfo> socialWorkerList=new ArrayList<>(); Integer socialAll=comActSocialWorkerDao.selectType(0); BigScreenHmkProjectTypeInfo ss=new BigScreenHmkProjectTypeInfo(); ss.setName("30岁以下"); ss.setCount(comActSocialWorkerDao.selectType(1)); if(socialAll>0){ ss.setPercent(ss.getCount()/socialAll); } BigScreenHmkProjectTypeInfo wj=new BigScreenHmkProjectTypeInfo(); wj.setName("30-59岁"); wj.setCount(comActSocialWorkerDao.selectType(2)); if(socialAll>0){ wj.setPercent(wj.getCount()/socialAll); } BigScreenHmkProjectTypeInfo ls=new BigScreenHmkProjectTypeInfo(); ls.setName("60岁以上"); ls.setCount(comActSocialWorkerDao.selectType(2)); if(socialAll>0){ ls.setPercent(ls.getCount()/socialAll); } socialWorkerList.add(ss); socialWorkerList.add(wj); socialWorkerList.add(ls); bigScreenHmkSocialWorkerInfo.setSocialWorkerAge(socialWorkerList); List<BigScreenHmkProjectTypeInfo> socialWorkerSkill=comActSocialWorkerDao.selectSkillType(); if(socialAll>0){ socialWorkerSkill.forEach(bigScreenHmkProjectTypeInfo -> { bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/socialAll); }); } bigScreenHmkSocialWorkerInfo.setSocialWorkerSkill(socialWorkerSkill); bigScreenHmkBaseInfo.setBigScreenHmkSocialWorkerInfo(bigScreenHmkSocialWorkerInfo); return R.ok(bigScreenHmkBaseInfo); } private Page retrievePage(PageBaseDTO pageBaseDTO) { Long pageNum = pageBaseDTO.getPageNum(); Long size = pageBaseDTO.getPageSize(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.property.CommonPage; @@ -74,6 +75,47 @@ return R.fail("参数异常"); } @Override public R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO) { if(CollectionUtils.isNotEmpty(comActSocialProjectMemberVO.getIds())){ comActSocialProjectMemberVO.getIds().forEach(id ->{ if(comActSocialProjectMemberVO.getType()==1){ ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id); if(comActSocialWorker!=null){ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember(); BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember); comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard())); comActSocialProjectMember.setImage(comActSocialWorker.getImage()); comActSocialProjectMember.setName(comActSocialWorker.getName()); comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone()); comActSocialProjectMember.setCreateTime(new Date()); comActSocialProjectMember.setType(1); comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId()); comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId()); comActSocialProjectMemberDao.insert(comActSocialProjectMember); } } else { ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(id); if(comMngVolunteerMngDO!=null){ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember(); BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember); comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge()); comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath()); comActSocialProjectMember.setName(comMngVolunteerMngDO.getName()); comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone()); comActSocialProjectMember.setCreateTime(new Date()); comActSocialProjectMember.setType(2); comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId()); comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId()); comActSocialProjectMemberDao.insert(comActSocialProjectMember); } } }); } return R.ok(); } public Integer getAge(String idCard){ Integer year=Integer.parseInt(idCard.substring(5,9)); Integer nowYear= DateUtils.getYear(new Date()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java
@@ -28,4 +28,9 @@ public R pageList(CommonPage commonPage) { return R.ok(comActSocialProjectPublicityDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage)); } @Override public R selectOne(Long id) { return R.ok(comActSocialProjectPublicityDao.selectOne(id)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
@@ -127,18 +127,6 @@ for(ComActSocialWorkerExcelVO comActSocialWorkerExcelVO:lis) { ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker(); BeanUtils.copyProperties(comActSocialWorkerExcelVO,comActSocialWorkerDO); if (StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getStreetId())) { ComStreetDO comStreetDO=comStreetDAO.selectOne(new QueryWrapper<ComStreetDO>().eq("name",comActSocialWorkerExcelVO.getStreetId())); if(comStreetDO!=null){ comActSocialWorkerDO.setStreetId(comStreetDO.getStreetId()); } } if (StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getSocialOrgId())) { ComActSocialOrg comActSocialOrgDO=comActSocialOrgMapper.selectOne(new QueryWrapper<ComActSocialOrg>().eq("name",comActSocialWorkerExcelVO.getSocialOrgId())); if(comActSocialOrgDO!=null){ comActSocialWorkerDO.setSocialOrgId(comActSocialOrgDO.getId()); } } if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCommunityId())){ ComActDO comActDO= comActDAO.selectOne(new QueryWrapper<ComActDO>().eq("name",comActSocialWorkerExcelVO.getCommunityId())); if(comActDO!=null){ @@ -153,6 +141,22 @@ comActSocialWorkerDO.setGen(0); } } if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCredential())){ if("是".equals(comActSocialWorkerExcelVO.getCredential())){ comActSocialWorkerDO.setCredential(1); } else { comActSocialWorkerDO.setCredential(0); } } if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCredential())){ if("是".equals(comActSocialWorkerExcelVO.getCredential())){ comActSocialWorkerDO.setCredential(1); } else { comActSocialWorkerDO.setCredential(0); } } list.add(comActSocialWorkerDO); } this.saveBatch(list); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
@@ -102,4 +102,11 @@ where t.id=#{id} </select> <select id="selectInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo"> select (select count(*) from com_act_social_org where street_id = 15) count </select> <select id="selectType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo"> select count(*) count,t1.name from com_act_social_org t INNER JOIN com_act_column t1 on t.service_type = t1.id where t.street_id = 15 GROUP BY t1.id </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml
@@ -24,19 +24,19 @@ <where> 1=1 <if test="commonPage.communityId !=0 and commonPage.communityId !=null"> and t.community_id =#{commmonPage.communityId} and t.community_id =#{commonPage.communityId} </if> <if test="commonPage.streetId !=0 and commonPage.streetId !=null"> and t.street_id =#{commmonPage.streetId} and t.street_id =#{commonPage.streetId} </if> <if test="commonPage.status !=null"> and t.status =#{commmonPage.status} and t.status =#{commonPage.status} </if> <if test="commonPage.type !=null"> and t.type =#{commmonPage.type} and t.type =#{commonPage.type} </if> <if test="commonPage.keyword !=null and commonPage.keyword !=''"> and (t.name like concat('%',#{commmonPage.keyword},'%') or responsibility like concat('%',#{commmonPage.keyword},'%') ) and (t.name like concat('%',#{commonPage.keyword},'%') or responsibility like concat('%',#{commonPage.keyword},'%') ) </if> <if test="commonPage.beginTime !=null"> and t.create_time >= #{commonPage.beginTime} @@ -58,4 +58,35 @@ LEFT JOIN com_act_column t3 on t.second_column_id = t3.id where t.id =#{id} </select> <select id="selectBaseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo"> select (select count(*) from com_act_social_project where street_id =15 ) count, (select count(*) from com_act_social_project where street_id =15 and status >=2) assigned, (select count(*) from com_act_social_project where street_id =15 and 1 >=status) assign </select> <select id="selectType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo"> select count(id) as count,type as name from com_act_social_project where street_id = 15 GROUP BY type </select> <select id="selectActivity" resultType="integer"> select count(*) from com_act_activity <where> is_project = 1 <if test="type =1"> and volunteer_max > 0 </if> <if test="type =2"> and volunteer_max = 0 </if> </where> </select> <select id="selectIndexBaseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo"> select (select count(*) from com_act_social_project where street_id = 15) projectCount, (select count(*) from com_act_activity where is_project = 1) activityCount, (select count(*) from com_act_social_worker where street_id = 15) socialWorkerCount, (select count(*) from com_mng_population where street_id = 15) userCount, (select count(*) from com_act_social_org where street_id = 15) socialOrgCount </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml
@@ -18,7 +18,7 @@ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO"> select t.*,t1.name as communityName from com_act_social_project_member t left join com_act t1 on t.community_id = t1.community_id where t.project_id = #{commonPage.paramId} <if test="commonPage.type !=null"> and t1.type=#{commonPage.type} and t.type=#{commonPage.type} </if> order by t.create_time desc </select> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml
@@ -14,7 +14,11 @@ </resultMap> <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO"> select t.*,t1.name,t1.responsibility from com_act_social_project_publicity t left join com_act_social_project t1 on t.project_id = t1.id where project_id = #{commonPage.paramId} order by is_top desc,create_time desc select t.*,t1.name,t1.responsibility from com_act_social_project_publicity t left join com_act_social_project t1 on t.project_id = t1.id order by is_top desc,create_time desc </select> <select id="selectOne" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO"> select t.*,t1.name,t1.responsibility,t2.name as streetName from com_act_social_project_publicity t left join com_act_social_project t1 on t.project_id = t1.id left join com_street t2 on t1.street_id = t2.street_id where t.id = #{id} </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml
@@ -88,4 +88,21 @@ </if> </where> </select> <select id="selectCount" resultType="Integer"> select count(id) from com_act_social_worker where street_id = 15 <if test="type ==1"> and 30 >age </if> <if test="type ==2"> and 59 >=age and age >=30 </if> <if test="type ==3"> and age >=60 </if> </select> <select id="selectSkillType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo"> select count(*) count,t1.name from com_act_social_worker t INNER JOIN com_act_column t1 on t.skill_type = t1.id where t.street_id = 15 GROUP BY t1.id </select> </mapper>
