督办单增加组织id

jinpengyong

2022-02-17 273defb3cc6cbbd74494a853a23cb8fe14c22b8b

督办单增加组织id

 screen-api/src/main/java/com/moral/api/entity/Supervision.java

@@ -33,6 +33,11 @@
    private Integer id;

    /**
     * 组织id
     */
    private Integer organizationId;

    /**
     * 地区编码
     */
    private Integer cityCode;

 screen-api/src/main/java/com/moral/api/service/SupervisionService.java

@@ -26,6 +26,7 @@
    //修改督办单
    Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision);

    //删除督办单
    void deleteSupervision(Integer supervisionId);

}

 screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java

@@ -2,11 +2,9 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.Supervision;
import com.moral.api.mapper.SupervisionMapper;
import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SupervisionService;

@@ -50,9 +48,6 @@

    @Autowired
    private OrganizationService organizationService;

    @Autowired
    private MonitorPointService monitorPointService;

    @Override
    @Transactional
@@ -104,30 +99,17 @@
        int size = Integer.parseInt(params.get("size").toString());
        Object start = params.get("start");
        Object end = params.get("end");
        Integer orgId = Integer.parseInt(params.get("organizationId").toString());

        //获取组织下所有子组织
        List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
        List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
        orgIds.add(orgId);

        QueryWrapper<Supervision> supervisionQueryWrapper = new QueryWrapper<>();
        supervisionQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
        if (params.get("organizationId") != null) {
            Integer orgId = Integer.parseInt(params.get("organizationId").toString());
            //获取组织下所有子组织
            List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
            List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
            orgIds.add(orgId);
            QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
            queryWrapper.select("city_code")
                    .eq("is_delete", Constants.NOT_DELETE)
                    .in("organization_id", orgIds);

            //根据组织id查询所有站点市级code
            List<Object> cityCodes = monitorPointService.listObjs(queryWrapper);

            cityCodes = cityCodes.stream()
                    .distinct()
                    .collect(Collectors.toList());

            supervisionQueryWrapper.in("CONCAT(LEFT(city_code,4),'00')", cityCodes);
        } else {
        supervisionQueryWrapper.eq("is_delete", Constants.NOT_DELETE).in("organization_id", orgIds);
        //如果指定了地区，就获取该组织及其子组织下该地区的。否则获取该组织及其子组织下所有的
        if (params.get("cityCode") != null) {
            String cityCode = params.get("cityCode").toString();
            //如果是市级，就查询该市下所有县市区的，否则只查询该县市区的
            if (cityCode.endsWith("00")) {
@@ -136,7 +118,6 @@
                supervisionQueryWrapper.eq("city_code", cityCode);
            }
        }


        if (start != null) {
            supervisionQueryWrapper.ge("time", start);

 screen-api/src/main/resources/mapper/SupervisionMapper.xml

@@ -5,6 +5,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.moral.api.entity.Supervision">
        <id column="id" property="id"/>
        <result column="organization_id" property="organizationId"/>
        <result column="city_code" property="cityCode"/>
        <result column="city_name" property="cityName"/>
        <result column="time" property="time"/>