From d326a61865ab19e364934b8d2e1a6a207132620b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 18:02:47 +0800
Subject: [PATCH] #答题日志数据转换 字段映射修改
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 29 +++-
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java | 4
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java | 6
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java | 13 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 37 +++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java | 66 +++++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java | 22 +++
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java | 13 ++
server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java | 13 +
server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java | 10 +
server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 55 ++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java | 30 +++++
server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java | 2
15 files changed, 288 insertions(+), 19 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
index e4f2e72..8ac7476 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java
@@ -10,7 +10,7 @@
import com.doumee.service.business.VisitEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index fdecd22..8422097 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -35,6 +35,8 @@
public static final String MDJ_LW_REQUIRED = "MDJ_LW_REQUIRED";
public static final String MDJ_VISIT_REQUIRED = "MDJ_VISIT_REQUIRED";
public static final String EDS_PWD ="!@#$%^&QWERTY" ;
+ public static final String ROOT_PATH = "";
+ public static final String FILE_DIR = "";
public static Date getBirthdyByCardNo(String idCard){
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java
new file mode 100644
index 0000000..80e2ff9
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/CarsQuery.java
@@ -0,0 +1,22 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("闀挎湡杞︽煡璇�")
+public class CarsQuery {
+
+ @ApiModelProperty(value = "鍏抽敭瀛�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carNo;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
new file mode 100644
index 0000000..5b12a06
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
@@ -0,0 +1,30 @@
+package com.doumee.dao.admin.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+@ApiModel("瀹炴椂鍦ㄥ満浜哄憳鏌ヨ")
+public class RetentionQuery {
+
+ @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+ private String keyWords;
+
+ @ApiModelProperty(value = "鍏徃/閮ㄩ棬鍚嶇О")
+ private String companyName;
+
+ @ApiModelProperty(value = "浜哄憳绫诲瀷")
+ private Integer type;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
new file mode 100644
index 0000000..a17938b
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
@@ -0,0 +1,66 @@
+package com.doumee.dao.admin.response;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author T14
+ */
+@Data
+public class CarsDTO {
+
+
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�")
+ private String code;
+
+ @ApiModelProperty(value = "杞﹀簱缂栫爜锛堝叧鑱攑arks)")
+ @ExcelColumn(name="杞﹀簱缂栫爜锛堝叧鑱攑arks)")
+ private Integer parkId;
+
+ @ApiModelProperty(value = "杞﹀簱鍚嶇О")
+ @ExcelColumn(name="杞﹀簱鍚嶇О")
+ private Integer parkName;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜虹紪鐮�")
+ private Integer memberId;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜哄悕绉�")
+ private String memberName;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜虹被鍨�")
+ private Integer memberType;
+
+ @ApiModelProperty(value = "褰掑睘浜虹紪鐮�")
+ @ExcelColumn(name="褰掑睘浜烘墍鍦ㄩ儴闂�")
+ private String companyName;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�")
+ @ExcelColumn(name="鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鏃堕棿娈�")
+ private Integer timeType;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @ExcelColumn(name="寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @ExcelColumn(name="缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ private Date createDate;
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java
new file mode 100644
index 0000000..95fc433
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ParkBookJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+
+import com.doumee.dao.business.model.ParkBook;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface ParkBookJoinMapper extends MPJJoinMapper<ParkBook> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java
new file mode 100644
index 0000000..91aa8ee
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/join/RetentionJoinMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business.join;
+
+
+import com.doumee.dao.business.model.Retention;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface RetentionJoinMapper extends MPJJoinMapper<Retention> {
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 8ec02d3..00540e4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,11 +22,11 @@
public class Retention {
@TableId(type = IdType.AUTO)
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@@ -34,7 +35,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@@ -43,7 +44,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
- @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@@ -51,7 +52,7 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
@ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
private Integer companyId;
@@ -63,7 +64,7 @@
@ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
private Integer type;
@@ -101,7 +102,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date eventDate;
- @ApiModelProperty(value = "璁垮ID(鍏宠仈member)", example = "1")
+ @ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
@ExcelColumn(name="璁垮ID(鍏宠仈member)")
private Integer memberId;
@@ -109,4 +110,18 @@
@ExcelColumn(name="浜嬩欢绫诲瀷鐮�")
private String eventCode;
+ @ApiModelProperty(value = "鍏徃缁勭粐")
+ @ExcelColumn(name="鍏徃缁勭粐")
+ @TableField(exist = false)
+ public String companyName;
+
+ @ApiModelProperty(value = "璁垮鐢ㄦ埛绫诲瀷")
+ @ExcelColumn(name="璁垮鐢ㄦ埛绫诲瀷")
+ @TableField(exist = false)
+ private Integer memberType;
+
+ @ApiModelProperty(value = "闂ㄧ鍚嶇О")
+ @ExcelColumn(name="闂ㄧ鍚嶇О")
+ @TableField(exist = false)
+ private String srcName;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
index 4af9a03..468374a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitEvent.java
@@ -163,4 +163,8 @@
@ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
private String beVisitedPersonOrgId;
+ @ApiModelProperty(value = "琚闂汉鎵�灞炵粍缁噄d")
+ @ExcelColumn(name="琚闂汉鎵�灞炵粍缁噄d")
+ private String idcardDecode;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
index 7aaeae9..168a713 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.CarsQuery;
+import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.model.Cars;
import java.util.List;
@@ -14,7 +16,7 @@
/**
* 鍒涘缓
- *
+ *
* @param cars 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +80,7 @@
* @return List<Cars>
*/
List<Cars> findList(Cars cars);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +96,11 @@
* @return long
*/
long count(Cars cars);
+
+ /**
+ * 闀挎湡杞︽煡璇�
+ * @param pageWrap
+ * @return
+ */
+ PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
index 72aeb5c..58d4563 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/RetentionService.java
@@ -2,7 +2,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.business.model.TrainTime;
+
import java.util.List;
/**
@@ -14,7 +17,7 @@
/**
* 鍒涘缓
- *
+ *
* @param retention 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +81,7 @@
* @return List<Retention>
*/
List<Retention> findList(Retention retention);
-
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -94,4 +97,7 @@
* @return long
*/
long count(Retention retention);
+
+
+ PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
index ea8de9f..d2b202f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/TrainTimeService.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.TrainTime;
import java.util.List;
@@ -14,7 +15,7 @@
/**
* 鍒涘缓
- *
+ *
* @param trainTime 瀹炰綋瀵硅薄
* @return Integer
*/
@@ -78,7 +79,7 @@
* @return List<TrainTime>
*/
List<TrainTime> findList(TrainTime trainTime);
-
+
/**
* 鍒嗛〉鏌ヨ
*
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index a14ea39..a9e946f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -3,13 +3,17 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.CarsQuery;
+import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.CarsMapper;
-import com.doumee.dao.business.model.Cars;
+import com.doumee.dao.business.join.ParkBookJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +30,9 @@
@Autowired
private CarsMapper carsMapper;
+
+ @Autowired
+ private ParkBookJoinMapper parkBookJoinMapper;
@Override
public Integer create(Cars cars) {
@@ -83,7 +90,7 @@
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
return carsMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -161,4 +168,30 @@
QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
return carsMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<CarsDTO> findCarPage(PageWrap<CarsQuery> pageWrap) {
+ MPJLambdaWrapper<ParkBook> wrapper = new MPJLambdaWrapper<>();
+ IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ Utils.MP.blankToNull(pageWrap.getModel());
+ wrapper.leftJoin(Member.class,Member::getId,ParkBook::getMemberId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
+ wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
+ .selectAs(ParkBook::getParkId,CarsDTO::getParkId)
+ .selectAs(ParkBook::getRemark,CarsDTO::getRemark)
+ .selectAs(Parks::getName,CarsDTO::getParkName)
+ .selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
+ .selectAs(Member::getName,CarsDTO::getMemberName)
+ .selectAs(Member::getType,CarsDTO::getMemberType)
+ .selectAs(Company::getName,CarsDTO::getCompanyName)
+ .selectAs(ParkBook::getTimeType,CarsDTO::getTimeType)
+ .selectAs(ParkBook::getStartTime,CarsDTO::getStartTime)
+ .selectAs(ParkBook::getEndTime,CarsDTO::getEndTime)
+ .selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
+ wrapper.orderByDesc(ParkBook::getCreateDate);
+ IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);
+
+ return PageData.from(carsDTOIPage);
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index dec9e5e..6339165 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -1,20 +1,28 @@
package com.doumee.service.business.impl;
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ReUtil;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.RetentionMapper;
-import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.business.join.RetentionJoinMapper;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.RetentionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇
@@ -26,6 +34,10 @@
@Autowired
private RetentionMapper retentionMapper;
+
+ @Autowired
+ private RetentionJoinMapper retentionJoinMapper;
+
@Override
public Integer create(Retention retention) {
@@ -83,7 +95,7 @@
QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention);
return retentionMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Retention> findPage(PageWrap<Retention> pageWrap) {
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -171,4 +183,43 @@
QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention);
return retentionMapper.selectCount(wrapper);
}
+
+ @Override
+ public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) {
+
+ //鏄惁鏄暟瀛�
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈涓枃
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ //鏄惁鍖呭惈鑻辨枃
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+
+ IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId)
+ .leftJoin(Member.class,Member::getId,Retention::getMemberId)
+ .leftJoin(DeviceEvent.class,DeviceEvent::getEventId,Retention::getEventCode);
+ queryWrapper.selectAll(Retention.class)
+ .selectAs(Company::getName,Retention::getCompanyName)
+ .selectAs(Member::getType,Retention::getMemberType)
+ .selectAs(DeviceEvent::getSrcName,Retention::getSrcName);
+ queryWrapper.like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
+ .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords())
+ .eq(Objects.nonNull(pageWrap.getModel().getType()),
+ Member::getType,
+ pageWrap.getModel().getType())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ Company::getName,
+ pageWrap.getModel().getCompanyName())
+ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
+ Retention::getEventDate,
+ Utils.Date.getStart(pageWrap.getModel().getStartTime()))
+ .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
+ Retention::getEventDate,
+ Utils.Date.getDayEnd(pageWrap.getModel().getEndTime()));
+ queryWrapper.orderByDesc(Retention::getCreateDate);
+ IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
+ return PageData.from(retentionIPage);
+ }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
index 8a4bb79..c5d18cc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java
@@ -27,6 +27,8 @@
@Autowired
private TrainTimeMapper trainTimeMapper;
+
+
@Override
public Integer create(TrainTime trainTime) {
trainTimeMapper.insert(trainTime);
@@ -83,7 +85,7 @@
QueryWrapper<TrainTime> wrapper = new QueryWrapper<>(trainTime);
return trainTimeMapper.selectList(wrapper);
}
-
+
@Override
public PageData<TrainTime> findPage(PageWrap<TrainTime> pageWrap) {
IPage<TrainTime> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -142,4 +144,6 @@
QueryWrapper<TrainTime> wrapper = new QueryWrapper<>(trainTime);
return trainTimeMapper.selectCount(wrapper);
}
+
+
}
--
Gitblit v1.9.3