Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-14 91e43540ca2cf9bf3d28868dd5fc23fd215fffed

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java

@@ -41,6 +41,10 @@
    IOrganizationChartService iOrganizationChartService;


    @Autowired
    IAreaCodeService iAreaCodeService;


    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
    public ResultData getWorkOrder()
@@ -317,6 +321,43 @@



    @ApiOperation("导办工单按区域统计")
    @GetMapping("/getRangeStatistics")
    public TableDataInfo getRangeStatistics()
    {
        List<AreaCode2022> code2022s=iAreaCodeService.getListByPCode("510400000000");

        List<RangeStatistics> rangeStatistics=new ArrayList<>();

        for (AreaCode2022 bean:code2022s)
        {
            RangeStatistics range=new RangeStatistics();
            range.setName(bean.getName());

            List<String> ids;

            if(bean.getCode()==510401000000L)
            {
                ids=homeStatisticsService.countId("");
            }
            else
            {
                ids=homeStatisticsService.countId(bean.getCode()+"");
            }
            int num=0;
            if(ids!=null&&ids.size()>0)
            {
                num=iGuideRepairOrderService.countStatisticsNum(null,ids,null,null,null,null);
            }
            range.setNum(num+"");
            rangeStatistics.add(range);
        }


        return getDataTable(rangeStatistics);
    }






 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java

@@ -85,6 +85,20 @@
        {
            return ResultData.error("模板名称不能为空");
        }

        if(StringUtils.isEmpty(sysUser.getDepartmentId()))
        {
            return ResultData.error("部门id不能为空  请分配部门id");
        }

        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        int num=iReplyTemplateService.countNum(entity.getName(),ids);

        if(num>0)
        {
            return ResultData.error("部门里办事名称重复！");
        }

        entity.setId(null);
        entity.setDepartmentId(sysUser.getDepartmentId());
        entity.setCreateUserId(sysUser.getUserId()+"");
@@ -149,6 +163,7 @@
        {
            return ResultData.error("模板不存在！");
        }
        entity.setName(entity.getName()+"(副本)");
        entity.setId(null);
        return toAjax(iReplyTemplateService.insertConfig(entity));
    }

 flower_city/src/main/java/com/dg/core/db/gen/entity/RangeStatistics.java

New file
@@ -0,0 +1,19 @@
package com.dg.core.db.gen.entity;


import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@ApiModel("导办工单根据地区统计")
@Data
public class RangeStatistics implements Serializable
{
    @ApiModelProperty("区域名")
    private String name;

    @ApiModelProperty("数量")
    private String num;
}

 flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java

@@ -86,4 +86,8 @@
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);


    List<String> countId(String district);


}

 flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java

@@ -84,4 +84,7 @@
    public List<ClassifyAdministration> getClassify(@Param("parentId") String parentId,
                                                    @Param("classifyGrade") String classifyGrade);


    List<String> countId(String district);

}

 flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java

@@ -75,5 +75,10 @@
        return baseMapper.getClassify(parentId,classifyGrade);
    }

    @Override
    public List<String> countId(String district) {
        return baseMapper.countId(district);
    }


}

 flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml

@@ -126,4 +126,15 @@
    </select>


    <!--  首页统计区域下的部门  -->
    <select id="countId" parameterType="string" resultType="string">
        select id from automessage_organization_chart
        <where>
            <if test="district != null ">
                AND district=#{district}
            </if>
        </where>
    </select>


</mapper>