更新访客预约
This commit is contained in:
@@ -6,6 +6,8 @@ import com.example.mini_program.service.AppointmentService;
|
||||
import com.example.mini_program.vo.ReceptionPersonVo;
|
||||
import com.example.mini_program.vo.VisitApplicationVo;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
@@ -14,6 +16,7 @@ import java.util.List;
|
||||
@RequestMapping("/api/wx-mini/appointment")
|
||||
@RequiredArgsConstructor
|
||||
public class AppointmentController {
|
||||
private static final Logger log = LoggerFactory.getLogger(VisitorApprovalController.class);
|
||||
|
||||
private final AppointmentService appointmentService;
|
||||
|
||||
@@ -34,6 +37,7 @@ public class AppointmentController {
|
||||
*/
|
||||
@GetMapping("/detail")
|
||||
public Result<VisitApplication> getDetail(@RequestParam String id) {
|
||||
log.info("获取预约记录详情, id={}", id);
|
||||
if (id == null || id.trim().isEmpty()) {
|
||||
return Result.error("id不能为空");
|
||||
}
|
||||
@@ -107,7 +111,6 @@ public class AppointmentController {
|
||||
*/
|
||||
@GetMapping("/person/selector")
|
||||
public Result<List<ReceptionPersonVo>> personSelector(@RequestParam String department) {
|
||||
System.out.println("----------------------------------");
|
||||
// 异步处理,立即返回
|
||||
List<ReceptionPersonVo> list = appointmentService.personSelector(department);
|
||||
return Result.success(list);
|
||||
|
||||
@@ -19,7 +19,7 @@ public class VisitApplication {
|
||||
private String visitTime;
|
||||
|
||||
private String hostName;
|
||||
private String receptionPersonId;
|
||||
private String personId;
|
||||
private String area;
|
||||
private String status;
|
||||
private String statusText;
|
||||
|
||||
@@ -129,7 +129,7 @@ public class VisitorApprovalService {
|
||||
}
|
||||
visitApplicationMapper.updateCheckStatusById(id, "1");
|
||||
//受访者企微id
|
||||
String receptionPersonId = record.getReceptionPersonId();
|
||||
String receptionPersonId = record.getPersonId();
|
||||
if (receptionPersonId == null || receptionPersonId.isEmpty()) {
|
||||
log.warn("通知受访者访客已到达】受访者ID为空, id={}", id);
|
||||
return;
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
server:
|
||||
port: 8080
|
||||
port: 8091
|
||||
ssl:
|
||||
enabled: true
|
||||
key-store: classpath:bmser.com.pfx
|
||||
key-store-type: PKCS12
|
||||
key-store-password: zl7cs0dp
|
||||
protocol: TLS
|
||||
enabled-protocols: TLSv1.2,TLSv1.3
|
||||
|
||||
spring:
|
||||
application:
|
||||
name: mini_program
|
||||
datasource:
|
||||
url: jdbc:mysql://txy.588580.xyz:3306/mini?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
|
||||
username: root
|
||||
password: 271922abF
|
||||
url: jdbc:mysql://10.30.1.208:3306/mini?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
|
||||
username: chenglijuan
|
||||
password: 271922abf
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
|
||||
# 微信小程序配置
|
||||
|
||||
Binary file not shown.
@@ -11,7 +11,7 @@
|
||||
<result column="visit_date" property="visitDate"/>
|
||||
<result column="visit_time" property="visitTime"/>
|
||||
<result column="host_name" property="hostName"/>
|
||||
<result column="reception_person_id" property="receptionPersonId"/>
|
||||
<result column="person_id" property="personId"/>
|
||||
<result column="area" property="area"/>
|
||||
<result column="status" property="status"/>
|
||||
<result column="status_text" property="statusText"/>
|
||||
@@ -22,7 +22,7 @@
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
id, name, phone, company, reason,reception_person_id,check_status,
|
||||
id, name, phone, company, reason,person_id,check_status,
|
||||
DATE_FORMAT(visit_date, '%Y-%m-%d') AS visit_date,
|
||||
DATE_FORMAT(visit_time, '%H:%i') AS visit_time,
|
||||
host_name, area, status, status_text, openid,
|
||||
@@ -66,10 +66,10 @@
|
||||
<insert id="insert">
|
||||
INSERT INTO visit_application (id, name, phone, company, reason,
|
||||
visit_date, visit_time, host_name, area,
|
||||
status, status_text, openid, create_time, sp_no)
|
||||
status, status_text, openid, create_time, sp_no,person_id)
|
||||
VALUES (#{id}, #{name}, #{phone}, #{company}, #{reason},
|
||||
#{visitDate}, #{visitTime}, #{hostName}, #{area},
|
||||
#{status}, #{statusText}, #{openid}, NOW(), #{spNo})
|
||||
#{status}, #{statusText}, #{openid}, NOW(), #{spNo},#{personId})
|
||||
</insert>
|
||||
|
||||
<update id="updateStatusToCancelled">
|
||||
|
||||
Reference in New Issue
Block a user