product-inventory-management-after.git

			@@ -38,14 +38,14 @@
			/**
			* 跟进程度
			*/
			@Excel(name = "跟进程度")
			// @Excel(name = "跟进程度")
			@TableField(exist = false)
			private String followUpLevel;

			/**
			* 跟进时间
			*/
			@Excel(name = "跟进时间")
			// @Excel(name = "跟进时间")
			@TableField(exist = false)
			private LocalDateTime followUpTime;

			@@ -92,7 +92,7 @@
			* 维护时间
			*/
			@JsonFormat(pattern = "yyyy-MM-dd")
			@Excel(name = "维护时间" , width = 30, dateFormat = "yyyy-MM-dd")
			@Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
			private Date maintenanceTime;

			@TableField(fill = FieldFill.INSERT)

			@@ -173,17 +173,17 @@
			c.setAddressPhone(address + "(" + phone + ")");

			// 查询最新的跟进记录
			CustomerFollowUp followUp = customerFollowUpService.getOne(
			new LambdaQueryWrapper<CustomerFollowUp>()
			.eq(CustomerFollowUp::getCustomerId, c.getId())
			.orderByDesc(CustomerFollowUp::getFollowUpTime)
			.last("LIMIT 1")
			);

			if (followUp != null) {
			c.setFollowUpLevel(followUp.getFollowUpLevel());
			c.setFollowUpTime(followUp.getFollowUpTime());
			}
			// CustomerFollowUp followUp = customerFollowUpService.getOne(
			// new LambdaQueryWrapper<CustomerFollowUp>()
			// .eq(CustomerFollowUp::getCustomerId, c.getId())
			// .orderByDesc(CustomerFollowUp::getFollowUpTime)
			// .last("LIMIT 1")
			// );
			//
			// if (followUp != null) {
			// c.setFollowUpLevel(followUp.getFollowUpLevel());
			// c.setFollowUpTime(followUp.getFollowUpTime());
			// }
			})
			.collect(Collectors.toList());

	src/main/java/com/ruoyi/basic/pojo/Customer.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史