Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

pom.xml

@@ -108,6 +108,26 @@
 			<artifactId>guava</artifactId>
 			<version>26.0-jre</version>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+
+		<!-- swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.7.0</version>
+		</dependency>
 	</dependencies>
 
 	<profiles>

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -310,14 +310,17 @@ public class TaBuildingDynamicController extends BaseController {
                Integer tempIsCheckin = enlist.getIsCheckin();
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
-                   if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
+                   System.out.println("验证1");
+                   if (tempIsCheckin.equals(CommConstant.STATUS_UNACCALIMED)){
+                       System.out.println("验证2");
                        enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
                        QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
                        customerQueryWrapper.eq("person_id",enlist.getPersonId());
                        customerQueryWrapper.eq("building_id",enlist.getBuildingId());
                        TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
-                       if (recommendCustomer.getStatus() < CommConstant.CUSTOMER_VISITE){
+                       if (recommendCustomer.getStatus().equals(CommConstant.CUSTOMER_REPORT)){
+                           System.out.println("验证3");
                            recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                            recommendCustomer.setArrivalDate(LocalDateTime.now());
                            recommendCustomerService.updateById(recommendCustomer);