巡查记录按行政区筛选

guoshilong

2024-02-01 23651fb3c76d60a596992013bb0061e5bf5c9ecc

巡查记录按行政区筛选

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -71,10 +71,14 @@
        LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = res."interior_ad_guid"
        LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
        LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
        left join SJZT_MD."att_ad_base" province on city."p_ad_code" = province."ad_code"

        LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
        LEFT JOIN BLADE_USER u ON u.id = record.create_user
        WHERE record.is_deleted = 0
          <if test="patrolRecord.adCode != null and patrolRecord.adCode !=''">
              AND (province."ad_code" = #{patrolRecord.adCode} or city."ad_code" = #{patrolRecord.adCode} or county."ad_code" = #{patrolRecord.adCode}  or town."ad_code" = #{patrolRecord.adCode})
          </if>
        <if test="patrolRecord.status !=null and patrolRecord.status != '' ">
            AND record.status = #{patrolRecord.status}
        </if>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java

@@ -16,8 +16,10 @@
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +34,11 @@

    @Override
    public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecordVO patrolRecord) {

        if (StringUtil.isBlank(patrolRecord.getAdCode())){
            patrolRecord.setAdCode(AuthUtil.getDeptId());
        }

        return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java

@@ -77,4 +77,6 @@

    private String startTime;
    private String endTime;

    private String adCode;
}