最新版本

jiangping

2024-06-11 c3c67ee9e88c579e8ac784821ab41f58d0372ebb

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -182,13 +182,14 @@
                .last("limit 1"  );
        CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
        ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
                model.getType().equals(Constants.ZERO)?3:4,
                Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
                memberId);
        List<Approve> approveList = approveDataVO.getApproveList();
        if(Constants.equalsInteger(model.getStatus(),Constants.FOUR)){
            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
            Member member = memberMapper.selectById(model.getCancelUser());
            Member member1 = memberMapper.selectById(model.getCancelUser());

            Approve approve = new Approve();
            approve.setApproveType(Constants.ZERO);
            approve.setCreateDate(model.getCancelTime());
@@ -196,9 +197,11 @@
            approve.setStatusInfo("已撤销");
            approve.setStatus(Constants.FOUR);
            approve.setType(Constants.ZERO);
            approve.setMemberName(member.getName());
            if(StringUtils.isNotBlank(member.getFaceImg())){
                approve.setFaceImg(path + member.getFaceImg());
            if(member1!=null) {
                approve.setMemberName(member1.getName());
                if (StringUtils.isNotBlank(member1.getFaceImg())) {
                    approve.setFaceImg(path + member1.getFaceImg());
                }
            }
            approve.setCheckInfo(model.getCancelInfo());
            approveList.add(approve);