合并

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -179,7 +179,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setSex(params.getInteger("sex"));
         taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRecommendPerson(params.getString("recommendPerson"));
-        taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        taRecommendCustomer.setBuildingId(params.getString("intention"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
@@ -276,7 +276,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
-        taRecommendCustomer.setIntention(params.getString("intention"));
+        TaBuilding building = taBuildingMapper.selectById(params.getString("buildingId"));
+        taRecommendCustomer.setIntention(building.getBuildingName());
         taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());

src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java

@@ -68,7 +68,7 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 				newVisiteMonthList.add(e);
 			}
 		});
-		statisticMonthlySaveBatch(newVisiteMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
+		statisticMonthlySaveBatch(newVisiteMonthList,nowDate, CommConstant.CUSTOMER_TYPE_VISITE);
 	}
 	
 	/**

src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -57,8 +57,8 @@
           org_id = #{orgId}
         AND customer_type = #{customerType}
         AND (realty_consultant = #{personId} or realty_consultant = #{userId})
-        AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
-        AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
+        AND date_format( create_date, '%Y-%m' ) >= date_format( #{beforeDate}, '%Y-%m' )
+        AND date_format( create_date, '%Y-%m' ) <= date_format( #{nowDate}, '%Y-%m' )
          order by `month`
     </select>
 </mapper>