productDev/yunyibao.git

			@@ -154,6 +154,13 @@
			.selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
			.selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
			queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");

			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0 ) as addApplyNum ");

			queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
			"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");

			queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
			LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			if(Constants.equalsInteger(user.getType(),Constants.TWO)){
			@@ -618,6 +625,13 @@
			multifile.setFileurl(uploadMultifileDTO.getFileurl());
			multifile.setName(uploadMultifileDTO.getName());
			multifileMapper.insert(multifile);


			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
			ApplyLog log = new ApplyLog(unionApply,applyLogType.getName(), null
			,unionApply.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionApply));
			applyLogMapper.insert(log);

			}


			@@ -842,7 +856,7 @@
			multifileMapper.insert(multifile);
			}

			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_TBD;
			Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_UPLOAD_BXD;
			String info = "";
			if(Objects.nonNull(unionApplyBXDDTO.getStartTime())&&Objects.nonNull(unionApplyBXDDTO.getEndTime())){
			info =applyLogType.getInfo();