1.后台添加工单分页列表 2.修改bug

fengjin

2022-09-28 f3c1a3b1845ad5c991ad02b9fa7729587fec8930

1.后台添加工单分页列表 2.修改bug

 flower_city/src/main/java/com/dg/core/api/AutomessageCommonProblemAppletsController.java

@@ -37,4 +37,16 @@
    }


    /**
     * 获取常见问题列表（不分页查找）
     * @return
     */
    @ApiOperation(value = "获取常见问题列表（不分页查找）",response = AutomessageCommonProblem.class)
    @GetMapping("/queryList")
    public ResultData queryList(@RequestParam(value = "title") String title){
        return  ResultData.success(iAutomessageCommonProblemService.selectConfigList(title,null));
    }



}

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

@@ -1,22 +1,25 @@
package com.dg.core.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.*;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;

/**
 * 工单管理
@@ -318,5 +321,27 @@
    }


    /**
     * 获取工单列表(分页)
     * @param matterName
     * @return
     */
    @ApiOperation(" 获取工单列表(分页)")
    @GetMapping("/getList")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                   @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                   @RequestParam(value = "matterName",required = false) String matterName)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<GuideRepairOrder> pageParam = new Page<>(pageNum,pageSize);
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,matterName);
        int num=iGuideRepairOrderService.countConfigList(matterName);
        return getDataTable(list,num);

    }



}

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

@@ -172,6 +172,29 @@
    @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
    private  Integer serviceState;

    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
    private String sumClassifyName;

    @TableField(exist = false)
    @ApiModelProperty(name = "consultUser", value = "咨询人姓名+电话")
    private String consultUser;

    @TableField(exist = false)
    @ApiModelProperty(name = "submitUser", value = "提交人姓名+电话")
    private String submitUser;

    @TableField(exist = false)
    @ApiModelProperty(name = "guideUser", value = "导办人姓名+电话")
    private String guideUser;

    @TableField(exist = false)
    @ApiModelProperty(name = "organizationName", value = "创建部门")
    private String organizationName;

    @TableField(exist = false)
    @ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
    private String guideDepartmentName;

    @Override
    public String toString() {

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

@@ -25,6 +25,11 @@
     */
   List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state, @Param("title") String title, @Param("content") String content);

    /**
     * 获取常见问题列表（不分页查找）
     * @return
     */
    List<AutomessageCommonProblem> selectConfigList(@Param("title") String title, @Param("content") String content);

    /**
     * 获取常见问题列表统计数量

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

@@ -1,5 +1,7 @@
package com.dg.core.db.gen.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;
@@ -42,6 +44,20 @@
     */
    List<GuideRepairOrder> selectBySubmitId(String submitUserId);

    /**
     * 获取工单列表(分页)
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName);

    /**
     * 获取工单列表(求和)
     * @param matterName
     * @return
     */
    int countConfigList(@Param("matterName") String matterName);





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

@@ -23,6 +23,12 @@
     */
    List<AutomessageCommonProblem> selectConfigList(IPage<AutomessageCommonProblem> page, Integer state,   String title,  String content);

    /**
     * 获取常见问题列表（不分页查找）
     * @return
     */
    List<AutomessageCommonProblem> selectConfigList(String title,  String content);


    /**
     * 获取常见问题列表统计数量

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

@@ -1,5 +1,7 @@
package com.dg.core.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.db.gen.entity.AutomessageCommonProblem;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import org.springframework.data.repository.query.Param;

@@ -33,4 +35,19 @@
     */
    List<GuideRepairOrder> selectBySubmitId(String submitUserId);

    /**
     * 获取工单列表(分页)
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,String matterName);


    /**
     * 获取工单列表(求和)
     * @param matterName
     * @return
     */
    int countConfigList(@Param("matterName") String matterName);

}

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

@@ -26,6 +26,11 @@
    }

    @Override
    public List<AutomessageCommonProblem> selectConfigList(String title, String content) {
        return baseMapper.selectConfigList(title,content);
    }

    @Override
    public  Integer countAutomessageCommonProblem( String title, String content){
        return  baseMapper.countConfigList(title,content);
    }

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

@@ -1,11 +1,9 @@
package com.dg.core.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.GuideRepairOrderImage;
import com.dg.core.db.gen.entity.Slideshow;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.db.gen.entity.*;
import com.dg.core.db.gen.mapper.GuideRepairOrderImageMapper;
import com.dg.core.db.gen.mapper.GuideRepairOrderMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
@@ -80,5 +78,15 @@
        return baseMapper.selectBySubmitId(submitUserId);
    }

    @Override
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state, String matterName) {
        return baseMapper.selectConfigList(page,state,matterName);
    }

    @Override
    public int countConfigList(String matterName) {
        return baseMapper.countConfigList(matterName);
    }


}

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

@@ -36,12 +36,21 @@
            order_num,
            matter_id,
            matter_name,
            (select organization_name from automessage_organization_chart where a.department_id=id)organizationName,
            concat(
                    (select classify_name from  automessage_classify_administration  where id=(select parent_id from  automessage_classify_administration  where id=a.classify_id)),
                    '-',(select classify_name from  automessage_classify_administration  where id=a.classify_id)
                ) sumClassifyName,
            department_id,
            classify_id,
            consult_content,
            concat(consult_user_name,consult_user_phone) consultUser,
            consult_user_name,
            concat((select user_name from automessage_sys_user where a.submit_user_id=user_id ), submit_user_phone) submitUser,
            submit_user_id,
            concat((select user_name from automessage_sys_user where a.guide_user_id=user_id ), guide_user_phone) guideUser,
            guide_user_id,
            (select organization_name from automessage_organization_chart where a.guide_department_id=id)guideDepartmentName,
            guide_department_id,
            state,
            consult_user_phone,
@@ -58,9 +67,27 @@
            video,
            images
        FROM
            automessage_guide_repair_order
            automessage_guide_repair_order a
    </sql>

    <select id="selectConfigList"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        <where>
            <if test="matterName != null and matterName != ''">
                AND matterName=#{matterName}
            </if>
        </where>
    </select>

    <select id="countConfigList"  resultType="integer">
        select count(id) from automessage_guide_repair_order
        <where>
            <if test="matterName != null and matterName != ''">
                AND matterName=#{matterName}
            </if>
        </where>
    </select>

    <select id="selectConfigData"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        <where>