diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java index 7274405..ce87f10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java @@ -41,4 +41,6 @@ int saveOrUpdateStaffInfoBatch(@Param("personList") List personList); List selectForPersonList(@Param("personListRequest") PersonListRequest personListRequest); + + String selectCodeByNo(@Param("staffCode") String staffCode); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java index 7274405..ce87f10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java @@ -41,4 +41,6 @@ int saveOrUpdateStaffInfoBatch(@Param("personList") List personList); List selectForPersonList(@Param("personListRequest") PersonListRequest personListRequest); + + String selectCodeByNo(@Param("staffCode") String staffCode); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml index 162dfea..1bc8a2e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml @@ -116,4 +116,10 @@ limit 50 + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java index 7274405..ce87f10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java @@ -41,4 +41,6 @@ int saveOrUpdateStaffInfoBatch(@Param("personList") List personList); List selectForPersonList(@Param("personListRequest") PersonListRequest personListRequest); + + String selectCodeByNo(@Param("staffCode") String staffCode); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml index 162dfea..1bc8a2e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml @@ -116,4 +116,10 @@ limit 50 + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java index c1eb85d..244cb2a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java @@ -28,7 +28,7 @@ @TableName("bus_visit_apply") public class VisitorApply { //申请单号 - @ExcelProperty("申请单号") + @ExcelProperty("访客申请单号") private String listCode; //申请类型(字典code) private String applicationType; @@ -41,7 +41,7 @@ private Long id; @ExcelProperty("访客姓名") private String visitorName; - @ExcelProperty("访客性别") +// @ExcelProperty("访客性别") private String visitorGender; @ExcelProperty("访客身份证") private String idCard; @@ -54,23 +54,23 @@ @ExcelProperty("访问楼栋") @TableField(exist = false) private String visitPositionName; - @ExcelProperty("备注") - private String remarks; - private String status; - @ExcelProperty("状态") - @TableField(exist = false) - private String statusName; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; @ExcelProperty("申请者工号") private String staffCode; @ExcelProperty("申请者姓名") private String staffName; @ExcelProperty("申请者联系方式") private String staffPhone; - @ExcelProperty("访问开始时间") - private String inTime; - @ExcelProperty("访问结束时间") - private String outTime; + + private String status; + @ExcelProperty("状态") + @TableField(exist = false) + private String statusName; + //海康预约记录id private String appointRecordId; //海康被访人唯一标识,即被访人工号 @@ -85,6 +85,9 @@ private String createTime; private String updateTime; + @ExcelProperty("备注") + private String remarks; + @TableField(exist = false) private List ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java index 7274405..ce87f10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java @@ -41,4 +41,6 @@ int saveOrUpdateStaffInfoBatch(@Param("personList") List personList); List selectForPersonList(@Param("personListRequest") PersonListRequest personListRequest); + + String selectCodeByNo(@Param("staffCode") String staffCode); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml index 162dfea..1bc8a2e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml @@ -116,4 +116,10 @@ limit 50 + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java index c1eb85d..244cb2a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java @@ -28,7 +28,7 @@ @TableName("bus_visit_apply") public class VisitorApply { //申请单号 - @ExcelProperty("申请单号") + @ExcelProperty("访客申请单号") private String listCode; //申请类型(字典code) private String applicationType; @@ -41,7 +41,7 @@ private Long id; @ExcelProperty("访客姓名") private String visitorName; - @ExcelProperty("访客性别") +// @ExcelProperty("访客性别") private String visitorGender; @ExcelProperty("访客身份证") private String idCard; @@ -54,23 +54,23 @@ @ExcelProperty("访问楼栋") @TableField(exist = false) private String visitPositionName; - @ExcelProperty("备注") - private String remarks; - private String status; - @ExcelProperty("状态") - @TableField(exist = false) - private String statusName; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; @ExcelProperty("申请者工号") private String staffCode; @ExcelProperty("申请者姓名") private String staffName; @ExcelProperty("申请者联系方式") private String staffPhone; - @ExcelProperty("访问开始时间") - private String inTime; - @ExcelProperty("访问结束时间") - private String outTime; + + private String status; + @ExcelProperty("状态") + @TableField(exist = false) + private String statusName; + //海康预约记录id private String appointRecordId; //海康被访人唯一标识,即被访人工号 @@ -85,6 +85,9 @@ private String createTime; private String updateTime; + @ExcelProperty("备注") + private String remarks; + @TableField(exist = false) private List ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java index 4b8e0b4..2e3c478 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.config.PositionPrivilegeInitCache; +import com.casic.missiles.modular.dao.StaffInfoMapper; import com.casic.missiles.modular.dao.VisitorApplyMapper; import com.casic.missiles.modular.dto.VisitorApplyRequest; import com.casic.missiles.modular.dto.hik.AppointmentFreeRegisterRequest; @@ -58,6 +59,8 @@ private Validator validator; @Resource private PositionPrivilegeInitCache positionPrivilegeInitCache; + @Autowired + private StaffInfoMapper staffInfoMapper; @Override public List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest) { @@ -288,7 +291,12 @@ DateTime outTimeDate = DateUtil.parse(busConcentrator.getOutTime()); String outTimeISODate = DateUtil.format(outTimeDate, "yyyy-MM-dd'T'HH:mm:ssXXX"); AppointmentFreeRegisterRequest appointmentFreeRegisterRequest = new AppointmentFreeRegisterRequest(); - appointmentFreeRegisterRequest.setReceptionistId(busConcentrator.getStaffCode()); + //表格中的code是员工号job_no + String code = staffInfoMapper.selectCodeByNo(busConcentrator.getStaffCode()); + if(StringUtils.isEmpty(code)){ + list.add(" 第" + index[0] + "行,员工号不存在"); + } + appointmentFreeRegisterRequest.setReceptionistId(code); appointmentFreeRegisterRequest.setPersonNum(1); appointmentFreeRegisterRequest.setVisitStartTime(inTimeISODate); appointmentFreeRegisterRequest.setVisitEndTime(outTimeISODate); @@ -325,6 +333,9 @@ String orderId = String.valueOf(jsonData.get("orderId")); String picUri = String.valueOf(jsonData.get("picUri")); for (VisitorApply result : results) { + result.setApplicationType(result.getApplicationTypeName()); + result.setVisitPosition(result.getVisitPositionName()); + result.setStatus(result.getStatusName()); //身份证判断同一访客,设置访客信息 if(result.getIdCard().equals(app.getVisitorInfo().getCertificateNo())){ result.setAppointRecordId(appointRecordId); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java index 7274405..ce87f10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/StaffInfoMapper.java @@ -41,4 +41,6 @@ int saveOrUpdateStaffInfoBatch(@Param("personList") List personList); List selectForPersonList(@Param("personListRequest") PersonListRequest personListRequest); + + String selectCodeByNo(@Param("staffCode") String staffCode); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml index 162dfea..1bc8a2e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/dao/mapping/StaffInfoMapper.xml @@ -116,4 +116,10 @@ limit 50 + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java index c1eb85d..244cb2a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/model/VisitorApply.java @@ -28,7 +28,7 @@ @TableName("bus_visit_apply") public class VisitorApply { //申请单号 - @ExcelProperty("申请单号") + @ExcelProperty("访客申请单号") private String listCode; //申请类型(字典code) private String applicationType; @@ -41,7 +41,7 @@ private Long id; @ExcelProperty("访客姓名") private String visitorName; - @ExcelProperty("访客性别") +// @ExcelProperty("访客性别") private String visitorGender; @ExcelProperty("访客身份证") private String idCard; @@ -54,23 +54,23 @@ @ExcelProperty("访问楼栋") @TableField(exist = false) private String visitPositionName; - @ExcelProperty("备注") - private String remarks; - private String status; - @ExcelProperty("状态") - @TableField(exist = false) - private String statusName; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; @ExcelProperty("申请者工号") private String staffCode; @ExcelProperty("申请者姓名") private String staffName; @ExcelProperty("申请者联系方式") private String staffPhone; - @ExcelProperty("访问开始时间") - private String inTime; - @ExcelProperty("访问结束时间") - private String outTime; + + private String status; + @ExcelProperty("状态") + @TableField(exist = false) + private String statusName; + //海康预约记录id private String appointRecordId; //海康被访人唯一标识,即被访人工号 @@ -85,6 +85,9 @@ private String createTime; private String updateTime; + @ExcelProperty("备注") + private String remarks; + @TableField(exist = false) private List ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java index 4b8e0b4..2e3c478 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/service/impl/VisitorApplyServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.config.PositionPrivilegeInitCache; +import com.casic.missiles.modular.dao.StaffInfoMapper; import com.casic.missiles.modular.dao.VisitorApplyMapper; import com.casic.missiles.modular.dto.VisitorApplyRequest; import com.casic.missiles.modular.dto.hik.AppointmentFreeRegisterRequest; @@ -58,6 +59,8 @@ private Validator validator; @Resource private PositionPrivilegeInitCache positionPrivilegeInitCache; + @Autowired + private StaffInfoMapper staffInfoMapper; @Override public List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest) { @@ -288,7 +291,12 @@ DateTime outTimeDate = DateUtil.parse(busConcentrator.getOutTime()); String outTimeISODate = DateUtil.format(outTimeDate, "yyyy-MM-dd'T'HH:mm:ssXXX"); AppointmentFreeRegisterRequest appointmentFreeRegisterRequest = new AppointmentFreeRegisterRequest(); - appointmentFreeRegisterRequest.setReceptionistId(busConcentrator.getStaffCode()); + //表格中的code是员工号job_no + String code = staffInfoMapper.selectCodeByNo(busConcentrator.getStaffCode()); + if(StringUtils.isEmpty(code)){ + list.add(" 第" + index[0] + "行,员工号不存在"); + } + appointmentFreeRegisterRequest.setReceptionistId(code); appointmentFreeRegisterRequest.setPersonNum(1); appointmentFreeRegisterRequest.setVisitStartTime(inTimeISODate); appointmentFreeRegisterRequest.setVisitEndTime(outTimeISODate); @@ -325,6 +333,9 @@ String orderId = String.valueOf(jsonData.get("orderId")); String picUri = String.valueOf(jsonData.get("picUri")); for (VisitorApply result : results) { + result.setApplicationType(result.getApplicationTypeName()); + result.setVisitPosition(result.getVisitPositionName()); + result.setStatus(result.getStatusName()); //身份证判断同一访客,设置访客信息 if(result.getIdCard().equals(app.getVisitorInfo().getCertificateNo())){ result.setAppointRecordId(appointRecordId); diff --git a/casic-web/src/main/resources/config/export/VisitorApplyTemp.xlsx b/casic-web/src/main/resources/config/export/VisitorApplyTemp.xlsx index a80210d..aaf6f3e 100644 --- a/casic-web/src/main/resources/config/export/VisitorApplyTemp.xlsx +++ b/casic-web/src/main/resources/config/export/VisitorApplyTemp.xlsx Binary files differ