Merge remote-tracking branch 'origin/dev' into dev

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/domain/dto/DmVisitCommonDto.java

@@ -30,6 +30,8 @@ public class DmVisitCommonDto {
 
     private String reason;
 
+    private Long recordId;
+
 
     @Override
     public String toString() {

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java

@@ -6,6 +6,7 @@ import com.xueyi.common.core.constant.basic.ServiceConstants;
 import com.xueyi.system.api.organize.feign.factory.RemoteUserFallbackFactory;
 import com.xueyi.system.api.staff.domain.dto.DmVisitCommonDto;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +30,9 @@ public interface RemoteVisitorService {
     public JSONObject newVisit(@RequestBody DmVisitCommonDto commonDto,
                                @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @DeleteMapping(value = "/visit/inner-api/del-visitor")
+    public JSONObject delVisit(@RequestBody DmVisitCommonDto commonDto,
+                               @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
     @GetMapping(value = "/visit/inner-api/sms-config")
     public JSONObject smsConfig(@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmStaffInnerApiController.java

@@ -35,7 +35,7 @@ public class DmStaffInnerApiController extends BaseApiController {
         if (dmStaff!= null) {
             return outputSuccess(dmStaff).toJSON();
         }
-        return output(ResponseCode.DATA_NOT_EXISTS,"员工").toJSON();
+        return output(ResponseCode.DATA_NOT_EXISTS,"指定ID的员工").toJSON();
     }
 
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java

@@ -10,6 +10,7 @@ import com.xueyi.system.staff.mapper.DmStaffMapper;
 import com.xueyi.system.staff.mapper.DmVisitRecordsMapper;
 import com.xueyi.system.staff.mapper.DmVisitorsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -74,6 +75,13 @@ public class DmVisitorApiController extends BaseApiController {
         return visitorService.newVisit(commonDto, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
     }
 
+    @DeleteMapping(value = "del-visitor")
+    @ResponseBody
+    public JSONObject del(@RequestBody DmVisitCommonDto commonDto){
+        DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(commonDto.getDevId());
+        return visitorService.delVisit(commonDto, vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);
+    }
+
     @GetMapping(value = "sms-config/{devId}")
     @ResponseBody
     public JSONObject smsConfig(@PathVariable("devId") String devId){

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

@@ -37,6 +37,7 @@ import com.xueyi.system.staff.mapper.DmVisitorSmsConfigMapper;
 import com.xueyi.system.staff.mapper.DmVisitorsMapper;
 import com.xueyi.system.staff.service.impl.DmVisitRecordsServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -200,6 +201,23 @@ public class DmVisitorInnerApiController extends BaseApiController {
         return outputSuccess().toJSON();
     }
 
+
+    @InnerAuth
+    @DeleteMapping(value = "del-visitor")
+    public com.alibaba.fastjson2.JSONObject delVisit(@RequestBody  DmVisitCommonDto commonDto){
+        if (null != commonDto && null != commonDto.getRecordId()){
+            DmVisitRecordsDto recordsDto = visitRecordsService.selectById(commonDto.getRecordId());
+            if (null!= recordsDto){
+                visitRecordsService.deleteById(commonDto.getRecordId());
+                return outputSuccess("邀约记录删除成功").toJSON();
+            } else {
+                return  output(ResponseCode.DATA_NOT_EXISTS, "邀约记录").toJSON();
+            }
+        } else {
+            return  output(ResponseCode.ILLEGAL_PARAMETER, "recordId").toJSON();
+        }
+    }
+
     @InnerAuth
     @GetMapping(value = "sms-config")
     public com.alibaba.fastjson2.JSONObject smsConfig(){
@@ -249,26 +267,27 @@ public class DmVisitorInnerApiController extends BaseApiController {
     @GetMapping(value = "list-all")
     public com.alibaba.fastjson2.JSONObject  visitListAll(){
         List<DmVisitRecordsPo> v = dmVisitRecordsMapper.findList();
-
         JSONObject json = new JSONObject();
         List<DmVisitRecordsDto> dtos = new ArrayList<>();
 
         v.forEach(item->{
-            DmStaffPo e = dmStaffMapper.selectById(item.getUserId());
-            DmVisitRecordsDto d = recordsConverter.mapperDto(item);
-            if (null != e) {
-                d.setUserPhone(e.getPhone());
-                d.setUserName(e.getUserName());
-            }
+            if (null != item && null!=item.getUserId()) {
+                DmStaffPo e = dmStaffMapper.selectById(item.getUserId());
+                DmVisitRecordsDto d = recordsConverter.mapperDto(item);
+                if (null != e) {
+                    d.setUserPhone(e.getPhone());
+                    d.setUserName(e.getUserName());
+                }
 
-            DmVisitorsPo visitorsPo = dmVisitorsMapper.selectById(item.getVisitorId());
-            if (null != visitorsPo) {
-                d.setVisitorName(visitorsPo.getName());
-            }
-            if (null != item.getVisitDate()) {
-                d.setVisitDateStr(DateUtils.formatDate(item.getVisitDate(), "yyyy-MM-dd"));
+                DmVisitorsPo visitorsPo = dmVisitorsMapper.selectById(item.getVisitorId());
+                if (null != visitorsPo) {
+                    d.setVisitorName(visitorsPo.getName());
+                }
+                if (null != item.getVisitDate()) {
+                    d.setVisitDateStr(DateUtils.formatDate(item.getVisitDate(), "yyyy-MM-dd"));
+                }
+                dtos.add(d);
             }
-            dtos.add(d);
         });
         json.put("data", dtos);
 

xueyi-modules/xueyi-system/src/main/resources/mapper/staff/DmVisitRecordsMapper.xml

@@ -4,15 +4,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xueyi.system.staff.mapper.DmVisitRecordsMapper">
     <select id="findByName" parameterType="Object" resultType="DmVisitRecordsPo">
-        select * from dm_visit_records u where u.visit_date = CURRENT_DATE AND u.visitor_code = #{visitorName} limit 1
+        select * from dm_visit_records u where u.visit_date = CURRENT_DATE AND u.visitor_code = #{visitorName} AND del_flag=0 limit 1
     </select>
 
     <select id="findByEmp" parameterType="Object" resultType="DmVisitRecordsPo">
-        select * from dm_visit_records u where u.user_id = #{userId} and (visit_date >= CURRENT_DATE or create_time >= CURRENT_DATE)
+        select * from dm_visit_records u where u.user_id = #{userId} and (visit_date >= CURRENT_DATE or create_time >= CURRENT_DATE) AND del_flag=0
     </select>
 
     <select id="findList" parameterType="Object" resultType="DmVisitRecordsPo">
-        select * from dm_visit_records u where (visit_date >= CURRENT_DATE or create_time >= CURRENT_DATE)
+        select * from dm_visit_records u where (visit_date >= CURRENT_DATE or create_time >= CURRENT_DATE) AND del_flag=0
     </select>
 
 </mapper>