Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-20 bbd62792fcf95c2ef6c8c0696fd8601869eb1d49

Merge remote-tracking branch 'origin/master'

 ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java

@@ -57,6 +57,7 @@
        if (CollectionUtils.isEmpty(deviceList)) {
            return;
        }
        log.info("此次共检测工单图片工单数" + deviceList.size());
        // 查出国标设备，就一条数据
        List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
                .orderByDesc(DeviceInfo::getUpdateTime)

 ycl-server/src/main/java/com/ycl/utils/http/HttpUtils.java

@@ -64,6 +64,7 @@
            log.info("sendGet - {}", urlNameString);
            URL realUrl = new URL(urlNameString);
            URLConnection connection = realUrl.openConnection();
            connection.setConnectTimeout(20000);  // 20s超时
            connection.setRequestProperty("accept", "*/*");
            connection.setRequestProperty("connection", "Keep-Alive");
            connection.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -238,8 +238,8 @@
        FROM
             t_work_order wo
        WHERE
            wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
            AND deleted = 0
            wo.status = 'YW_HANDLE'
            AND wo.deleted = 0
    </select>

    <insert id="addMany">

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml

@@ -14,10 +14,12 @@
    </resultMap>

    <select id="selectYwConditionByYwId" resultMap="BaseResultMap">
        SELECT yw.id, yu.id as unit_id, yu.unit_name, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
        SELECT DISTINCT yw.id, yu.id as unit_id, yu.unit_name, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
        FROM t_work_order_yw_condition_record yw
                 LEFT JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo}
                 LEFT JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0
                 LEFT JOIN t_yw_unit yu ON su.unit_id = yu.id
        WHERE
            yw.work_order_no = #{workOrderNo}
        ORDER BY yw.create_time DESC
    </select>