Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-09 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java

@@ -1,9 +1,9 @@
package com.aps.job.service.impl;

import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.Sequence;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
@@ -52,9 +52,6 @@

    @Autowired
    private ApsWorkOrderJobLogMapper jobLogMapper;

    @Autowired
    private Sequence sequence;

    /**
     * 查询工单同步
@@ -162,7 +159,7 @@
        param.setDocState(Arrays.asList(0,1,2,4));
        param.setBeginDate(yesterdayMidnight.format(formatter));
        param.setEndDate(today.format(formatter));
        param.setPageSize(1000);
        param.setPageSize(100);
        while (continueFlag){
            param.setPageIndex(currentPage);
            continueFlag= batchSaveByPager(param);
@@ -182,6 +179,7 @@
        jobLog.setCreateTime(DateUtils.getNowDate());
        jobLog.setBizType("work_order");
        jobLogMapper.insertApsWorkOrderJobLog(jobLog);
        log.info("work_order_request：{}", JSONObject.toJSONString(jobLog));
        return requestOnePage(jobLog);
    }
    /**
@@ -296,14 +294,15 @@
                }

                ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
                order.setId(sequence.nextId());
                order.setId(IdUtil.getSnowflakeNextId());
                order.setOrderId(jsonObject.getString("ID"));
                order.setCreateTime(DateUtils.getNowDate());
                order.setPageIndex(i);
                order.setPageNum(pageNum);
                order.setDelFlag("0");
                order.setProcessStatus("0");

                order.setOpStatus(jsonObject.getString("OpStatus"));
                order.setNextOpName(jsonObject.getString("NextOpName"));
                jobs.add(order);
                orderIds.add(order.getOrderId());
            } catch (Exception e) {