From 2a2b5ae83879d2d36b3a6ca0a6a4940c04acba65 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 三月 2024 15:33:12 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java | 23 +++++++++++
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 64 +++++++++++++++++++++-----------
server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 5 ++
3 files changed, 70 insertions(+), 22 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
index f9124b7..d73a164 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java
@@ -9,6 +9,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -121,9 +123,30 @@
@TableField(exist = false)
private String companyNames;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈�", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryStartTime;
+
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃ユ湡", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date queryEndTime;
+
+
@ApiModelProperty(value = "鏄庣粏琛岃褰�")
@TableField(exist = false)
private List<ApplyChagneDetail> applyChagneDetailList;
+ @ApiModelProperty(value = "鍔犱繚浜烘暟")
+ @TableField(exist = false)
+ private Integer addNum;
+ @ApiModelProperty(value = "鍑忎繚浜烘暟")
+ @TableField(exist = false)
+ private Integer delNum;
+
+ @ApiModelProperty(value = "鎹㈠巶浜烘暟")
+ @TableField(exist = false)
+ private Integer changeNum;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 32a4157..71efde3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -46,6 +46,8 @@
private EmayService emayService;
@Autowired
private EmailService emailService;
+ @Value("${debug_model}")
+ private boolean debugModel;
public static void isCaptcheValide(SmsEmailMapper smsEmailMapper, String phone, String captche) {
SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
@@ -137,6 +139,9 @@
if(StringUtils.isBlank(code)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(debugModel){
+ return;
+ }
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!loginUserInfo.getType().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛绫诲埆閿欒");
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index d9a2a12..8126ff7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -142,59 +142,78 @@
@Override
public PageData<UnionChange> findPage(PageWrap<UnionChange> pageWrap) {
IPage<UnionChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<UnionChange> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<UnionChange> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(UnionChange.class);
+ queryWrapper.selectAs(UnionApply::getCode,UnionChange::getApplyCode)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0 )",UnionChange::getAddNum)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1 )",UnionChange::getDelNum)
+ .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 2 )",UnionChange::getChangeNum);
+ queryWrapper.leftJoin(UnionApply.class,UnionApply::getId,UnionChange::getUnionApplyId);
+ queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(user.getType().equals(Constants.TWO)){
+ queryWrapper.eq(UnionChange::getShopId, pageWrap.getModel().getShopId());
+ }
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(UnionChange::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(UnionChange::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(UnionChange::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(UnionChange::getCreator, pageWrap.getModel().getCreator());
}
+
+ if (pageWrap.getModel().getQueryStartTime() != null) {
+ queryWrapper.ge(UnionChange::getCreateDate, pageWrap.getModel().getQueryStartTime() +" 00:00:00" );
+ }
+ if (pageWrap.getModel().getQueryEndTime() != null) {
+ queryWrapper.le(UnionChange::getCreateDate, pageWrap.getModel().getQueryEndTime() +" 23:59:59");
+ }
+
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(UnionChange::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(UnionChange::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(UnionChange::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(UnionChange::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(UnionChange::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(UnionChange::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(UnionChange::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(UnionChange::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(UnionChange::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(UnionChange::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(UnionChange::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(UnionChange::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(UnionChange::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(UnionChange::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(UnionChange::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(UnionChange::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getShopId() != null) {
- queryWrapper.lambda().eq(UnionChange::getShopId, pageWrap.getModel().getShopId());
+ queryWrapper.eq(UnionChange::getShopId, pageWrap.getModel().getShopId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(UnionChange::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(UnionChange::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getApplyStartTime() != null) {
- queryWrapper.lambda().ge(UnionChange::getApplyStartTime, Utils.Date.getStart(pageWrap.getModel().getApplyStartTime()));
- queryWrapper.lambda().le(UnionChange::getApplyStartTime, Utils.Date.getEnd(pageWrap.getModel().getApplyStartTime()));
+ queryWrapper.ge(UnionChange::getApplyStartTime, Utils.Date.getStart(pageWrap.getModel().getApplyStartTime()));
+ queryWrapper.le(UnionChange::getApplyStartTime, Utils.Date.getEnd(pageWrap.getModel().getApplyStartTime()));
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(UnionChange::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(UnionChange::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getValidTime() != null) {
- queryWrapper.lambda().ge(UnionChange::getValidTime, Utils.Date.getStart(pageWrap.getModel().getValidTime()));
- queryWrapper.lambda().le(UnionChange::getValidTime, Utils.Date.getEnd(pageWrap.getModel().getValidTime()));
+ queryWrapper.ge(UnionChange::getValidTime, Utils.Date.getStart(pageWrap.getModel().getValidTime()));
+ queryWrapper.le(UnionChange::getValidTime, Utils.Date.getEnd(pageWrap.getModel().getValidTime()));
}
if (pageWrap.getModel().getValidCode() != null) {
- queryWrapper.lambda().eq(UnionChange::getValidCode, pageWrap.getModel().getValidCode());
+ queryWrapper.eq(UnionChange::getValidCode, pageWrap.getModel().getValidCode());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(UnionChange::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(UnionChange::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getSignApplyNo() != null) {
- queryWrapper.lambda().eq(UnionChange::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
+ queryWrapper.eq(UnionChange::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -203,7 +222,8 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(unionChangeMapper.selectPage(page, queryWrapper));
+ PageData<UnionChange> pageData = PageData.from(unionChangeJoinMapper.selectJoinPage(page,UnionChange.class, queryWrapper));
+ return pageData;
}
@Override
--
Gitblit v1.9.3