server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -67,8 +67,13 @@ @ApiModelProperty(value = "访客二维码") private String qrcode; @ApiModelProperty(value = "类型 0非施工人员访客申请 1施工人员访客申请 2访客报备", example = "1") private Integer type; @ApiModelProperty(value = "施工事由") private String constructionReason; @ApiModelProperty(value = "审批信息数据") @TableField(exist = false) private ApproveDataVO approveDateVO;
@@ -309,8 +309,10 @@ if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"处理人非当前人员！"); } if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"数据状态错误！"); } //整改前文件 if(hiddenDanger.getStatus().equals(Constants.ONE)){ List<Multifile> beforList = hiddenDanger.getDealBeforeFileList(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(beforList)){ for (int i = 0; i < beforList.size(); i++) { @@ -324,7 +326,7 @@ multifileMapper.insert(multifile); } } } if(hiddenDanger.getStatus().equals(Constants.ONE)){ List<Multifile> afterList = hiddenDanger.getDealAfterFileList(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(afterList)){ for (int i = 0; i < afterList.size(); i++) { @@ -338,6 +340,7 @@ multifileMapper.insert(multifile); } } } hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId()); hiddenDanger.setEditDate(new Date()); hiddenDangerMapper.updateById(hiddenDanger); @@ -347,7 +350,7 @@ hiddenDangerLog.setCreateDate(new Date()); hiddenDangerLog.setCreator(hiddenDanger.getCreator()); hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId()); hiddenDangerLog.setTitle(hiddenDanger.getStatus().equals(Constants.ONE)?"隐患处理":"隐患转交"); hiddenDangerLog.setTitle(hiddenDanger.getStatus().equals(Constants.ONE)?"隐患处理":"隐患退回"); hiddenDangerLog.setObjType(hiddenDanger.getStatus().equals(Constants.ONE)?Constants.FOUR:Constants.TWO); hiddenDangerLogMapper.insert(hiddenDangerLog); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -238,7 +238,7 @@ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(), systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode()); }else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){ visits.setStatus(Constants.VisitStatus.pass); visits.setStatus(Constants.VisitStatus.waitCheck); visitsMapper.updateById(visits); approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId()); }else{ @@ -1143,6 +1143,8 @@ queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO); queryWrapper.eq(pageWrap.getModel().getType()!=null,Visits::getType,pageWrap.getModel().getType()); queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Visits::getType,pageWrap.getModel().getType()); queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Visits::getOpenid,pageWrap.getModel().getOpenid()); queryWrapper.eq(StringUtils.isBlank(pageWrap.getModel().getOpenid()),"1","2"); queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getName()),ms->ms.like(Visits::getName,pageWrap.getModel().getName()) .or().like(Visits::getPhone,pageWrap.getModel().getName())) .eq(StringUtils.isNotBlank(pageWrap.getModel().getIdcardNo()),Visits::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, pageWrap.getModel().getIdcardNo())) @@ -1240,6 +1242,8 @@ visitDetailVO.setName(visits.getName()); visitDetailVO.setCompanyName(visits.getCompanyName()); visitDetailVO.setFaceImg(visits.getFaceImg()); visitDetailVO.setType(visits.getType()); visitDetailVO.setConstructionReason(visits.getConstructionReason()); visitDetailVO.setImgUrl(visits.getImgurl()); visitDetailVO.setIdCardDecode(visits.getIdcardDecode()); visitDetailVO.setPrefix(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
