From b23a7cc13d3cac4a92dae9a454caa5d315318472 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:01:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 12 ----
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 6 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 10 +++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 124 +++++++++++++++++++++++-----------------
4 files changed, 85 insertions(+), 67 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 8d65a14..d8220d6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -266,8 +266,10 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<MemberQuery> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+// return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ ExcelExporter.build(Member.class).export(memberService.findMemberInfoPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 98ad7d6..1b6595d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -65,14 +65,70 @@
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
- @ExcelColumn(name="濮撳悕",index = 0,width = 12)
+ @ExcelColumn(name="濮撳悕",index = 1,width = 12)
private String name;
+ @ApiModelProperty(value = "鏄惁鏈変汉鑴� ", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鏄惁鏈変汉鑴�",index = 2,width = 8,valueMapping = "0=鏃�;1=鏈�;")
+ private Integer hasFace;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�",index =5 ,width = 12)
+ private String phone;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="韬唤璇佸彿",index = 4,width = 8)
+ private String idcardDecode;
+ @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
+ @ExcelColumn(name="鎬у埆",index = 5,width = 8,valueMapping = "1=鐢�;2=濂�;")
+ private Integer sex;
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ExcelColumn(name="鎵�灞為儴闂�",index = 6,width = 12)
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "宀椾綅鍚嶇О")
+ @ExcelColumn(name="宀椾綅鍚嶇О",index = 7,width = 12)
+ @TableField(exist = false)
+ private String positionName;
+ @ApiModelProperty(value = "鏄惁鍏氬憳 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍏氬憳",index = 8,width = 12,valueMapping = "1=鍏氬憳;2=闈炲厷鍛�;")
+ private Integer isDangyuan;
+ @ApiModelProperty(value = "鍏ヨ亴濡傛湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍏ヨ亴鏃ユ湡",index =9,width = 12, dateFormat = "yyyy-MM-dd")
+ private Date jobDate;
+ @ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ @ExcelColumn(name="鍩硅缁撴潫鏃堕棿",index =10,width = 12, dateFormat = "yyyy-MM-dd")
+ private Date trainEndTime;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ @ExcelColumn(name="閮ㄩ棬绫诲瀷",index = 11,width = 12, valueMapping = "0=鐩稿叧鏂圭粍缁�;1=鍐呴儴缁勭粐;")
+ @TableField(exist = false)
+ private Integer companyType;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
+ @ExcelColumn(name="鍦ㄨ亴鐘舵��",index = 12,width = 12, valueMapping = "0=鍦ㄨ亴;1=绂昏亴;")
+ private Integer workStatus;
+ @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙嫓璁夸汉",index = 13,width = 12, valueMapping = "0=鍚�;1=鏄�;")
+ private Integer canVisit;
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵��",index = 14,width = 12, valueMapping = "0=鏈悓姝�;1=宸插悓姝�;2=鍚屾澶辫触;3=涓嶇鍚堜笅鍙戞潯浠�;4=绛夊緟鍒犻櫎鏉冮檺")
+ private Integer hkStatus;
+ @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ", example = "1")
+ @ExcelColumn(name="娴峰悍鎺堟潈鐘舵��",index = 15,width = 12, valueMapping = "0=鏈巿鏉�;1=宸叉巿鏉�;")
+ private Integer authStatus;
+ @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈�",index = 16,width = 30 )
+ private String roleTimeInfo;
+ @ApiModelProperty(value = "鎸佸崱鏁伴噺")
+ @ExcelColumn(name="鎸佸崱鏁伴噺",index = 17,width = 12)
+ @TableField(exist = false)
+ private int memberCardCount;
+ @ExcelColumn(name="宸ュ彿",index = 17,width = 12)
+ private String code;
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
- @ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�",index = 1,width = 12)
- private String phone;
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@@ -80,27 +136,20 @@
@TableField(exist = false)
private String idcardNoNew;
- @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="韬唤璇佸彿",index = 2,width = 8)
- private String idcardDecode;
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
private Integer idcardType;
@ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
private Integer isDriver;
- @ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿",index = 13,width = 12)
- private String code;
+
@ApiModelProperty(value = "鐝 0鐧界彮 1澶滅彮")
private Integer classes;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
private Integer status;
- @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
- @ExcelColumn(name="鎬у埆",index = 3,width = 8,valueMapping = "1=鐢�;2=濂�;")
- private Integer sex;
+
@ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
private Integer parentId;
@@ -119,22 +168,14 @@
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵��",index = 11,width = 12, valueMapping = "0=鏈悓姝�;1=宸插悓姝�;2=鍚屾澶辫触;3=涓嶇鍚堜笅鍙戞潯浠�;4=绛夊緟鍒犻櫎鏉冮檺")
- private Integer hkStatus;
- @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ", example = "1")
- @ExcelColumn(name="娴峰悍鎺堟潈鐘舵��",index = 12,width = 12, valueMapping = "0=鏈巿鏉�;1=宸叉巿鏉�;")
- private Integer authStatus;
+
+
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
- @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
- @ExcelColumn(name="鍦ㄨ亴鐘舵��",index = 10,width = 12, valueMapping = "0=鍦ㄨ亴;1=绂昏亴;")
- private Integer workStatus;
- @ApiModelProperty(value = "鏄惁鍏氬憳 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍏氬憳",index = 6,width = 12,valueMapping = "1=鍚�;2=鏄�;")
- private Integer isDangyuan;
+
+
@ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
private Integer positionId;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@@ -142,10 +183,6 @@
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
private Date erpDate;
- @ApiModelProperty(value = "鍏ヨ亴濡傛湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @ExcelColumn(name="鍏ヨ亴鏃ユ湡",index = 7,width = 12, dateFormat = "yyyy-MM-dd")
- private Date jobDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
private Integer erpStatus;
@@ -162,9 +199,6 @@
@ApiModelProperty(value = "鐧婚檰瀵嗙爜")
private String passward;
- @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍙嫓璁夸汉",index = 8,width = 12, valueMapping = "0=鍚�;1=鏄�;")
- private Integer canVisit;
@ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1")
private Integer highCheckor;
@@ -181,17 +215,11 @@
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
private String visitCompanyName;
- @ApiModelProperty(value = "缁勭粐鍚嶇О")
- @ExcelColumn(name="鎵�灞為儴闂�",index = 4,width = 12)
- @TableField(exist = false)
- private String companyName;
+
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
private String editorName;
- @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
- @ExcelColumn(name="閮ㄩ棬绫诲瀷",index = 9,width = 12, valueMapping = "0=鍔冲姟鍏徃;1=鍐呴儴缁勭粐;")
- @TableField(exist = false)
- private Integer companyType;
+
@ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
@@ -251,10 +279,7 @@
@ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
@TableField(exist = false)
private Integer headStatus;
- @ApiModelProperty(value = "鎸佸崱鏁伴噺")
- @ExcelColumn(name="鎸佸崱鏁伴噺",index = 14,width = 12)
- @TableField(exist = false)
- private int memberCardCount;
+
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
@TableField(exist = false)
@@ -262,16 +287,11 @@
@ApiModelProperty(value = "鏈�鍚庢搷浣滃唴瀹�")
@TableField(exist = false)
private String optRemark;
- @ApiModelProperty(value = "宀椾綅鍚嶇О")
- @ExcelColumn(name="宀椾綅鍚嶇О",index = 5,width = 12)
- @TableField(exist = false)
- private String positionName;
+
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
@TableField(exist = false)
private Date trainStartTime;
- @ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
- @TableField(exist = false)
- private Date trainEndTime;
+
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
@TableField(exist = false)
private List<String> roleNames;
@@ -279,6 +299,4 @@
@ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" )
@TableField(exist = false)
private Integer querySpecial;
-
-
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index b0ed16f..85ed8b2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -103,44 +103,32 @@
private PlatformReasonMapper platformReasonMapper;
@Autowired
private PlatformGroupMapper platformGroupMapper;
-
-
@Autowired
private ParksMapper parksMapper;
-
@Autowired
private ParkBookMapper parkBookMapper;
-
@Autowired
private VisitParkMapper visitParkMapper;
-
@Autowired
private SmsConfigMapper smsConfigMapper;
-
@Autowired
private SmsEmailMapper smsEmailMapper;
-
@Autowired
private EmayService emayService;
-
-
@Override
public Integer create(Approve approve) {
approveMapper.insert(approve);
return approve.getId();
}
-
@Override
public void deleteById(Integer id) {
approveMapper.deleteById(id);
}
-
@Override
public void delete(Approve approve) {
UpdateWrapper<Approve> deleteWrapper = new UpdateWrapper<>(approve);
approveMapper.delete(deleteWrapper);
}
-
@Override
public void deleteByIdInBatch(List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index b89d8a8..627869c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1459,6 +1459,16 @@
if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
}
+ memberInfoDTO.setHasFace(memberInfoDTO.getFaceId()!=null?Constants.ONE:Constants.ZERO);
+ if(Constants.equalsInteger(Constants.ONE,memberInfoDTO.getAuthStatus())){
+ if(memberInfoDTO.getStartTime() ==null || memberInfoDTO.getEndTime() ==null ){
+ memberInfoDTO.setRoleTimeInfo("闀挎湡鏈夋晥");
+ }else{
+ memberInfoDTO.setRoleTimeInfo(DateUtil.getPlusTime2(memberInfoDTO.getStartTime())+"鑷�"+DateUtil.getPlusTime2(memberInfoDTO.getEndTime()));
+ }
+ }else{
+ memberInfoDTO.setRoleTimeInfo("-");
+ }
}
}
return PageData.from(memberIPage);
--
Gitblit v1.9.3