修改删除导办人员账户转为小程序用户     新增小程序用户   隐藏系统特殊角色显示   修改首页统计数据报错  bug
10个文件已修改
46 ■■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/RoleManagementMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -34,7 +34,7 @@
     * 获取附件列表
     * @param pageNum
     * @param pageSize
     * @param Name
     * @param name
     * @return
     */
    @ApiOperation("获取附件列表接口")
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -179,8 +179,8 @@
            return error("该人员有工单未处理完不能删除");
        }
        SysUser user=IUserService.selectData(userId,null,null);
        user.setUserType("3");
        user.setRoleIds("3");
        user.setUserType("4");
        user.setRoleIds("4");
        return toAjax(IUserService.updateConfig(user));
    }
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -162,10 +162,17 @@
        {
            //        回复率=最新进展里大于0条回复的导办工单数量/总工单数量
            //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复   10转派    11手动分配)
            String reversionRate=weekDf.format((float)(homeStatisticsService.reversionRate("9",null)/(float)allNum));
            String num=(homeStatisticsService.reversionRate("9",null));
            if(!StringUtils.isEmpty(num))
            {
                String reversionRate=weekDf.format(Float.valueOf(num)/(float)allNum);
            entity.setReversionRate(reversionRate);
        }
        }
        return ResultData.success(entity);
    }
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageCommonProblem.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -49,12 +50,14 @@
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;
    /**
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;
    /**
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
@@ -97,7 +97,7 @@
     * 首页统计用
     * @return
     */
    int reversionRate(@Param("state") String state,@Param("isTimeout") String isTimeout);
    String reversionRate(@Param("state") String state,@Param("isTimeout") String isTimeout);
}
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -83,7 +83,8 @@
                        //本地没有此用户  新用户
                        SysUser newSysUser=new SysUser();
                        //默认  1系统后台用户
                        newSysUser.setUserType("3");
                        newSysUser.setUserType("4");
                        newSysUser.setRoleIds("4");
                        newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                        newSysUser.setUserId(huaChengSysUser.getUserId());
                        newSysUser.setUserName(huaChengSysUser.getNickName());
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
@@ -91,7 +91,7 @@
     * 首页统计用
     * @return
     */
    int reversionRate(String state,String isTimeout);
    String reversionRate(String state,String isTimeout);
    int rangeStatistics(List<String> ids);
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
@@ -81,7 +81,7 @@
    }
    @Override
    public int reversionRate(String state, String isTimeout) {
    public String reversionRate(String state, String isTimeout) {
        return baseMapper.reversionRate(state,isTimeout);
    }
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
@@ -38,7 +38,7 @@
    <!--  导办人员统计数  -->
    <select id="staffNum" resultType="integer">
    <select id="staffNum" resultType="int">
        SELECT count(id)
        FROM automessage_sys_user WHERE user_type=2
    </select>
@@ -54,7 +54,7 @@
    <!--  组织排行榜 按评价  -->
    <select id="organizationScore" resultType="integer">
    <select id="organizationScore" resultType="int">
        SELECT  sum(IF(evaluate_state='1',10,IF(evaluate_state='2',5,0)))
        FROM automessage_guide_repair_order
        WHERE department_id in
@@ -66,7 +66,7 @@
    <!--  组织排行榜 按办结量  -->
    <select id="organizationNum" resultType="integer">
    <select id="organizationNum" resultType="int">
        SELECT  count(id) FROM automessage_guide_repair_order WHERE department_id in
        <foreach collection="ids" item="param"  open="(" close=")" separator=",">
            #{param}
@@ -91,14 +91,14 @@
    <!-- 办事指南 统计数量 -->
    <select id="countWork"  resultType="integer">
    <select id="countWork"  resultType="int">
        SELECT count(id) from automessage_transaction_event
    </select>
    <!--  首页统计  勿动  -->
    <select id="countStatisticsNum" resultType="integer">
    <select id="countStatisticsNum" resultType="int">
        select count(id) from automessage_transaction_event
        <where>
            <if test="classifyIds != null">
@@ -138,8 +138,8 @@
    <!--  首页统计使用 勿动  -->
    <select id="reversionRate" resultType="integer">
        select SUM(m.num) from (
    <select id="reversionRate" resultType="string">
        select nullif(SUM(m.num),0) from (
            select count(id) as num  from automessage_guide_evolve
            <where>
                <if test="state != null and state != ''">
@@ -156,7 +156,7 @@
    <!--  首页统计 区域统计 勿动  -->
    <select id="rangeStatistics" parameterType="string" resultType="integer">
    <select id="rangeStatistics" parameterType="string" resultType="int">
        select count(id) from automessage_guide_repair_order
        <where>
            <if test="ids != null">
flower_city/src/main/resources/mapper/RoleManagementMapper.xml
@@ -30,11 +30,12 @@
    <select id="selectConfigList"  resultMap="RoleManagementEntityResult">
        <include refid="selectRoleManagementEntityVo"/>
        <where>
            AND id not in(1,2,3,4)
            <if test="name!=null and name!=''">
                and role_name like concat('%', #{name}, '%')
            </if>
        <!--            <if test="streetName != null and streetName != ''">-->
        <!--                AND street_name like concat('%', #{streetName}, '%')-->
--             AND id not in(1,2,3,4)
        <!--            </if>-->
        <!--            <if test="loginName != null and loginName != ''">-->
        <!--                AND login_name like concat('%', #{loginName}, '%')-->