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

101captain

2022-04-29 eb2e74ec6b39b1144cad9097c1533699be2de929

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

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidCheckRecordApi.java

@@ -10,7 +10,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.service_community.entity.ComActAcidCheckRecord;
import com.panzhihua.service_community.entity.ComActAcidDangerMember;
import com.panzhihua.service_community.service.ComActAcidCheckRecordService;
import com.panzhihua.service_community.service.ComActAcidDangerMemberService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

@@ -35,6 +37,8 @@
     */
    @Resource
    private ComActAcidCheckRecordService comActAcidCheckRecordService;
    @Resource
    private ComActAcidDangerMemberService comActAcidDangerMemberService;

    /**
     * 列表查询
@@ -69,6 +73,11 @@
        ComActAcidCheckRecord comActAcidCheckRecord=new ComActAcidCheckRecord();
        BeanUtils.copyProperties(comActAcidCheckRecordVO,comActAcidCheckRecord);
        comActAcidCheckRecord.setCreateTime(new Date());
        ComActAcidDangerMember dangerMember = new ComActAcidDangerMember();
        dangerMember.setId(comActAcidCheckRecordVO.getMemberId());
        dangerMember.setStatus(comActAcidCheckRecordVO.getStatus());
        dangerMember.setUpdateTime(new Date());
        comActAcidDangerMemberService.updateById(dangerMember);
        return R.ok(this.comActAcidCheckRecordService.save(comActAcidCheckRecord));
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidDangerMemberMapper.xml

@@ -36,10 +36,10 @@
        </where>
        GROUP BY t1.id
        HAVING 1=1
        <if test="commonPage.startTime!=null and commonPage.startTime !=''">
        <if test="commonPage.startTime!=null">
            and checkTime >= #{commonPage.startTime}
        </if>
        <if test="commonPage.stopTime!=null and commonPage.stopTime !=''">
        <if test="commonPage.stopTime!=null">
            and  #{commonPage.stopTime} >= checkTime
        </if>
        order by checkTime desc