工单优化

linwei

2026-02-05 08d4bb2bf4bfadc9ab5fcf6b0a2bfb543d22b2a0

工单优化

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java

@@ -16,20 +16,19 @@
 */
package org.sxkj.gd.orderdata.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import org.sxkj.gd.orderdata.mapper.GdApplicationInnovationMapper;
import org.sxkj.gd.orderdata.service.IGdApplicationInnovationService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import org.sxkj.gd.orderdata.mapper.GdApplicationInnovationMapper;
import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.service.IGdApplicationInnovationService;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.system.cache.SysCache;

import java.util.ArrayList;
import java.util.List;

/**
@@ -44,10 +43,15 @@
    @Override
    public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation) {
        if (!AuthUtil.isAdministrator()) {
            if (gdApplicationInnovation.getIsQueryAll()) {
            if (!gdApplicationInnovation.getIsQueryAll()) {
                List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
                gdApplicationInnovation.setDeptList(deptList);
            }
        } else {
            // 管理员角色下保留原有分页信息，仅清空查询条件
            gdApplicationInnovation.setDeptList(null);
            gdApplicationInnovation.setIsQueryAll(true);
            gdApplicationInnovation.setInnovationStatus(null);
        }
        return page.setRecords(baseMapper.selectGdApplicationInnovationPage(page, gdApplicationInnovation));
    }

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java

@@ -44,10 +44,15 @@
    @Override
    public IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationPageParam gdDataEvaluation) {
        if (!AuthUtil.isAdministrator()) {
            if (gdDataEvaluation.getIsQueryAll()) {
            if (!gdDataEvaluation.getIsQueryAll()) {
                List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
                gdDataEvaluation.setDeptList(deptList);
            }
        } else {
            // 管理员角色下保留原有分页信息，仅清空查询条件
            gdDataEvaluation.setDeptList(null);
            gdDataEvaluation.setIsQueryAll(true);
            gdDataEvaluation.setIsResolved(null);
        }
        return page.setRecords(baseMapper.selectGdDataEvaluationPage(page, gdDataEvaluation));
    }

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml

@@ -27,8 +27,8 @@
                blade_dept bd on md.create_dept = bd.id
        <where>
                and md.is_deleted = 0
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and md.nickname like concat('%',#{param2.deviceName},'%')
            <if test="param2.nickname != null and param2.nickname != ''">
                and md.nickname like concat('%',#{param2.nickname},'%')
            </if>
            <if test="param2.deptId != null">
                and md.create_dept = #{param2.deptId}
@@ -36,6 +36,13 @@
            <if test="param2.location != null and param2.location != ''">
                and md.location like concat('%',#{param2.location},'%')
            </if>
            <if test="param2.modeCode != null and param2.modeCode != ''">
                and md.mode_code = #{param2.modeCode}
            </if>
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and md.device_type = #{param2.deviceType}
            </if>

        </where>
    </select>


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdManageDevicePageParam.java

@@ -58,5 +58,10 @@

    @ApiModelProperty(value = "设备类型（0机场，1无人机）")
    private String deviceType;
    /**
     * 模式编号
     */
    @ApiModelProperty(value = "状态 0 在线 1离线")
    private String modeCode;

}