提交

zhangback

7 天以前 b054362aaf616bfe0be0b50ae5dc2137091dbd7d

 api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java

@@ -10,6 +10,8 @@
import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
import com.ruoyi.cwgl.service.IKeyCollectionInfoService;
import com.ruoyi.cwgl.service.IRequestLogService;
import com.ruoyi.tms.domain.TmsCarKeyDispatch;
import com.ruoyi.tms.service.ITmsCarKeyDispatchService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@
    private IKeyCollectionInfoService keyCollectionInfoService;
    @Autowired
    private IRequestLogService logService;
    @Autowired
    private ITmsCarKeyDispatchService tmsCarKeyDispatchService;

    /**
     * 上报取出审核
@@ -58,21 +62,27 @@
            return success;
        }

        KeyCollectionInfo keyCollectionInfo = keyCollectionInfoService.selectCwData(takeReviewDto);
        TmsCarKeyDispatch tmsCarKeyDispatch = tmsCarKeyDispatchService.selectTmsCarKeyDispatchdriverMobile(takeReviewDto.getDriverCode());
        //添加请求日志
        RequestLog requestLog = new RequestLog();
        requestLog.setDriverCode(takeReviewDto.getDriverCode());
        requestLog.setDriverName(takeReviewDto.getDriverName());
        requestLog.setReqTime(takeReviewDto.getHandleTime());
        if (keyCollectionInfo!=null){
        String boxNum = keyCollectionInfo.getBoxNum();
        if (tmsCarKeyDispatch!=null){
        String boxNum = tmsCarKeyDispatch.getVehicleCarKeyNo();
            requestLog.setBoxNum(boxNum);


        }
        requestLog.setType(0);
        logService.insertRequestLog(requestLog);

        return keyCollectionInfoService.takeReview(keyCollectionInfo);
        AjaxResult ajaxResult = tmsCarKeyDispatchService.takeReview(tmsCarKeyDispatch);
        if (!ajaxResult.get("code").equals(0)){
            ajaxResult =  keyCollectionInfoService.selectSmartLockerApplication(takeReviewDto);

        }
        return ajaxResult;


    }