springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java
@@ -44,7 +44,7 @@ public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){ Long communityId = this.getCommunityId(); if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) { comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getUserId())); comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getIdCard())); } comSwPatrolRecordPageDTO.setCommunityId(communityId); return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java
@@ -29,6 +29,8 @@ Map<String,String> getPbServiceTeamById(@Param("teamId") String teamId); Map<String,Object> getPbServiceTeamCardNo(@Param("userId") String userId); String getCreateName(@Param("userId") Long userId); Map<String,String> getPatrolPersonName(@Param("dangerId") Long dangerId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralRuleServiceImpl.java
@@ -66,7 +66,9 @@ integralRuleSSPDO.setName("发布随手拍"); integralRuleSSPDO.setAmount(5); integralRuleSSPDO.setIntegralDescribe("发布随手拍并被公示后"); integralRuleSSPDO.setIsRestrict(2); integralRuleSSPDO.setIsRestrict(1); integralRuleSSPDO.setType(ComActIntegralRuleDO.type.day); integralRuleSSPDO.setCount(0); integralRuleSSPDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp); integralRuleList.add(integralRuleSSPDO); @@ -78,7 +80,7 @@ integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后"); integralRuleWXYDO.setIsRestrict(1); integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month); integralRuleWXYDO.setCount(5); integralRuleWXYDO.setCount(0); integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbwxy); integralRuleList.add(integralRuleWXYDO); @@ -90,7 +92,7 @@ integralRuleYSTPDO.setIntegralDescribe("参与议事投票"); integralRuleYSTPDO.setIsRestrict(1); integralRuleYSTPDO.setType(ComActIntegralRuleDO.type.day); integralRuleYSTPDO.setCount(3); integralRuleYSTPDO.setCount(0); integralRuleYSTPDO.setIntegralType(ComActIntegralRuleDO.integralType.cyystp); integralRuleList.add(integralRuleYSTPDO); @@ -102,7 +104,7 @@ integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动，仅限志愿者"); integralRuleZYZDO.setIsRestrict(1); integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month); integralRuleZYZDO.setCount(5); integralRuleZYZDO.setCount(0); integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd); integralRuleList.add(integralRuleZYZDO); @@ -114,7 +116,7 @@ integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动，所有人可参与"); integralRuleSQHDDO.setIsRestrict(1); integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month); integralRuleSQHDDO.setCount(5); integralRuleSQHDDO.setCount(0); integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd); integralRuleList.add(integralRuleSQHDDO); @@ -126,7 +128,7 @@ integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动，党员可参与"); integralRuleDYHDDO.setIsRestrict(1); integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day); integralRuleDYHDDO.setCount(3); integralRuleDYHDDO.setCount(0); integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd); integralRuleList.add(integralRuleDYHDDO); @@ -138,7 +140,7 @@ integralRuleWJDCDO.setIntegralDescribe("参与问卷调查"); integralRuleWJDCDO.setIsRestrict(1); integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day); integralRuleWJDCDO.setCount(3); integralRuleWJDCDO.setCount(0); integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cydcwj); integralRuleList.add(integralRuleWJDCDO); return integralRuleList; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserServiceImpl.java
@@ -175,7 +175,9 @@ integralRuleSSPDO.setName("发布随手拍"); integralRuleSSPDO.setAmount(0); integralRuleSSPDO.setIntegralDescribe("发布随手拍并被公示后"); integralRuleSSPDO.setIsRestrict(2); integralRuleSSPDO.setIsRestrict(1); integralRuleSSPDO.setType(ComActIntegralRuleDO.type.month); integralRuleSSPDO.setCount(0); integralRuleSSPDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp); integralRuleList.add(integralRuleSSPDO); @@ -187,7 +189,7 @@ integralRuleWXYDO.setIntegralDescribe("发布微心愿并完成后"); integralRuleWXYDO.setIsRestrict(1); integralRuleWXYDO.setType(ComActIntegralRuleDO.type.month); integralRuleWXYDO.setCount(5); integralRuleWXYDO.setCount(0); integralRuleWXYDO.setIntegralType(ComActIntegralRuleDO.integralType.fbssp); integralRuleList.add(integralRuleWXYDO); @@ -199,7 +201,7 @@ integralRuleYSTPDO.setIntegralDescribe("参与议事投票"); integralRuleYSTPDO.setIsRestrict(1); integralRuleYSTPDO.setType(ComActIntegralRuleDO.type.day); integralRuleYSTPDO.setCount(3); integralRuleYSTPDO.setCount(0); integralRuleYSTPDO.setIntegralType(ComActIntegralRuleDO.integralType.cyystp); integralRuleList.add(integralRuleYSTPDO); @@ -211,7 +213,7 @@ integralRuleZYZDO.setIntegralDescribe("报名参加志愿者活动，仅限志愿者"); integralRuleZYZDO.setIsRestrict(1); integralRuleZYZDO.setType(ComActIntegralRuleDO.type.month); integralRuleZYZDO.setCount(5); integralRuleZYZDO.setCount(0); integralRuleZYZDO.setIntegralType(ComActIntegralRuleDO.integralType.cyzyzhd); integralRuleList.add(integralRuleZYZDO); @@ -223,7 +225,7 @@ integralRuleSQHDDO.setIntegralDescribe("报名参加社区活动，所有人可参与"); integralRuleSQHDDO.setIsRestrict(1); integralRuleSQHDDO.setType(ComActIntegralRuleDO.type.month); integralRuleSQHDDO.setCount(5); integralRuleSQHDDO.setCount(0); integralRuleSQHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cysqhd); integralRuleList.add(integralRuleSQHDDO); @@ -235,7 +237,7 @@ integralRuleDYHDDO.setIntegralDescribe("报名参加社区党员活动，党员可参与"); integralRuleDYHDDO.setIsRestrict(1); integralRuleDYHDDO.setType(ComActIntegralRuleDO.type.day); integralRuleDYHDDO.setCount(3); integralRuleDYHDDO.setCount(0); integralRuleDYHDDO.setIntegralType(ComActIntegralRuleDO.integralType.cydyhd); integralRuleList.add(integralRuleDYHDDO); @@ -247,7 +249,7 @@ integralRuleWJDCDO.setIntegralDescribe("参与问卷调查"); integralRuleWJDCDO.setIsRestrict(1); integralRuleWJDCDO.setType(ComActIntegralRuleDO.type.day); integralRuleWJDCDO.setCount(3); integralRuleWJDCDO.setCount(0); integralRuleWJDCDO.setIntegralType(ComActIntegralRuleDO.integralType.cydcwj); integralRuleList.add(integralRuleWJDCDO); return integralRuleList; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -51,6 +51,12 @@ @Override public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) { //是否是查询自己的巡查记录 Map<String,Object> map = comSwPatrolRecordDAO.getPbServiceTeamCardNo(comSwPatrolRecordPageDTO.getPatrolPerson()); if(map != null){ comSwPatrolRecordPageDTO.setPatrolPerson(map.get("id").toString()); } IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(new Page(comSwPatrolRecordPageDTO.getPageNum(),comSwPatrolRecordPageDTO.getPageSize()), comSwPatrolRecordPageDTO); if(!iPage.getRecords().isEmpty()){ iPage.getRecords().forEach(patrol -> { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserTradeDOMapper.xml
@@ -92,6 +92,7 @@ and su.is_volunteer = 1 </if> </where> order by caiut.create_at desc </select> <select id="getUserInfo" resultType="com.panzhihua.common.model.vos.community.integral.admin.IntegralUserVO"> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml
@@ -76,6 +76,12 @@ select `name`,phone from com_pb_service_team where id = #{teamId} </select> <select id="getPbServiceTeamCardNo" resultType="Map"> select cpst.id,cpst.`name`,cpst.phone from com_pb_service_team as cpst left join sys_user as su on su.id_card = cpst.card_no and su.type = 1 where su.user_id = #{userId} </select> <select id="getCreateName" resultType="String"> select `name` from sys_user where user_id = #{userId} </select> springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
@@ -65,4 +65,8 @@ * 是否注册 */ private Integer isReg; /** * 身份证号码 */ private String cardNo; }
