java/haizhentong.git

			@@ -52,6 +52,7 @@
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.util.ArrayList;
			import java.util.Collections;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			@@ -109,6 +110,7 @@

			@Resource
			private TCrmWarehouseMapper crmWarehouseMapper;


			@Override
			public PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user) {
			@@ -194,7 +196,11 @@
			sTime = split[0] + " 00:00:00";
			eTime = split[1] + " 23:59:59";
			}

			PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
			if(CollectionUtils.isEmpty(supplierClinicId)){
			return pageInfo;
			}
			List<TErpProcurementVo> list = this.baseMapper.pageListWarehouse(query, pageInfo, user, sTime, eTime, supplierClinicId);
			// if (list.isEmpty()) {
			// return pageInfo;
			@@ -450,6 +456,13 @@
			public DetailProcurementVO detailProcurement(String clinicSupplierId, SysUser user, String id) {
			DetailProcurementVO detailProcurementVO = new DetailProcurementVO();
			TErpProcurement tErpProcurement = this.getById(id);
			if (tErpProcurement.getWarehousingUserId()!=null && !tErpProcurement.getWarehousingUserId().isEmpty()) {
			SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(tErpProcurement.getWarehousingUserId()));
			detailProcurementVO.setWarehousingUserName(sysUser.getUserName());
			}
			detailProcurementVO.setWarehousingTime(tErpProcurement.getWarehousingTime());


			detailProcurementVO.setStatus(tErpProcurement.getStatus());
			detailProcurementVO.setCreateTime(tErpProcurement.getCreateTime());
			detailProcurementVO.setSendTime(tErpProcurement.getSendTime());
			@@ -646,6 +659,11 @@
			}

			@Override
			public List<TErpProcurementGoods> branchAdminStatisticsThree(List<String> clinicIds) {
			return this.baseMapper.branchAdminStatisticsThree(clinicIds);
			}

			@Override
			public PageInfo<ClinicProcurementReportVO> clinicProcurementReport(ClinicProcurementReportQuery query) {
			PageInfo<ClinicProcurementReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
			List<ClinicProcurementReportVO> list = this.baseMapper.clinicProcurementReport(query, pageInfo);