server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1961,7 +1961,7 @@ .selectAs(Position::getName,Member::getPositionName) .leftJoin(Position.class,Position::getId,Member::getPositionId) .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile()) .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName()) .like(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName()) .eq(Member::getIsdeleted,Constants.ZERO) .eq(Member::getStatus,Constants.ZERO) .eq(Member::getWorkStatus,Constants.ZERO) server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -132,6 +132,7 @@ .select(PlatformJob::getTotalNum) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .eq(PlatformJob::getOrigin,Constants.ONE) .in(PlatformJob::getType,new Integer[]{0,2,4}) .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey() , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() , Constants.PlatformJobStatus.LEAVED.getKey()) @@ -801,11 +802,13 @@ .selectAll(PlatformJob.class) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .eq(PlatformJob::getCarCodeFront,param.getCarCode()) .in(PlatformJob::getStatus, .notIn(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey(), Constants.PlatformJobStatus.LEAVED.getKey(), Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(), Constants.PlatformJobStatus.CALLED.getKey()) Constants.PlatformJobStatus.CANCEL.getKey() ) .orderByAsc(PlatformJob::getId) .last("limit 1")); dealJobDetailAndContractBiz(job,data); @@ -951,6 +954,7 @@ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum) .select(PlatformJob::getStatus,PlatformJob::getStatus) .eq(PlatformJob::getIsdeleted,Constants.ZERO) .in(PlatformJob::getType,Constants.ONE,Constants.THREE) .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(), Constants.PlatformJobStatus.LEAVED.getKey(), Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()) @@ -1971,7 +1975,7 @@ List<PlatformJob> jobList = platformJobMapper.selectJoinList(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>() .selectAll( PlatformJob.class) // .select("(select sum(ifnull(a.io_qty,0)) from platform_wms_detail a where a.isdeleted=0 and a.job_id =t.id )", create_date) .apply("to_days(t.create_date) = to_days(now())") .apply("to_days(t.done_date) = to_days(now())") .eq(Platform::getIsdeleted, Constants.ZERO) .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey() , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey() server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -73,6 +73,8 @@ private RetentionMapper retentionMapper; @Autowired private WxNoticeConfigMapper wxNoticeConfigMapper; @Autowired private PlatformLogMapper platformLogMapper; /** * 入库通知任务业务处理 * @param job 参数 @@ -429,6 +431,22 @@ job.setCompanyNamePath(driver.getCompanyNamePath()); } platformJobMapper.insert(job); if(car !=null){ //存储操作日志 PlatformLog platformLog = new PlatformLog(); platformLog.setIsdeleted(Constants.ZERO); platformLog.setCreateDate(new Date()); platformLog.setJobId(job.getId()); platformLog.setObjType(Constants.PlatformJobLogType.SIGN.getKey()); platformLog.setContent("自动签到"); platformLog.setParam4(job.getCarCodeFront()); platformLog.setAfterContent(JSONObject.toJSONString(job)); platformLog.setObjId(job.getId().toString()); platformLog.setParam3("0"); platformLogMapper.insert(platformLog); } } private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) {
