1.居民查看的导办工单里的工作人员姓名脱敏显示，显示为”姓+老师“，示例”李老师“2.后台导办工单可以按用户提交时间、办事指南分类进行筛选

fengjin

2022-11-09 e9804708c0bf27e9b85c09acf21d8b7c705f9ffb

1.居民查看的导办工单里的工作人员姓名脱敏显示，显示为”姓+老师“，示例”李老师“2.后台导办工单可以按用户提交时间、办事指南分类进行筛选

 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