fix: 成果同步修改

linwei

2026-04-23 cdd8c41aa80f986a8317438e2a8014be7c5f93c1

fix: 成果同步修改

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.xml

@@ -142,13 +142,13 @@
            </if>
            <if test="param.deptList != null and param.deptList.size > 0">
                AND (
                    create_dept IN
                    create_dept::text IN
                    <foreach collection="param.deptList" item="deptId" open="(" separator="," close=")">
                        #{deptId}
                        #{deptId}::text
                    </foreach>
                    OR apply_target_dept_id IN
                    OR apply_target_dept_id::text IN
                    <foreach collection="param.deptList" item="deptId" open="(" separator="," close=")">
                        #{deptId}
                        #{deptId}::text
                    </foreach>
                )
            </if>

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdDeviceCallController.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.workorder.controller;

import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,6 +24,7 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -55,6 +57,7 @@
 * @author Aix
 * @since 2026-02-26
 */
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("workorder/gdDeviceCall")
@@ -81,6 +84,7 @@
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "新增设备状态数据(星图对接)", notes = "dtos")
    public R<Boolean> addDeviceCallExternal(@RequestBody List<GdDeviceCallDetailExternalSaveDTO> dtos) {
        log.info("新增设备状态数据-对外接口{}", JSON.toJSONString(dtos));
        return R.status(gdDeviceCallService.saveGdDeviceCallExternal(dtos));
    }


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java

@@ -16,6 +16,7 @@
 */
package org.sxkj.gd.workorder.controller;

import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,6 +24,7 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -55,6 +57,7 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("workOrder/gdTaskResult")
@@ -142,6 +145,7 @@
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "批量新增", notes = "传入gdTaskResult")
    public R batchSaveExternal(@Valid @RequestBody List<GdTaskResultDTO> gdTaskResults) {
        log.info("批量新增-对外接口{}", JSON.toJSONString(gdTaskResults));
        return R.status(gdTaskResultService.saveBatchTaskResult(GdTaskResultWrapper.build().listEntity(gdTaskResults)));
    }


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

@@ -137,7 +137,7 @@
        <foreach collection="list" item="item" separator=",">
            (
                #{item.patrolTaskId}, #{item.resultCode}, #{item.resultUrl}, #{item.shootTime}, 
                #{item.photoData}::jsonb, #{item.longitude}, #{item.latitude}, #{item.distributeStatus}, #{item.areaCode}, 
                CASE WHEN #{item.photoData} IS NULL THEN NULL ELSE #{item.photoData}::jsonb END, #{item.longitude}, #{item.latitude}, #{item.distributeStatus}, #{item.areaCode}, 
                #{item.createUser}, #{item.createDept}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, 
                #{item.status}, #{item.isDeleted}
            )