productDev/dmvisit.git

			@@ -478,7 +478,7 @@
			List<String> memberNameList =memberList.stream().map(m->m.getName()).collect(Collectors.toList());
			String memberNames = String.join(",",memberNameList);
			Integer noticeType = Constants.approveTypeToNoticeType(approveTempl.getType());
			String title = "【访客申请】申请人 - ";
			String title = "[访客申请]申请人-";
			Map<String,Object> jsonMap = new HashMap<>();
			for (int j = 0; j < memberList.size(); j++) {
			Member member = memberList.get(j);
			@@ -541,7 +541,7 @@
			approve.setChekorId(memberId);
			approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
			approve.setStatusInfo(i==0?"审批中":"处理中");
			approve.setTitle("审批人");
			approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"审批中":approveParam.getRemark());
			approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
			approve.setObjId(businessId);
			approve.setLevel(i+1);
			@@ -577,7 +577,7 @@
			if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){
			title = title + visits.getName();
			}else{
			title = "【访客报备】申请人 - " + visits.getName();
			title = "[访客报备]申请人-" + visits.getName();
			}
			jsonMap.put("name", "访问人:" + visits.getCompanyName() + " - " + visits.getReceptMemberName());
			jsonMap.put("sTime", "入园时间:" + DateUtil.DateToStr(visits.getStarttime() , "yyyy-MM-dd HH:mm"));
			@@ -598,7 +598,7 @@
			if(Objects.isNull(carUseBook)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到业务数据信息");
			}
			title = "【用车申请】申请人 - " + carUseBook.getMemberName();
			title = "[用车申请]申请人-" + carUseBook.getMemberName();
			jsonMap.put("name", "申请人:" + carUseBook.getCompanyName() + " - " + carUseBook.getMemberName());
			jsonMap.put("sTime", "开始时间:" + DateUtil.DateToStr(carUseBook.getStartTime() , "yyyy-MM-dd HH:mm"));
			jsonMap.put("eTime", "结束时间:" + DateUtil.DateToStr(carUseBook.getEndTime() , "yyyy-MM-dd HH:mm"));
			@@ -610,7 +610,7 @@
			if(Objects.isNull(platformBooks)){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到业务数据信息");
			}
			title = "【物流车入园预约】申请人 - " + platformBooks.getDriverName();
			title = "[物流车入园预约]申请人-" + platformBooks.getDriverName();
			jsonMap.put("inType", "入库类型："+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"整托盘":"件烟"));
			jsonMap.put("totalNum", "总运输量："+platformBooks.getTotalNum()+"万支");
			jsonMap.put("arriveDate", "到场时间：" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
			@@ -856,11 +856,11 @@
			Approve waitModel = new Approve();
			waitModel.setApproveType(Constants.ZERO);
			if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
			waitModel.setStatus(Constants.approveStatus.pass);
			waitModel.setStatus(level.getStatus());
			waitModel.setType(Constants.ONE);
			waitModel.setTitle("审批人（抄送或签审批人）");
			}else{
			waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO);
			waitModel.setStatus(level.getStatus());
			waitModel.setType(Constants.ZERO);
			//waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人");
			waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"审批人"):"抄送或签审批人");
			@@ -881,6 +881,7 @@
			waitModel.setMemberName(waitList.size() +"人或签");
			waitModel.setStatusInfo("待处理");
			}else{
			waitModel.setMemberName(waitList.size() +"人或签");
			waitModel.setStatusInfo("处理中");
			}
			waitModel.setApproveList(approveList);
			@@ -1174,7 +1175,7 @@
			noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
			.set(Notices::getEditDate,new Date())
			.set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
			.set(Notices::getInfo,"审批未通过")
			.set(Notices::getInfo,"已拒绝")
			.set(Notices::getReaded,Constants.ONE)
			.set(Notices::getParam2,Constants.TWO)
			.set(Notices::getStatus,Constants.ONE)
			@@ -1187,7 +1188,7 @@
			.set(Notices::getSendacopy,Constants.ONE)
			.set(Notices::getStatus,Constants.ONE)
			.set(Notices::getParam2,Constants.TWO)
			.set(Notices::getInfo,"审批未通过")
			.set(Notices::getInfo,"已拒绝")
			.eq(Notices::getObjId,notices.getObjId())
			.eq(Notices::getObjType,notices.getObjType())
			.eq(Notices::getReaded,Constants.ZERO)
			@@ -1297,6 +1298,7 @@
			.set(Notices::getEditDate,new Date())
			.set(Notices::getReaded,Constants.ONE)
			.set(Notices::getStatus,Constants.ONE)
			.set(Notices::getInfo,Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?"已通过":"已拒绝")
			.set(dealBusinessBean,Notices::getParam2,Constants.ONE)
			.set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
			.eq(Notices::getId,notices.getId())
			@@ -1345,7 +1347,7 @@
			//更新该业务数据的所有记录信息
			noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
			.set(!dealBusinessBean,Notices::getInfo,info)
			.set(dealBusinessBean,Notices::getInfo,"审批通过")
			.set(dealBusinessBean,Notices::getInfo,"已通过")
			.set(Notices::getParam5,memberNames)
			.eq(Notices::getObjId,notices.getObjId())
			.eq(Notices::getObjType,notices.getObjType()));
			@@ -1361,7 +1363,7 @@
			copyNotices.setEditDate(new Date());
			copyNotices.setParam2("2");
			copyNotices.setParam3("");
			copyNotices.setInfo("审批通过");
			copyNotices.setInfo("已通过");
			copyNotices.setUserId(copyApprove.getChekorId());
			copyNotices.setStatus(Constants.ZERO);
			copyNotices.setSendacopy(Constants.ONE);