Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthFeedbackServiceImpl.java

@@ -1,22 +1,24 @@
package com.panzhihua.service_community.service.impl;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackDeleteDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackEditDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthFeedbackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.dao.EldersAuthFeedbackDAO;
import com.panzhihua.service_community.model.dos.EldersAuthFeedbackDO;
import com.panzhihua.service_community.service.EldersAuthFeedbackService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -25,19 +27,22 @@
 */
@Slf4j
@Service
public class EldersAuthFeedbackServiceImpl extends ServiceImpl<EldersAuthFeedbackDAO, EldersAuthFeedbackDO> implements EldersAuthFeedbackService {
public class EldersAuthFeedbackServiceImpl extends ServiceImpl<EldersAuthFeedbackDAO, EldersAuthFeedbackDO>
    implements EldersAuthFeedbackService {

    @Resource
    private EldersAuthFeedbackDAO eldersAuthFeedbackDAO;

    /**
     * 新增高龄认证社区反馈
     * 
     * @param eldersAuthFeedbackAddDTO
     * @return 新增结果
     */
    public R add(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
    public R add(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO) {
        EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
        BeanUtils.copyProperties(eldersAuthFeedbackAddDTO, eldersAuthFeedbackDO);
        if(eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO)>0){
        if (eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -45,13 +50,14 @@

    /**
     * 修改高龄认证社区反馈
     * 
     * @param eldersAuthFeedbackEditDTO
     * @return 维护结果
     */
    public R edit(EldersAuthFeedbackEditDTO eldersAuthFeedbackEditDTO){
    public R edit(EldersAuthFeedbackEditDTO eldersAuthFeedbackEditDTO) {
        EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
        BeanUtils.copyProperties(eldersAuthFeedbackEditDTO, eldersAuthFeedbackDO);
        if(eldersAuthFeedbackDAO.updateById(eldersAuthFeedbackDO)>0){
        if (eldersAuthFeedbackDAO.updateById(eldersAuthFeedbackDO) > 0) {
            return R.ok();
        }
        return R.fail();
@@ -59,30 +65,34 @@

    /**
     * 分页查找高龄认证社区反馈
     * 
     * @param pageEldersAuthFeedbackDTO
     * @return 维护结果
     */
    public R<IPage<EldersAuthFeedbackVO>> query(PageEldersAuthFeedbackDTO pageEldersAuthFeedbackDTO){
    public R<IPage<EldersAuthFeedbackVO>> query(PageEldersAuthFeedbackDTO pageEldersAuthFeedbackDTO) {
        return R.fail();
    }

    /**
     * 删除高龄认证社区反馈
     * 
     * @param EldersAuthFeedbackDeleteDTO
     * @return 平台用户信息
     */
    public R delete(EldersAuthFeedbackDeleteDTO EldersAuthFeedbackDeleteDTO){
    public R delete(EldersAuthFeedbackDeleteDTO EldersAuthFeedbackDeleteDTO) {
        return R.fail();
    }

    /**
     * 查询高龄认证社区反馈详细信息
     * @param id 高龄认证社区反馈 id
     * 
     * @param id
     *            高龄认证社区反馈 id
     * @return 查找结果
     */
    public R<EldersAuthFeedbackDetailsVO> eldersAuthFeedbackDetails(Long id){
    public R<EldersAuthFeedbackDetailsVO> eldersAuthFeedbackDetails(Long id) {
        EldersAuthFeedbackDO eldersAuthFeedbackDO = eldersAuthFeedbackDAO.selectById(id);
        if(eldersAuthFeedbackDO!=null) {
        if (eldersAuthFeedbackDO != null) {
            EldersAuthFeedbackDetailsVO eldersAuthFeedbackDetailsVO = new EldersAuthFeedbackDetailsVO();
            BeanUtils.copyProperties(eldersAuthFeedbackDO, eldersAuthFeedbackDetailsVO);
            return R.ok(eldersAuthFeedbackDetailsVO);