java/zhihuishenqu.git

			@@ -46,8 +46,10 @@
			if (quantity <= 0) {
			throw new ServiceException("捐赠数量有误");
			}
			if (StringUtils.isEmpty(warehouseDonatesExcelVO.getName())
			\|\| isNull(warehouseDonatesExcelVO.getIsAnonymous())) {
			if (isNull(warehouseDonatesExcelVO.getIsAnonymous())) {
			warehouseDonatesExcelVO.setIsAnonymous("否");
			}
			if (StringUtils.isEmpty(warehouseDonatesExcelVO.getName())) {
			warehouseDonatesExcelVO.setIsAnonymous("是");
			}
			if (isNull(warehouseDonatesExcelVO.getSigningAt())) {

			@@ -1,5 +1,6 @@
			package com.panzhihua.common.model.vos.community.warehouse;

			import com.alibaba.excel.annotation.ExcelIgnore;
			import com.alibaba.excel.annotation.ExcelProperty;
			import com.alibaba.excel.converters.string.StringImageConverter;
			import com.fasterxml.jackson.annotation.JsonFormat;
			@@ -47,7 +48,7 @@
			/**
			* 领取图片
			*/
			@ExcelProperty(value = "领取图片",index = 11)
			@ExcelIgnore
			private URL receiveUrl;

			/**
			@@ -97,7 +98,7 @@
			/**
			* 物品图片
			*/
			@ExcelProperty(value = "物品图片",index = 5)
			@ExcelIgnore
			private URL image;

			public void setStatus(String status) {

			@@ -108,9 +108,8 @@

			<select id="list" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.AppVisitTasksVO">
			SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.grid_menber_tele,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,u.name as creator,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
			p.card_no_str,vt.exception,p.name,REPLACE(cmpct.label,',','#')
			p.card_no_str,vt.exception,p.name
			FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id
			left join com_mng_population_community_tags AS cmpct on p.id = cmpct.population_id
			left join sys_user u on vt.create_by = u.user_id
			WHERE 1=1
			<if test = "query.visiterId !=null">

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseApplyExcelVO.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史