bug修改

101captain

2022-06-06 bdd72a5d69e9bc96df5d02182b39edefcc6b7984

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java

@@ -126,8 +126,8 @@
    }
    @ApiOperation(value = "新版查看详情",response = ComActAcidRecordVO.class)
    @GetMapping("/detailByApp")
    public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){
        return this.communityService.detailByApp(id,localCity);
    public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity,@RequestParam("type")Integer type){
        return this.communityService.detailByApp(id,localCity,type);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -312,7 +312,7 @@

    @ApiOperation(value = "查询当前用户党员信息")
    @GetMapping("/getPartyMember")
    public R getPartyMember(){
        return partyBuildingService.getPartyMember(this.getUserId());
    public R getPartyMember(@RequestParam("type")Integer type){
        return partyBuildingService.getPartyMember(this.getUserId(),type);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -613,5 +613,5 @@


    @GetMapping("/partybuildIng/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId);
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -784,7 +784,7 @@
    }

    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("userId")Long userId){
        return comPbMemberService.getPartyMember(userId);
    public R getPartyMember(@RequestParam("userId")Long userId,@RequestParam("type")Integer type){
        return comPbMemberService.getPartyMember(userId,type);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -195,5 +195,5 @@
     */
    List<PartyBuildingMemberVO> getDetailByApp(Long id);

    PartyBuildingMemberVO selectDetail(Long userId);
    PartyBuildingMemberVO selectDetail(@Param("userId") Long userId,@Param("type")Integer type);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -251,5 +251,5 @@

    R getPagePbMember(PartyBuildingMemberVO partyBuildingMemberVO);

    R getPartyMember(Long userId);
    R getPartyMember(Long userId,Integer type);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -1097,8 +1097,8 @@
    }

    @Override
    public R getPartyMember(Long userId) {
    public R getPartyMember(Long userId,Integer type) {

        return R.ok(comPbMemberDAO.selectDetail(userId));
        return R.ok(comPbMemberDAO.selectDetail(userId,type));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -715,7 +715,7 @@
    </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,t1.address 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 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,t1.address 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} and t.type=#{type}
    </select>
</mapper>