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

huanghongfa

2021-08-02 53a4b97affa7d14e838e675987267bbb0283b183

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

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java

@@ -88,6 +88,7 @@
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordAddDTO.setCommunityId(communityId);
        comSwPatrolRecordAddDTO.setCreateBy(this.getLoginUserInfo().getUserId());
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }


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

@@ -82,10 +82,10 @@
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
                AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
                AND cspr.patrol_type LIKE concat('%',#{comSwPatrolRecordDTO.patrolType},'%')
            </if>
            <if test='comSwPatrolRecordDTO.status != null and comSwPatrolRecordDTO.status != ""'>
                AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
                AND csdr.status = #{comSwPatrolRecordDTO.status}
            </if>
            <if test='comSwPatrolRecordDTO.patrolAtBegin != null and comSwPatrolRecordDTO.patrolAtBegin != ""'>
                AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolAtBegin}