lidongdong
2022-10-11 1be51508ae4c30f326a842e17ef7425ac0134094
新增首页获取效率接口   修改小程序登录用户状态问题
16个文件已修改
1个文件已添加
308 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java 106 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/EfficiencyEntity.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/application.properties 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -363,17 +363,20 @@
    {
        WorkOrder workOrder=new WorkOrder();
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消6 已超时   7超时未办结  8未解决  9已解决)
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null));
        workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum("6",ids,null));
        workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("7",ids,null));
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("8",ids,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("9",ids,null));
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消  8未解决  9已解决)
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",ids,null,null,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",ids,null,null,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,null,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",ids,null,null,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",ids,null,null,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",ids,null,null,null));
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("6",ids,null,null,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("7",ids,null,null,null));
        //是否超时 (1 未超时   2已超时) 超时未办结
        workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,ids,null,"2",null));
        workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",ids,null,"2",null));
        return ResultData.success(workOrder);
    }
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -1,10 +1,8 @@
package com.dg.core.controller;
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.CountList;
import com.dg.core.db.gen.entity.CountListNum;
import com.dg.core.db.gen.entity.TimeWorkOrder;
import com.dg.core.db.gen.entity.WorkOrder;
import com.dg.core.db.gen.entity.*;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,27 +21,33 @@
@RequestMapping("/Home")
public class HomeStatisticsController
{
    //导办工单接口
    @Autowired
    IGuideRepairOrderService iGuideRepairOrderService;
    //导办进展
    @Autowired
    IGuideEvolveService iGuideEvolveService;
    @ApiOperation("首页统计不同状态工单数")
    @GetMapping("/getWorkOrder")
    public ResultData getWorkOrder()
    {
        WorkOrder workOrder=new WorkOrder();
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消6 已超时   7超时未办结  8未解决  9已解决)
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null));
        workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum("6",null,null));
        workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("7",null,null));
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("8",null,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("9",null,null));
        //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消  6未解决  7已解决)
        workOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null));
        workOrder.setWaitDistribution(iGuideRepairOrderService.countStatisticsNum("1",null,null,null,null));
        workOrder.setWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,null,null));
        workOrder.setHaveDealWith(iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null));
        workOrder.setRemainEvaluated(iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null));
        workOrder.setCanceled(iGuideRepairOrderService.countStatisticsNum("5",null,null,null,null));
        workOrder.setUnsolved(iGuideRepairOrderService.countStatisticsNum("6",null,null,null,null));
        workOrder.setResolved(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null));
        //是否超时 (1 未超时   2已超时) 超时未办结
        workOrder.setOvertime(iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null));
//        超时未办结
        workOrder.setOvertimeWaitDealWith(iGuideRepairOrderService.countStatisticsNum("2",null,null,"2",null));
        return ResultData.success(workOrder);
    }
@@ -55,11 +59,11 @@
        //1 今天   2昨天   3本月   4本年度
        //累计全部 本年 本月 今日 昨日
        TimeWorkOrder timeWorkOrder=new TimeWorkOrder();
        timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null));
        timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4"));
        timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3"));
        timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1"));
        timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2"));
        timeWorkOrder.setAllNum(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null));
        timeWorkOrder.setYearNum(iGuideRepairOrderService.countStatisticsNum(null,null,"4",null,null));
        timeWorkOrder.setMonthNum(iGuideRepairOrderService.countStatisticsNum(null,null,"3",null,null));
        timeWorkOrder.setTodayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"1",null,null));
        timeWorkOrder.setYesterdayNum(iGuideRepairOrderService.countStatisticsNum(null,null,"2",null,null));
        return ResultData.success(timeWorkOrder);
    }
@@ -90,6 +94,66 @@
    @ApiOperation("获取效率比值")
    @GetMapping("/getEfficiency")
    public ResultData getEfficiency()
    {
        EfficiencyEntity entity=new EfficiencyEntity();
        //总工单数
        int allNum=iGuideRepairOrderService.countStatisticsNum("",null,null,null,null);
        java.text.DecimalFormat weekDf=new java.text.DecimalFormat("##.##%");//传入格式模板
        int bj=iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null);
        if(bj!=0)
        {
            //        好评率=评价为满意的导办工单数量/已办结状态工单数量
            String goodReputationEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum(null,null,null,null,"1")
                    /bj));
            entity.setGoodReputationEfficiency(goodReputationEfficiency);
            //      解决率=已解决状态的导办工单数量/已办结状态工单数量
            String resolveEfficiency=weekDf.format((float)(iGuideRepairOrderService.countStatisticsNum("7",null,null,null,null)
                    /bj));
            entity.setResolveEfficiency(resolveEfficiency);
            if(allNum!=0)
            {
//              办结率=待评价+已办结状态的导办工单数量/总工单数量
                String workEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,null,null)
                        +bj)/allNum));
                entity.setWorkEfficiency(workEfficiency);
            }
        }
        int cs=iGuideRepairOrderService.countStatisticsNum(null,null,null,"2",null);
        if(cs!=0)
        {
            //        超时办结率=超时状态下的待评价+已办结状态的导办工单数量/超时状态的导办工单数量
            String timeoutEfficiency=weekDf.format((float)((iGuideRepairOrderService.countStatisticsNum("4",null,null,"2",null)
                    +iGuideRepairOrderService.countStatisticsNum("3",null,null,null,null))
                    /cs));
            entity.setTimeoutEfficiency(timeoutEfficiency);
        }
        if(allNum!=0)
        {
            //        回复率=最新进展里0条回复的导办工单数量/总工单数量
            //状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复   10转派    11手动分配)
            String reversionRate=weekDf.format((float)(iGuideEvolveService.countStatisticsNum("9",null)/allNum));
            entity.setReversionRate(reversionRate);
        }
        return ResultData.success(entity);
    }
}
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -67,7 +67,7 @@
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
                //默认  1系统后台用户
                newSysUser.setUserType("1");
                newSysUser.setUserType("3");
                newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                newSysUser.setUserId(huaChengSysUser.getUserId());
                newSysUser.setUserName(huaChengSysUser.getNickName());
flower_city/src/main/java/com/dg/core/db/gen/entity/EfficiencyEntity.java
New file
@@ -0,0 +1,45 @@
package com.dg.core.db.gen.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
@ApiModel("首页效率实体类")
public class EfficiencyEntity implements Serializable
{
    /**
     * 回复率
     */
    @ApiModelProperty("回复率")
    private String reversionRate="0%";
    /**
     * 办结率
     */
    @ApiModelProperty("办结率")
    private String workEfficiency="0%";
    /**
     * 解决率
     */
    @ApiModelProperty("解决率")
    private String resolveEfficiency="0%";
    /**
     * 好评率
     */
    @ApiModelProperty("好评率")
    private String goodReputationEfficiency="0%";
    /**
     * 超时办结率
     */
    @ApiModelProperty("超时办结率")
    private String timeoutEfficiency="0%";
}
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java
@@ -54,11 +54,23 @@
    private String fromUserId;
    /**
     * 状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消6 已超时   7超时未办结  8未解决  9已解决  10 系统自动分配  11 回复   12转派    13手动分配)
     * 状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消  7未解决  8已解决  9 系统自动分配  10 回复   11转派    12手动分配)
     */
    @ApiModelProperty(name = "state", value = "状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消6 已超时   7超时未办结  8未解决  9已解决  10 系统自动分配  11 回复   12转派    13手动分配)")
    @ApiModelProperty(name = "state", value = "状态(1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配)")
    private String state;
    /**
     * 工单号
     */
    @ApiModelProperty(name = "guideOrderNum", value = "工单号")
    private String guideOrderNum;
    /**
     * 超时状态 是否超时 (1未超时  2超时)
     */
    @ApiModelProperty(name = "isTimeout", value = "超时状态 是否超时 (1未超时  2超时)")
    private String isTimeout;
    /**
     * 备注内容
     */
flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java
@@ -155,6 +155,9 @@
    @ApiModelProperty(name = "video", value = "视频地址")
    private String video;
    @ApiModelProperty(name = "isTimeout", value = "是否超时 (1 未超时   2已超时)")
    private String isTimeout;
    @TableField(exist = false)
    @ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
    List<GuideEvolveEntity> guideEvolveEntities;
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -47,4 +48,11 @@
     */
    int updateGuid();
    /**
     * 首页统计用
     * @return
     */
    int countStatisticsNum(@Param("state") String state,@Param("isTimeout") String isTimeout);
}
flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java
@@ -67,7 +67,9 @@
     */
    int countStatisticsNum(@Param("state") String state,
                           @Param("ids") List<String> ids,
                           @Param("time") String time);
                           @Param("time") String time,
                           @Param("isTimeout") String isTimeout,
                           @Param("evaluateState") String evaluateState);
    /**
     * 统计工单用
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -71,7 +71,7 @@
                        //本地没有此用户  新用户
                        SysUser newSysUser=new SysUser();
                        //默认  1系统后台用户
                        newSysUser.setUserType("1");
                        newSysUser.setUserType("3");
                        newSysUser.setPhonenumber(huaChengSysUser.getPhone());
                        newSysUser.setUserId(huaChengSysUser.getUserId());
                        newSysUser.setUserName(huaChengSysUser.getNickName());
flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java
@@ -2,6 +2,7 @@
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -45,5 +46,9 @@
     * @return
     */
    int updateGuid();
    /**
     * 首页统计用
     * @return
     */
    int countStatisticsNum(String state,String isTimeout);
}
flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java
@@ -63,7 +63,7 @@
     * 统计工单用  1 今天   2昨天   3本月   4本年度 String time
     * @return
     */
    int countStatisticsNum(String state,List<String> ids,String time);
    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState);
    List<CountListNum> countListNum(String state,
flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java
@@ -63,4 +63,9 @@
    public int updateGuid() {
        return baseMapper.updateGuid();
    }
    @Override
    public int countStatisticsNum(String state, String isTimeout) {
        return baseMapper.countStatisticsNum(state,isTimeout);
    }
}
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -188,8 +188,8 @@
     * @return
     */
    @Override
    public int countStatisticsNum(String state,List<String> ids,String time) {
        return baseMapper.countStatisticsNum(state,ids,time);
    public int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState) {
        return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState);
    }
    @Override
flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java
@@ -89,9 +89,15 @@
        return baseMapper.countList(organizationName);
    }
    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
    }
    /**
     * 递归获取id  内部使用
     * @param departmentId
     * @param id
     * @return
     */
@@ -113,10 +119,7 @@
        return ids;
    }
    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
    }
    //递归取id
    private List<String> disposestreetId(List<OrganizationChartEntity> lists)
@@ -129,14 +132,17 @@
        for (OrganizationChartEntity sysStreet:lists)
        {
            ids.add(sysStreet.getId()+"");
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
                ids.addAll(disposestreetId(sysStreet.getChild()));
            }
            else
            if(sysStreet!=null&&sysStreet.getId()!=null)
            {
                ids.add(sysStreet.getId()+"");
                if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
                {
                    ids.addAll(disposestreetId(sysStreet.getChild()));
                }
                else
                {
                    ids.add(sysStreet.getId()+"");
                }
            }
        }
        return ids;
flower_city/src/main/resources/application.properties
@@ -3,8 +3,8 @@
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
server.port=8187
@@ -15,7 +15,7 @@
#Redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=nahanRedisPwsIsVerySimple&&
#spring.redis.password=nahanRedisPwsIsVerySimple&&
flower_city/src/main/resources/mapper/GuideEvolveMapper.xml
@@ -19,6 +19,8 @@
        <id     property="fromDepartmentalId"      column="from_departmental_id"      />
        <id     property="videoUrl"      column="video_url"      />
        <id     property="pictureUrl"      column="picture_url"      />
        <id     property="guideOrderNum"      column="guide_order_num"      />
        <id     property="isTimeout"      column="is_timeout"      />
    </resultMap>
@@ -41,7 +43,9 @@
            video_url,
            picture_url,
            create_time,
            update_time
            update_time,
            guide_order_num,
            is_timeout
        FROM
            automessage_guide_evolve a
    </sql>
@@ -73,6 +77,7 @@
        <if test="videoUrl != null and videoUrl != '' ">video_url,</if>
        <if test="pictureUrl != null and pictureUrl != '' ">picture_url,</if>
        <if test="guidOrderNum != null and guidOrderNum != '' ">guide_order_num,</if>
        <if test="isTimeout != null and isTimeout != '' ">is_timeout,</if>
        update_time,
        create_time
        )values(
@@ -90,6 +95,7 @@
        <if test="videoUrl != null and videoUrl != '' ">#{videoUrl},</if>
        <if test="pictureUrl != null and pictureUrl != '' ">#{pictureUrl},</if>
        <if test="guidOrderNum != null and guidOrderNum != '' ">#{guidOrderNum},</if>
        <if test="isTimeout != null and isTimeout != '' ">#{isTimeout},</if>
        sysdate(),
        sysdate()
        )
@@ -111,6 +117,7 @@
            <if test="fromDepartmentalId != null and fromDepartmentalId != '' ">from_departmental_id=#{fromDepartmentalId},</if>
            <if test="videoUrl != null and videoUrl != '' ">video_url=#{videoUrl},</if>
            <if test="pictureUrl != null and pictureUrl != '' ">picture_url=#{pictureUrl},</if>
            <if test="isTimeout != null and isTimeout != '' ">is_timeout=#{isTimeout},</if>
            update_time=sysdate()
        </set>
        where  id= #{Id}
@@ -130,6 +137,24 @@
        select count(id) from automessage_guide_evolve
    </select>
    <!--  首页统计使用 勿动  -->
    <select id="countStatisticsNum" resultType="integer">
        select count(id) from automessage_guide_evolve
        <where>
            <if test="state != null and state != ''">
                and automessage_guide_evolve.state=#{state}
            </if>
            <if test="isTimeout != null and isTimeout != ''">
                and automessage_guide_evolve.is_timeout=#{isTimeout}
            </if>
        </where>
    </select>
</mapper>
flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml
@@ -28,6 +28,7 @@
        <id     property="serviceState"      column="service_state"      />
        <id     property="images"      column="images"      />
        <id     property="video"      column="video"      />
        <id     property="isTimeout"      column="is_timeout"      />
    </resultMap>
    <sql id="selectGuideRepairOrderVo">
@@ -65,7 +66,8 @@
            evaluate_state,
            service_state,
            video,
            images
            images,
            is_timeout
        FROM
            automessage_guide_repair_order a
    </sql>
@@ -133,6 +135,7 @@
            <if test="evaluateContent != null and evaluateContent != '' ">evaluate_content=#{evaluateContent},</if>
            <if test="suggest != null and suggest != '' ">suggest=#{suggest},</if>
            <if test="serviceState != null  ">service_state=#{serviceState},</if>
            <if test="isTimeout != null  ">is_timeout=#{isTimeout},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}
@@ -148,6 +151,12 @@
        <where>
            <if test="state != null and state != ''">
                automessage_guide_repair_order.state=#{state}
            </if>
            <if test="isTimeout != null and isTimeout != ''">
                and is_timeout=#{isTimeout}
            </if>
            <if test="evaluateState != null and evaluateState != ''">
                and evaluate_state=#{evaluateState}
            </if>
            <if test="ids != null">
                and department_id IN
@@ -170,8 +179,6 @@
        </where>
    </select>
    <select id="countListNum"  resultType="com.dg.core.db.gen.entity.CountListNum">
        select create_time,count(id) as num from automessage_guide_repair_order
        <where>
@@ -191,10 +198,5 @@
            create_time DESC
            LIMIT #{time}
    </select>
</mapper>