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

zhanghl

2025-04-28 d668c213bbcccd83acb57056a6b7919fda7e6d2d

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

@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.job.util.Sequence;
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;
@@ -162,7 +162,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 +182,7 @@
        jobLog.setCreateTime(DateUtils.getNowDate());
        jobLog.setBizType("work_order");
        jobLogMapper.insertApsWorkOrderJobLog(jobLog);
        log.info("work_order_request：{}", JSONObject.toJSONString(jobLog));
        return requestOnePage(jobLog);
    }
    /**
@@ -303,7 +304,8 @@
                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) {