吉安感知网项目-后端
rain
2026-01-20 e2f92c8f236cbd35c55f06c1184c924a03d7419c
工单事件线索模块处理人和处理部门转换名称
8 files modified
74 ■■■■■ changed files
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java 6 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java 4 ●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.java 9 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml 30 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdClueEventDistributeParam.java 4 ●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java 9 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java 7 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
@@ -77,8 +77,10 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入gdClueEvent")
    public R<IPage<GdClueEventVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdClueEvent, Query query) {
        IPage<GdClueEventEntity> pages = gdClueEventService.page(Condition.getPage(query), Condition.getQueryWrapper(gdClueEvent, GdClueEventEntity.class));
        return R.data(GdClueEventWrapper.build().pageVO(pages));
        QueryWrapper<GdClueEventEntity> queryWrapper = Condition.getQueryWrapper(gdClueEvent, GdClueEventEntity.class);
        queryWrapper.lambda().eq(GdClueEventEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
        IPage<GdClueEventVO> pages = gdClueEventService.selectGdClueEventList(Condition.getPage(query), queryWrapper);
        return R.data(pages);
    }
    /**
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
@@ -49,12 +49,12 @@
     * 工单处置人
     */
    @ApiModelProperty(value = "工单处置人")
    private String disposeUser;
    private Long disposeUser;
    /**
     * 处置部门
     */
    @ApiModelProperty(value = "处置部门")
    private String disposeDept;
    private Long disposeDept;
    /**
     * 经度
     */
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.java
@@ -42,6 +42,15 @@
     */
    List<GdClueEventVO> selectGdClueEventPage(IPage page, GdClueEventVO gdClueEvent);
    /**
     * 列表查询
     *
     * @param page
     * @param queryWrapper
     * @return
     */
    List<GdClueEventVO> selectGdClueEventList(IPage page, @Param("ew") Wrapper<GdClueEventEntity> queryWrapper);
    /**
     * 获取导出数据
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -22,6 +22,27 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <resultMap id="gdClueEventVoResultMap" type="org.sxkj.gd.workorder.vo.GdClueEventVO">
        <result column="id" property="id"/>
        <result column="result_id" property="resultId"/>
        <result column="work_order_id" property="workOrderId"/>
        <result column="dispose_user" property="disposeUser"/>
        <result column="dispose_dept" property="disposeDept"/>
        <result column="dispose_user_name" property="disposeUserName"/>
        <result column="dispose_dept_name" property="disposeDeptName"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="event_status" property="eventStatus"/>
        <result column="area_code" property="areaCode"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>
        <result column="create_time" property="createTime"/>
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <resultMap id="gdClueEventExcelResultMap" type="org.sxkj.gd.workorder.excel.GdClueEventExcel">
        <result column="result_id" property="resultId"/>
        <result column="work_order_id" property="workOrderId"/>
@@ -38,6 +59,15 @@
        select * from ja_gd_clue_event where is_deleted = 0
    </select>
    <select id="selectGdClueEventList" resultMap="gdClueEventVoResultMap">
        select ce.*,
        ifnull(bu.real_name, bu.name) as dispose_user_name,
        bd.dept_name as dispose_dept_name
        from (select * from ja_gd_clue_event ${ew.customSqlSegment}) ce
        left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
        left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
    </select>
    <select id="exportGdClueEvent" resultMap="gdClueEventExcelResultMap">
        SELECT * FROM ja_gd_clue_event ${ew.customSqlSegment}
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdClueEventDistributeParam.java
@@ -28,14 +28,14 @@
     */
    @ApiModelProperty(value = "工单处置人", required = true)
    @NotBlank(message = "工单处置人不能为空")
    private String disposeUser;
    private Long disposeUser;
    /**
     * 处置部门
     */
    @ApiModelProperty(value = "处置部门", required = true)
    @NotBlank(message = "处置部门不能为空")
    private String disposeDept;
    private Long disposeDept;
    /**
     * 经度
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
@@ -43,6 +43,15 @@
    IPage<GdClueEventVO> selectGdClueEventPage(IPage<GdClueEventVO> page, GdClueEventVO gdClueEvent);
    /**
     * 列表查询
     *
     * @param page
     * @param queryWrapper
     * @return
     */
    IPage<GdClueEventVO> selectGdClueEventList(IPage<GdClueEventVO> page, Wrapper<GdClueEventEntity> queryWrapper);
    /**
     * 分发事件
     *
     * @param distributeParam
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
@@ -55,6 +55,11 @@
    }
    @Override
    public IPage<GdClueEventVO> selectGdClueEventList(IPage<GdClueEventVO> page, Wrapper<GdClueEventEntity> queryWrapper) {
        return page.setRecords(baseMapper.selectGdClueEventList(page, queryWrapper));
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean distributeClueEvent(GdClueEventDistributeParam distributeParam) {
        GdTaskResultEntity taskResult = gdTaskResultService.getById(distributeParam.getResultId());
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java
@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.workorder.vo;
import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.workorder.entity.GdClueEventEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,4 +32,10 @@
public class GdClueEventVO extends GdClueEventEntity {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value = "处置人姓名")
    private String disposeUserName;
    @ApiModelProperty(value = "处置部门名称")
    private String disposeDeptName;
}