Merge remote-tracking branch 'origin/master'

lin

2024-03-21 0e81a8b3ba0376f39a086f655d83ecd14614ced3

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java

@@ -55,9 +55,9 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入policeAlarmRecords")
    public R<PoliceAlarmRecordsVO> detail(PoliceAlarmRecordsEntity policeAlarmRecords) {
    public R detail(PoliceAlarmRecordsEntity policeAlarmRecords) {
        PoliceAlarmRecordsEntity detail = policeAlarmRecordsService.getOne(Condition.getQueryWrapper(policeAlarmRecords));
        return R.data(PoliceAlarmRecordsWrapper.build().entityVO(detail));
        return R.data(detail);
    }
    /**
     * 报警记录 分页

 src/main/java/org/springblade/modules/property/controller/PropertyChargeController.java

@@ -113,8 +113,7 @@
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        List<Integer> toIntList = Func.toIntList(ids);
        return R.status(propertyChargeService.removeBatchByIds(toIntList));
        return R.status(propertyChargeService.removeByIds(Func.toLongList(ids)));
    }

}

 src/main/java/org/springblade/modules/property/mapper/PropertyChargeMapper.xml

@@ -4,7 +4,9 @@


    <select id="getPage" resultType="org.springblade.modules.property.vo.PropertyChargeVO">
        SELECT jpch.* FROM
        SELECT
        DISTINCT jpch.*
        FROM
        jczz_property_charge jpch
        LEFT JOIN jczz_property_company jpco ON jpco.dept_id = jpch.property_id and jpco.is_deleted = 0
        where jpch.is_deleted = 0
@@ -20,6 +22,6 @@
        <if test="vo.payPeriod != null and vo.payPeriod != ''">
            AND jpch.pay_period = #{vo.payPeriod}
        </if>

        order by jpch.id desc,jpch.create_time desc
    </select>
</mapper>

 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -280,8 +280,7 @@
        // 查询物业公司是否存在
        QueryWrapper<PropertyCompanyEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("is_deleted", 0)
            .eq("dept_id", dept.getId())
            .eq("name", dept.getDeptName());
            .eq("dept_id", dept.getId());
        PropertyCompanyEntity propertyCompanyEntity = propertyCompanyService.getOne(wrapper);
        if (null != propertyCompanyEntity) {
            // 修改

 src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java

@@ -1,19 +1,3 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.task.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -58,9 +42,9 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入taskReportForRepairs")
    public R<TaskReportForRepairsVO> detail(TaskReportForRepairsEntity taskReportForRepairs) {
    public R detail(TaskReportForRepairsEntity taskReportForRepairs) {
        TaskReportForRepairsEntity detail = taskReportForRepairsService.getOne(Condition.getQueryWrapper(taskReportForRepairs));
        return R.data(TaskReportForRepairsWrapper.build().entityVO(detail));
        return R.data(detail);
    }
    /**
     * 报事报修任务表 分页

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -92,7 +92,9 @@
            // 通过用户机构查询用户的物业公司
            IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
            PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
                .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
                .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId())
                .eq(PropertyCompanyEntity::getIsDeleted, 0)
                .last("limit 1"));
            if (companyEntity != null) {
                IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
                // 通过物业公司，查询小区