sgj
2026-03-24 cc45b945d86a6c3c7cc99f17fedc0343f49a14b1
fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java
@@ -7,7 +7,10 @@
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
import com.fzzy.igds.data.GroupIndexData;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.io.manager.QuantityRemoteManager;
import com.fzzy.igds.io.service.RemoteQuantityService;
@@ -20,7 +23,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -227,9 +229,9 @@
     * @param patrolId
     * @return
     */
    public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
    public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {
        List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId);
        List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId,userId,confId);
        if (null != patrolRecords && !patrolRecords.isEmpty()) {
            //判断文件是否存在
@@ -359,6 +361,7 @@
        request.setDeptId(conf.getDeptId());
        request.setSn(conf.getSn());
        request.setLength(conf.getLength());
        request.setExeUser(ContextUtil.getLoginUserName());
        request.setBatchId(conf.getDepotId() + "_" + DateFormatUtils.format(new Date(), "yyyyMMddHHmm"));