admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -16,7 +16,7 @@ <el-button :loading="exLoading" @click="handleEx" v-permissions="['business:platformbooks:exportExcel']">导出</el-button> </div> <el-table class="mb20" v-loading="loading" :data="list" stripe> <el-table class="mb40" v-loading="loading" :data="list" stripe> <el-table-column prop="contractNum" label="合同单号" min-width="100" show-overflow-tooltip /> <el-table-column prop="inReason" label="入园原因" min-width="100" show-overflow-tooltip /> <el-table-column prop="totalNum" label="总作业量(万支)" min-width="100" show-overflow-tooltip /> server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -54,8 +54,12 @@ private String imgurl; @ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工 3车辆信息") @ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8) // @ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8) private Integer type; @ApiModelProperty(value = " 类型 0相关方组织 1内部人员 2访客") @TableField(exist = false) @ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8) private String typeName; @ApiModelProperty(value = "访客名称") @ExcelColumn(name="姓名" ,index = 1,width = 6) server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java
@@ -18,7 +18,8 @@ @TableField(exist = false) public String companyName; @ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工") @ApiModelProperty(value = "类型 0相关方组织 1内部人员 2访客") @ExcelColumn(name="类型") private String typeName;
@@ -438,7 +438,7 @@ //只能看自己 queryWrapper.and(w->{ w.eq(HiddenDanger::getCreator,userInfo.getId()).or(). eq(HiddenDanger::getCheckUserId,userInfo.getId()); eq(HiddenDanger::getCheckUserId,userInfo.getMemberId()); }); }else{ queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -202,6 +202,14 @@ List<SystemDictData> list = systemDictDataMapper.list(codes); Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity())); retentionIPage.getRecords().stream().forEach(obj->{ obj.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes()); if(null != obj.getCompanyType()) { if(Constants.ZERO == obj.getCompanyType()){ obj.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes()); }else if(Constants.ONE == obj.getCompanyType()) { obj.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes()); } } if(StringUtils.isNotBlank(obj.getFaceImg())){ obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode() +dataMap.get(Constants.MEMBER_IMG).getCode() @@ -267,7 +275,7 @@ RetentionVo vo = new RetentionVo(); vo.setCompanyName(obj.getCompanyName()); vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes()); if(null != obj.getType()) { if(null != obj.getCompanyType()) { if(Constants.ZERO == obj.getCompanyType()){ vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes()); }else if(Constants.ONE == obj.getCompanyType()) { @@ -285,7 +293,7 @@ return retentionVoList; } private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) { private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) { //是否是数字 // boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords()); // //是否包含中文 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -279,7 +279,7 @@ platformWmsJobMapper.insert(job); jobList.add(model); } jobIdList.add(job.getId()); jobIdList.add(job.getJobId()); if(param.getDetails()!=null && param.getDetails().size()>0){ for(WmsInboundDetailRequest d :param.getDetails()){ PlatformWmsDetail entity = new PlatformWmsDetail(); @@ -497,7 +497,7 @@ job.setDriverName(param.getDriverName()); platformWmsJobMapper.insert(job); } jobIdList.add(job.getId()); jobIdList.add(job.getJobId()); if(param.getDetails()!=null && param.getDetails().size()>0){ for(WmsOutboundDetailRequest d :param.getDetails()){ PlatformWmsDetail entity = new PlatformWmsDetail(); @@ -724,7 +724,6 @@ for(PlatformWmsDetail d :details){ num = num.add(Constants.formatBigdecimal(d.getIoQty())); } } platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda() .set(PlatformJob::getTotalNum,num)
