Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaEventProperties;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonVisitRecord;
-import com.huiju.estateagents.service.ITaEventPropertiesService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaPersonVisitRecordService;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
     public ITaPersonService taPersonService;
     @Autowired
     public ITaEventPropertiesService taEventPropertiesService;
+    @Autowired
+    public ITaBuildingIntentionService buildingIntentionService;
+    @Autowired
+    public ITaPersonIntentionRecordService personIntentionRecordService;
+    @Autowired
+    public ITaBuildingService buildingService;
 
 
     /**
 
         taPersonVisitRecord.setPersonId(person.getPersonId());
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
+        if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
+            QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
+            intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
+            intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
+            List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
+            if (list.size()>0){
+                TaBuildingIntention buildingIntention = list.get(0);
+                TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
+                TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
+                intentionRecord.setBuildingId(buildingIntention.getBuildingId());
+                intentionRecord.setBuildingName(building.getBuildingName());
+                intentionRecord.setCreateDate(LocalDateTime.now());
+                intentionRecord.setEventCode(buildingIntention.getEventCode());
+                intentionRecord.setEventId(buildingIntention.getEventId());
+                intentionRecord.setEventName(buildingIntention.getEventName());
+                intentionRecord.setIntention(buildingIntention.getIntention());
+                intentionRecord.setPersonId(person.getPersonId());
+                intentionRecord.setPersonName(person.getNickname());
+                intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
+                if (!personIntentionRecordService.save(intentionRecord)){
+                    return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
+                }
+            }
+        }
         try {
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
                 return ResponseBean.success(taPersonVisitRecord);

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

 import com.huiju.estateagents.entity.TaEventProperties;
 import com.huiju.estateagents.mapper.TaEventPropertiesMapper;
 import com.huiju.estateagents.service.ITaEventPropertiesService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  */
 @Service
 public class TaEventPropertiesServiceImpl extends ServiceImpl<TaEventPropertiesMapper, TaEventProperties> implements ITaEventPropertiesService {
+
+    @Autowired
+    TaEventPropertiesMapper taEventPropertiesMapper;
+
     @Override
     public Integer isEventExist(String targetId,String eventType,String activity){
-        return 1;
+        return taEventPropertiesMapper.isEventExist(targetId,eventType,activity);
     }
 
 }