java/zhihuishenqu.git

			@@ -1135,7 +1135,7 @@
			@Override
			public R serviceStatic(ServiceStaticDTO serviceStaticDTO) {
			ServiceStaticsVO serviceStaticsVO = new ServiceStaticsVO();
			if (serviceStaticDTO.getCheckUnitId() != null)
			if (serviceStaticDTO.getCheckUnitId() != null && serviceStaticDTO.getCheckUnitId()> 0)
			{
			//单位服务统计
			serviceStaticsVO =
			@@ -1191,12 +1191,14 @@
			{
			//个人服务统计


			ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
			.eq(ComPbMemberDO::getPhone, serviceStaticDTO.getPhone()).last("limit 1"));
			Long checkUnitId = null;
			if (comPbMemberDO != null) {
			checkUnitId = comPbMemberDO.getCheckUnitId();
			}

			serviceStaticsVO = this.baseMapper.selectStatsUser(serviceStaticDTO.getPhone(),checkUnitId+"", serviceStaticDTO.getYear());

			List<ServiceDetailStaticsVO> serviceDetailStaticsVOList=this.baseMapper.selectServiceDetailListForPersonal(checkUnitId, serviceStaticDTO.getPhone(),

			@@ -415,7 +415,7 @@
			AND su1.phone = #{phone}
			AND canc.order_time BETWEEN concat( #{date}, '-01-01 00:00:00' )
			AND concat( #{date}, '-12-31 23:59:59' )
			<if test="checkUnitId != null">
			<if test="checkUnitId != null and checkUnitId != '' ">
			UNION ALL
			SELECT
			a.id AS serviceId,
			@@ -450,7 +450,6 @@
			WHERE
			s.end_time IS NOT NULL
			AND a.check_unit_id IS NOT NULL
			AND s.sign_identity != 2
			AND su.phone = #{phone}
			AND s.start_time BETWEEN concat( #{date}, '-01-01 00:00:00' )
			AND concat( #{date}, '-12-31 23:59:59' )
			@@ -468,7 +467,7 @@
			LEFT JOIN sys_user su ON su.user_id = s.user_id
			WHERE
			s.end_time IS NOT NULL
			AND a.check_unit_id IS NULL
			AND s.check_unit_id IS NULL
			AND s.sign_identity = 2
			AND su.phone = #{phone}
			AND s.start_time BETWEEN concat( #{date}, '-01-01 00:00:00' )

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史