java/JiaDianHuiShou.git

			@@ -777,12 +777,12 @@
			wrapper.eq(Franchisee::getIsDelete, 0).orderByDesc(Franchisee::getCreateTime);
			Page<Franchisee> page = wrapper.page(Page.of(dto.getPageNum(), dto.getPageSize()));
			for (Franchisee record : page.getRecords()) {
			if (record.getSiteIds()!=null){
			String[] split = record.getSiteIds().split(",");
			List<Site> list = siteService.lambdaQuery().in(Site::getId, split).list();
			//用 , 拼接
			record.setSiteStr(list.stream().map(Site::getSiteName).collect(Collectors.joining(",")));
			}
			if (record.getSiteIds()!=null){
			String[] split = record.getSiteIds().split(",");
			List<Site> list = siteService.lambdaQuery().in(Site::getId, split).list();
			//用 , 拼接
			record.setSiteStr(list.stream().map(Site::getSiteName).collect(Collectors.joining(",")));
			}


			}

			@@ -388,7 +388,15 @@
			and DATE(o.complete_time) <![CDATA[ <= ]]> #{data.completeTimeEnd}
			</if>
			</where>
			order by o.createTime desc
			<if test="data.completeType != null and data.completeType == 1">
			order by o.complete_time
			</if>
			<if test="data.completeType != null and data.completeType == 2">
			order by o.complete_time desc
			</if>
			<if test="data.completeType == null">
			order by o.createTime desc
			</if>
			</select>

			<select id="excelExportList" resultMap="BaseResultMap">

	ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史