From ea9ed0309595ff8b771aec4a6f5b34fb65139545 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 15:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 44 +++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 12 ++++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 11 ++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java | 5 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java | 10 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java | 15 ++-----
7 files changed, 80 insertions(+), 19 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
index 4dddf78..91b2143 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -83,16 +83,23 @@
- @ApiOperation(value = "浠诲姟涓績澶撮儴", notes = "H5")
+ @ApiOperation(value = "浠诲姟涓績澶撮儴 - H5", notes = "H5")
@GetMapping("/taskCenterHead")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "isDetail", value = " 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�", required = true),
})
public ApiResponse<InternalHomeVO> taskCenterHead(@RequestParam Integer isDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeData(getLoginUser(token).getMemberId(),isDetail));
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail));
}
+ @ApiOperation(value = "浠诲姟涓績澶撮儴 - PC", notes = "PC")
+ @PostMapping("/taskCenterHeadPC")
+ public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ noticesDTO.setMemberId(getLoginUser(token).getMemberId());
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataPC(noticesDTO));
+ }
+
@ApiOperation("浠诲姟涓績鍒嗛〉")
@PostMapping("/taskPage")
public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
index 52e20b5..0d8df6c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.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 com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -60,7 +61,7 @@
@ApiModelProperty(value = "鍦板潃淇℃伅")
@ExcelColumn(name="鍦板潃淇℃伅")
- private Date url;
+ private String url;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
@ExcelColumn(name="璇锋眰鍙傛暟")
@@ -86,4 +87,11 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String objId;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startDate;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date endDate;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
index 8254608..6b2fb66 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
@@ -5,6 +5,7 @@
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.web.response.InternalHomeVO;
import java.util.List;
@@ -105,7 +106,9 @@
* @param memberId
* @return
*/
- InternalHomeVO getHomeData(Integer memberId,Integer isDetail);
+ InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail);
+
+ InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO);
void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId);
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 41dc926..619f502 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
@@ -18,6 +18,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
@@ -240,7 +241,7 @@
* @return
*/
@Override
- public InternalHomeVO getHomeData(Integer memberId,Integer isDetail){
+ public InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail){
InternalHomeVO internalHomeVO = new InternalHomeVO();
internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
//浠诲姟鏁版嵁
@@ -280,6 +281,47 @@
}
+ @Override
+ public InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO){
+ InternalHomeVO internalHomeVO = new InternalHomeVO();
+ internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
+ //浠诲姟鏁版嵁
+ List<Notices> noticesList = noticesJoinMapper.
+ selectList(new QueryWrapper<Notices>().lambda()
+ .ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ))
+ .le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ))
+ .eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate)
+ );
+ internalHomeVO.setTaskNum(noticesList.size());
+ if(CollectionUtils.isNotEmpty(noticesList)){
+ //寰呮垜澶勭悊鐨勬暟鎹�
+ internalHomeVO.setNoticeWaitNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
+ internalHomeVO.setNoticeDealNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ ).count()
+ );
+
+ internalHomeVO.setNoticeCreateNum(
+ noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,noticesDTO.getMemberId()))
+ );
+
+ internalHomeVO.setNoticeCopyNum(
+ noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
+ &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ ).count()
+ );
+ }
+
+ return internalHomeVO;
+ }
+
/**
* 鍒涘缓瀹℃壒娴佺▼
* @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index 3f3d105..7b9bfbb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveTemplService;
@@ -17,6 +18,7 @@
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.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +44,7 @@
@Autowired
private ApproveParamMapper approveParamMapper;
@Autowired
- private MemberMapper memberMapper;
+ private MemberJoinMapper memberJoinMapper;
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -161,8 +163,12 @@
);
for (ApproveParam approveParam :approveParamList) {
if(StringUtils.isNotBlank(approveParam.getObjIds())){
- approveParam.setMemberList(memberMapper.selectList(new QueryWrapper<Member>()
- .lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getId,approveParam.getObjIds().split(","))));
+ approveParam.setMemberList(memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .in(Member::getId,approveParam.getObjIds().split(","))));
}
}
model.setParamList(approveParamList);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 10ea27c..f0024a9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -123,7 +123,7 @@
multifileMapper.insert(multifile);
}
}
- String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname();
+ String title = "銆愰殣鎮ｉ殢鎵嬫媿銆戞彁鎶ヤ汉 - "+hiddenDanger.getLoginUserInfo().getRealname();
//json鏁版嵁
Map<String,Object> jsonMap = new HashMap<>();
jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
index b5038a0..b6d98ec 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java
@@ -106,23 +106,18 @@
.eq(pageWrap.getModel().getIsdeleted() != null, PlatformInterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
.eq(pageWrap.getModel().getRemark() != null, PlatformInterfaceLog::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getType() != null, PlatformInterfaceLog::getType, pageWrap.getModel().getType())
- .eq(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
- .ge(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()))
- .le(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()))
+ .like(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, pageWrap.getModel().getUrl())
.eq(pageWrap.getModel().getRequest() != null, PlatformInterfaceLog::getRequest, pageWrap.getModel().getRequest())
.eq(pageWrap.getModel().getRepose() != null, PlatformInterfaceLog::getRepose, pageWrap.getModel().getRepose())
.eq(pageWrap.getModel().getSuccess() != null, PlatformInterfaceLog::getSuccess, pageWrap.getModel().getSuccess())
.eq(pageWrap.getModel().getPlat() != null, PlatformInterfaceLog::getPlat, pageWrap.getModel().getPlat())
.eq(pageWrap.getModel().getObjType() != null, PlatformInterfaceLog::getObjType, pageWrap.getModel().getObjType())
.eq(pageWrap.getModel().getObjId() != null, PlatformInterfaceLog::getObjId, pageWrap.getModel().getObjId())
+ .ge(pageWrap.getModel().getStartDate() != null,PlatformInterfaceLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
+ .le(pageWrap.getModel().getEndDate() != null,PlatformInterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()))
+ .orderByDesc(PlatformInterfaceLog::getCreateDate);
;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
return PageData.from(platformInterfaceLogMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3