linwe
2023-11-17 f6672d6695f0018c1c8bb7ea488c1983dba2309a
统计代码
11 files modified
124 ■■■■ changed files
src/main/java/org/springblade/modules/house/controller/HouseholdController.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml 30 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/service/IHouseholdService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java 30 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml 16 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -28,6 +28,7 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
@@ -153,6 +154,16 @@
    }
    /**
     * 住户审核统计
     */
    @PostMapping("/statistics")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "住户审核统计", notes = "网格员调用")
    public R remove( ) {
        return R.data(householdService.statistics(AuthUtil.getUserId()));
    }
    /**
     * 导入用户
     */
    @PostMapping("import-houseHold")
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -227,4 +227,10 @@
    @ApiModelProperty("是否已删除 0:否  1:是")
    private Integer isDeleted;
    /**
     * 是否审核
     */
    @ApiModelProperty("是否审核 0:否:1 是")
    private Integer confirmFlag;
}
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -66,4 +66,6 @@
    HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);
    List<HouseHoldExcel> export(HouseholdVO household);
    Integer statistics(Long userId);
}
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -11,7 +11,7 @@
        <result column="associated_user_id" property="associatedUserId"/>
        <result column="associated_user_name" property="associatedUserName"/>
        <result column="relationship" property="relationship"/>
        <result column="primary_contact" property="primaryContact"/>
<!--        <result column="primary_contact" property="primaryContact"/>-->
        <result column="residential_status" property="residentialStatus"/>
        <result column="gender" property="gender"/>
        <result column="birthday" property="birthday"/>
@@ -28,7 +28,7 @@
        <result column="other_contact" property="otherContact"/>
        <result column="current_address" property="currentAddress"/>
        <result column="disability_cert" property="disabilityCert"/>
        <result column="data_status" property="dataStatus"/>
<!--        <result column="data_status" property="dataStatus"/>-->
        <result column="role_type" property="roleType"/>
        <result column="party_ember" property="partyEmber"/>
        <result column="create_user" property="createUser"/>
@@ -37,6 +37,7 @@
        <result column="update_time" property="updateTime"/>
        <result column="remark" property="remark"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="confirm_flag" property="confirmFlag"/>
    </resultMap>
    <sql id="selectHousehold">
@@ -72,9 +73,9 @@
            update_user,
            update_time,
            remark,
            is_deleted
        from
            jczz_household
            is_deleted,
            confirm_flag
        from jczz_household
    </sql>
    <resultMap id="householdAndLabelMap" type="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
@@ -106,6 +107,9 @@
        </if>
        <if test="household.aoiName!=null and household.aoiName !=''">
            and jhs.district_name like concat('%',#{household.aoiName},'%')
        </if>
        <if test="household.confirmFlag != null ">
            and jh.confirm_flag = #{household.confirmFlag}
        </if>
    </select>
@@ -185,4 +189,20 @@
    </select>
    <select id="statistics" resultType="java.lang.Integer">
        SELECT
            count(1)
        FROM
            jczz_grid_range jgr
                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
                LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
        WHERE
            jg.is_deleted = 0
          and jh.confirm_flag = 0
          AND jg.user_id = #{userId}
    </select>
</mapper>
src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -73,4 +73,6 @@
    List<HouseHoldExcel> export(HouseholdVO household);
    void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
    Integer statistics(Long userId);
}
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -148,4 +148,14 @@
            this.save(houseHoldEntity);
        });
    }
    /**
     * 住户审核统计
     * @param userId
     * @return
     */
    @Override
    public Integer statistics(Long userId) {
        return baseMapper.statistics(userId);
    }
}
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -16,25 +16,25 @@
 */
package org.springblade.modules.task.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.wrapper.TaskReportForRepairsWrapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
 * 报事报修任务表 控制器
@@ -143,12 +143,24 @@
    /**
     * 查询报事报修统计
     *
     * @return
     */
    @GetMapping("/getStatisticsCount")
    public R statisticsCount(){
    public R statisticsCount() {
        return R.data(taskReportForRepairsService.getStatisticsCount());
    }
    /**
     * w网格员查询报事报修统计
     *
     * @return
     */
    @GetMapping("/getStatistics")
    @ApiOperation(value = "w网格员查询报事报修统计" )
    public R getStatistics() {
        return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId()));
    }
}
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -52,4 +52,6 @@
     * @return
     */
    TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);
    Integer getStatistics(Long userId);
}
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -71,4 +71,20 @@
    </select>
    <select id="getStatistics" resultType="java.lang.Integer">
        SELECT
            count(1)
        FROM
            jczz_grid_range jgr
                LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
                LEFT JOIN jczz_task_report_for_repairs jtr on jtr.address_code=jgr.house_code
        WHERE
            jg.is_deleted = 0
          and jh.confirm_flag = 1
          AND jg.user_id = #{userId}
    </select>
</mapper>
src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
@@ -65,4 +65,6 @@
     * @return
     */
    boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);
    Integer getStatistics(Long userId);
}
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -16,19 +16,19 @@
 */
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -143,4 +143,9 @@
        // 返回
        return flag;
    }
    @Override
    public Integer getStatistics(Long userId) {
        return baseMapper.getStatistics(userId);
    }
}