productDev/yunyibao.git

			@@ -1385,6 +1385,8 @@

			@Override
			public PageData<ApplyChange> findPage(PageWrap<ApplyChange> pageWrap) {

			LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
			IPage<ApplyChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
			MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
			Utils.MP.blankToNull(pageWrap.getModel());
			@@ -1392,6 +1394,7 @@
			queryWrapper
			.selectAll(ApplyChange.class)
			.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
			.selectAs( Solutions::getType,InsuranceApply::getSolutionType)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
			@@ -1403,10 +1406,22 @@
			.in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,
			Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
			Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
			.eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
			.eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
			.eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
			.ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
			.le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
			if(loginUserInfo.getType().equals(Constants.TWO)){
			//如果是商户查看
			if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==0){
			queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
			}else if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==1){
			queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
			}else{
			queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
			"t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
			}
			}

			for(PageWrap.SortData sortData: pageWrap.getSorts()) {
			if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
			@@ -1437,6 +1452,7 @@
			.selectAll(ApplyChange.class)
			.selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
			.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
			.selectAs(Solutions::getType,ApplyChange::getSolutionType)
			.selectAs(Company::getName,ApplyChange::getCompanyName)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
			@@ -1452,6 +1468,7 @@
			Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
			// .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
			// .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
			.eq(!Objects.isNull(model.getType()),Solutions::getType,model.getSolutionType())
			.eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
			.eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
			.ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
			@@ -1608,6 +1625,7 @@
			.selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
			.selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
			.selectAs(Solutions::getName,ApplyChange::getSolutionsName)
			.selectAs(Solutions::getType,ApplyChange::getSolutionType)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0 )",ApplyChange::getAddNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1 )",ApplyChange::getDelNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2 )",ApplyChange::getChangeNum)
			@@ -1633,7 +1651,7 @@
			applyChange.setApplyLogList(applyLogList);

			List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
			.eq(Multifile::getObjId,applyChange.getId())
			.eq(Multifile::getObjId,Constants.equalsInteger(applyChange.getSolutionType(),Constants.ZERO)? applyChange.getId():applyChange.getUnionChangeId())
			.in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
			,Constants.MultiFile.CA_PD_PDF.getKey()
			,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))