Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-09 dc0285dcb1695f8f7b69b09bc6dcd4e3e9ba4173

Merge branch 'zigonggao_dev' into huacheng_test

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

@@ -86,7 +86,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -94,7 +95,7 @@
        }

        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));

        return ResultData.success(order);
    }
@@ -336,7 +337,7 @@
        {
            userId=sysUser.getUserId()+"";
        }
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
        int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
        return getDataTable(list,num);
    }

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

@@ -87,7 +87,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -95,7 +96,7 @@
        }

        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));

        return ResultData.success(order);
    }
@@ -373,6 +374,9 @@
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterName",required = false) String matterName,
                                          @RequestParam(value = "status",required = false) String status,
                                          @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
                                          @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
                                          @RequestParam(value = "classifyId",required = false)String  classifyId,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
@@ -402,7 +406,7 @@
        }

        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
                matterName,ids,status,userId);
                matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
        int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
        return getDataTable(list,num);
    }

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

@@ -16,6 +16,12 @@
    public List<GuideEvolveEntity> selectConfigList(String guideId);

    /**
     * 查询记录列表(隐藏工单姓名)
     * @return
     */
    public List<GuideEvolveEntity>  selectHideList(String guideId);

    /**
     * 新增记录
     * @param entity
     * @return

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -54,7 +55,10 @@
                                            @Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);
                                            @Param("guideUserId") String guideUserId,
                                            @Param("createTimeStartTime") String createTimeStartTime,
                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
                                            @Param("classifyId") String classifyId);


    /**
@@ -65,7 +69,11 @@
    List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);
                                            @Param("guideUserId") String guideUserId,
                                            @Param("createTimeStartTime") String createTimeStartTime,
                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
                                            @Param("classifyId") String classifyId
                                            );

    /**
     * 获取工单列表(求和)

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

@@ -2,6 +2,7 @@


import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.SysUser;
import org.springframework.data.repository.query.Param;

import java.util.List;
@@ -12,7 +13,7 @@
     * 查询记录列表
     * @return
     */
    public List<GuideEvolveEntity> selectConfigList(String guideId);
    public List<GuideEvolveEntity> selectConfigList(String guideId, SysUser sysUser);

    /**
     * 新增记录

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

@@ -5,6 +5,7 @@
import com.dg.core.db.gen.entity.*;
import org.springframework.data.repository.query.Param;

import java.time.LocalDateTime;
import java.util.List;

public interface IGuideRepairOrderService {
@@ -41,7 +42,8 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            String matterName,List<String> ids,String status,String guideUserId);
                                            String matterName, List<String> ids, String status, String guideUserId,
                                            String createTimeStartTime, String createTimeTimeEndTime, String classifyId);

    /**
     * 获取工单列表(不分页用于小程序)
@@ -49,7 +51,7 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
                                            String guideUserId);
                                            String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId);


    /**

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

@@ -24,8 +24,13 @@
    private TransactionEventMapper transactionEventMapper;

    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId) {
        List<GuideEvolveEntity> guideEvolveEntities = baseMapper.selectConfigList(guideId);
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("3")){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);
        }
        for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
            String[] split;
            if (guideEvolveEntity.getAccessoryId()!=null){

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

@@ -229,14 +229,15 @@
    @Override
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                                   String matterName, List<String> ids, String status,
                                                   String guideUserId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId);
                                                   String guideUserId, String createTimeStartTime,
                                                   String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
    }

    @Override
    public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
                                                   String guideUserId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId);
                                                   String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
    }

    @Override

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

@@ -60,6 +60,42 @@
        order by create_time desc
    </select>

    <select id="selectHideList" resultMap="GuideEvolveResult">
        SELECT
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,
            state,
            remark,
            guide_id,
            transaction_id,
            accessory_id,
            accessory_name,
            accessory_url,
            from_departmental_id,
            video_url,
            picture_url,
            create_time,
            update_time,
            guide_order_num,
            is_timeout
        FROM
            automessage_guide_evolve a
        <where>
            <if test="guideId != null and guideId != ''">
                AND guide_id=#{guideId}
            </if>
        </where>
        order by create_time desc
    </select>


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
        insert into automessage_guide_evolve (

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

@@ -105,6 +105,16 @@
            <if test="status != null and status != ''">
                AND a.state=#{status}
            </if>
            <if test="createTimeStartTime != null and createTimeStartTime != ''">
                and create_time > #{createTimeStartTime}
            </if>
            <if test="createTimeTimeEndTime != null and createTimeTimeEndTime != ''">
               and  #{createTimeTimeEndTime} > create_time
            </if>
            <if test="classifyId != null and classifyId != ''">
                and  classify_id in (select id FROM automessage_classify_administration where  parent_id = #{classifyId})
            </if>

        </where>
        order by  update_time desc ,  create_time desc
    </select>