From da00ef0e4d14467a65862cc8d5033850de6a5520 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 05 七月 2024 18:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 50 ++++++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java | 2
server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 7 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java | 2
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 7 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 235 ++++++++++++++++++++++++++------------
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 1
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 8 +
13 files changed, 235 insertions(+), 98 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
index ac3f8c2..b2e7e2f 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/BookingsMapper.java
@@ -24,7 +24,7 @@
@Select(" select a.id , a.START_TIME , a.END_TIME , b.`NAME` as roomName , a.`NAME` as meetingName ,date_format(a.START_TIME,'%Y-%m-%d') as meetingDate , a.START_TIME as startTime, a.status ," +
" CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime, c.REALNAME as bookingUser ," +
- " CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN a.END_TIME < now() AND a.`STATUS` = 0 THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
+ " CASE WHEN a.START_TIME > now() AND a.`STATUS` = 0 THEN 1 WHEN ( (a.END_TIME < now() AND a.`STATUS` = 0 ) or a.`STATUS` = 2 ) THEN 3 WHEN a.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ," +
" b.IMGURL as imgUrl ," +
" a.remark " +
" from meeting_book a inner join meeting_rooms b on a.ROOM_ID = b.ID " +
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 4baca41..7a3ccc1 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -464,7 +464,7 @@
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
-
+ queryWrapper.select(" CASE WHEN t.START_TIME > now() AND t.`STATUS` = 0 THEN 1 WHEN ( (t.END_TIME < now() AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ");
queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
@@ -476,6 +476,28 @@
queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, Company::getId, pageWrap.getModel().getDepartmentId());
+
+
+ queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
+ " ( now() < t.START_TIME and t.status = 0 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
+ " ( now() >= t.START_TIME and t.END_TIME >= now() and t.status = 0 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
+ " ( ( now() > t.END_TIME and t.`STATUS` = 0 ) or t.`STATUS` = 2 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
+ " now() < t.START_TIME AND SUBDATE( t.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
+ " t.STATUS = 1 "
+ );
if (pageWrap.getModel().getStartTime() != null) {
queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -492,12 +514,14 @@
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
result.getRecords().stream().forEach(s -> {
- if(s.getStartTime().getTime()>System.currentTimeMillis()&&s.getStatus().equals(Constants.ZERO)){
- s.setMeetingStatus(Constants.ONE);
- }else if(s.getEndTime().getTime()<System.currentTimeMillis()||Constants.equalsInteger(s.getStatus(),Constants.ONE) || Constants.equalsInteger(s.getStatus(),Constants.TWO) ){
- s.setMeetingStatus(Constants.THREE);
- }else{
- s.setMeetingStatus(Constants.TWO);
+
+ if(s.getMeetingStatus().equals(Constants.ZERO)){
+ if(s.getMeetingStatus()==Constants.ONE){
+ //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+ if(DateUtil.afterMinutesDate(s.getStartTime(),-120).getTime()>System.currentTimeMillis()){
+ s.setMeetingStatus(4);
+ }
+ }
}
MPJLambdaWrapper<Multifile> bookquery = new MPJLambdaWrapper<>();
bookquery.eq(Multifile::getIsdeleted, MeetConstants.ZERO);
@@ -792,20 +816,20 @@
.eq("b.STATUS",MeetConstants.ZERO)
.eq("a.ISDELETED",MeetConstants.ZERO)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
- &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
- " now() > a.START_TIME and a.status = 0 "
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
+ " ( now() < a.START_TIME and a.status = 0 ) "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
- " now() >= a.START_TIME and a.END_TIME >= now() "
+ " ( now() >= a.START_TIME and a.END_TIME >= now() and a.status = 0 ) "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
- " now() > a.END_TIME or a.status = 2 "
+ " ( ( now() > a.END_TIME and a.`STATUS` = 0 ) or a.`STATUS` = 2 ) "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
- " now() > a.START_TIME and SUBDATE(NOW(), INTERVAL 120 MINUTE) > a.START_TIME "
+ " now() < a.START_TIME AND SUBDATE( a.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
@@ -813,7 +837,7 @@
)
// .orderByDesc(!Objects.isNull(pageWrap.getModel().getStatus())&&pageWrap.getModel().getStatus().equals(MeetConstants.TWO),"a.START_TIME")
// .orderByAsc(Objects.isNull(pageWrap.getModel().getStatus())||pageWrap.getModel().getStatus().equals(MeetConstants.ONE),"a.START_TIME")
- .orderByDesc( Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),"a.CREATE_DATE")
+ .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),"a.CREATE_DATE")
.orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),"a.START_TIME");
IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), queryWrapper);
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index 8db1308..1b6daf9 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
@@ -42,4 +42,11 @@
@ApiModelProperty(value = "鐢ㄦ埛鐘舵��")
private Integer status;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍙告満 锛� 2=鍐呴儴浜哄憳" ,hidden = true)
+ private Integer memberType;
+
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍔冲姟锛�1=鍐呴儴" ,hidden = true)
+ private Integer companyType;
+
+
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index 55ddcb5..1feeb42 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -87,7 +87,6 @@
@TableField(exist = false)
private String typeDetail;
-
@ApiModelProperty(value = "瀛樺偍 娑堟伅灞曠ずJSON" ,notes = "瀛樺偍 娑堟伅灞曠ずJSON ")
@ExcelColumn(name="鍏宠仈鍙傛暟1")
private String param1;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index 23d63ba..c7c5d13 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -181,6 +181,11 @@
queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());
queryWrapper.orderByDesc(Notices::getCreateDate);
PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper));
+ if(noticesDTO.getQueryType().equals(Constants.ZERO)){
+ for (Notices notices:pageData.getRecords()) {
+ notices.setInfo("寰呮垜澶勭悊");
+ }
+ }
return pageData;
}
@@ -201,7 +206,7 @@
if(Constants.equalsInteger(notices.getSendacopy(),Constants.ONE)){
if(Constants.equalsInteger(Constants.ZERO,notices.getReaded())){
noticesMapper.update(null,new UpdateWrapper<Notices>().lambda()
- .set(Notices::getReaded,Constants.ONE).eq(Notices::getId,notices));
+ .set(Notices::getReaded,Constants.ONE).eq(Notices::getId,noticesId));
}
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴妱閫佹暟鎹�,鏃犳硶杩涜鏍囪");
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 269920c..62eb9c4 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -32,11 +32,13 @@
LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
+ LEFT JOIN `member` m ON usr.MEMBER_ID = m.id
<if test="dto.roleId != null">
RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
</if>
<where>
usr.DELETED = 0
+ and usr.SOURCE = 0
<!-- <if test="dto.positionId != null">-->
<!-- AND spu.POSITION_ID = #{dto.positionId}-->
<!-- </if>-->
@@ -61,6 +63,12 @@
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</if>
+ <if test="dto.memberType != null ">
+ AND m.`type` = #{dto.memberType}
+ </if>
+ <if test="dto.companyType != null ">
+ AND sd.`type` = #{dto.companyType}
+ </if>
</where>
${orderByClause}
</select>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
index c0f201a..881133f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarUseBookCloudController.java
@@ -102,7 +102,7 @@
@ApiOperation("鐢宠鎾ら攢")
@GetMapping("/revoke")
- public ApiResponse revoke (@RequestParam Integer id, @RequestParam String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse revoke (@RequestParam Integer id,String info, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
carUseBookService.revoke(id,info,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
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 7056886..dabcfcb 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
@@ -218,7 +218,7 @@
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
private String editorName;
- @ApiModelProperty(value = "缁勭粐绫诲瀷")
+ @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
@TableField(exist = false)
private Integer companyType;
@ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 1e2dbda..5c3e688 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -144,8 +144,8 @@
@ExcelColumn(name="鎺ュ緟浜哄憳")
private Integer receptMemberId;
- @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�", example = "1")
+ @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7鎷滆涓� 8宸茬绂�")
private Integer status;
@ApiModelProperty(value = "鍒濆浜虹紪鐮�", example = "1")
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 384cdcc..1af24c0 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
@@ -375,10 +375,9 @@
//澶勭悊鎶勯�佹暟鎹�
if(CollectionUtils.isNotEmpty(approveCopyList)){
- this.organizeApproveCopyData(approveTempl,approveParamList,businessId,approveList);
+ this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
}
approveJoinMapper.insert(approveList);
-// approveJoinMapper.insert(approveList);
}
@@ -414,15 +413,21 @@
createUserApprove.setType(Constants.ZERO);
approveList.add(createUserApprove);
+ //鏌ヨ鎵�鏈夊緟澶勭悊浜�
+
//瀹℃壒涓氬姟鏁版嵁
for (int i = 0; i < approveParamList.size(); i++) {
ApproveParam approveParam = approveParamList.get(i);
List<Integer> ids = this.getApproveUserIds(approveParam,createMember);
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().in(Member::getId,ids));
+ List<String> memberNameList =memberList.stream().map(m->m.getName()).collect(Collectors.toList());
+ String memberNames = String.join(",",memberNameList);
Integer noticeType = Constants.approveTypeToNoticeType(approveTempl.getType());
String title = "銆愯瀹㈢敵璇枫�戠敵璇蜂汉 - ";
Map<String,Object> jsonMap = new HashMap<>();
- for (int j = 0; j < ids.size(); j++) {
- Integer memberId = ids.get(j);
+ for (int j = 0; j < memberList.size(); j++) {
+ Member member = memberList.get(j);
+ Integer memberId = member.getId();
//鐢熸垚寰呭姙 notices 琛ㄦ暟鎹�
if(i==0){
if(jsonMap.isEmpty()){
@@ -446,6 +451,9 @@
notices.setInfo("澶勭悊涓�");
noticesJoinMapper.insert(notices);
}
+ if(CollectionUtils.isEmpty(memberList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌瀹℃壒浜轰俊鎭�");
+ }
Notices notices = new Notices();
notices.setCreateDate(new Date());
notices.setIsdeleted(Constants.ZERO);
@@ -461,7 +469,13 @@
notices.setSendacopy(Constants.ZERO);
notices.setParam2("0");
notices.setParam3("");
- notices.setInfo("寰呭鐞�");
+ notices.setParam5(memberNames);
+ notices.setRemark(member.getName());
+ if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
+ notices.setInfo("寰�"+memberNameList.get(0)+"澶勭悊涓�");
+ }else{
+ notices.setInfo("寰�"+memberNameList.get(0)+"绛�"+memberList.size()+"浜哄鐞嗕腑");
+ }
noticesJoinMapper.insert(notices);
}
Approve approve = new Approve();
@@ -575,6 +589,7 @@
approve.setIsdeleted(Constants.ZERO);
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
+ approve.setObjType(approveTempl.getType());
approve.setObjId(businessId);
approve.setType(Constants.ONE);
approveList.add(approve);
@@ -608,7 +623,7 @@
if(Objects.isNull(memberCompany)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇痆鎸囧畾瀹℃壒閮ㄩ棬鏈煡璇㈠埌]");
}
- Company auditCompany = this.getAuditCompanyHead(memberCompany.getParentId(),approveParam.getObjLevel());
+ Company auditCompany = this.getAuditCompanyHead(memberCompany.getId(),approveParam.getObjLevel());
if(Objects.isNull(auditCompany)){
//瀹℃壒閮ㄩ棬涓虹┖ 鑷姩娴佽浆涓嬩竴绾у鎵归厤缃�
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇痆鎸囧畾瀹℃壒閮ㄩ棬鏈煡璇㈠埌]");
@@ -617,7 +632,7 @@
Member headMember = memberMapper.selectById(auditCompany.getHeadId());
if(Objects.isNull(headMember)){
//鏈煡璇㈠埌閮ㄩ棬璐熻矗浜� 鏍规嵁閰嶇疆澶勭悊 鐢变笂绾т富绠′唬鏇垮鏍�/鐩存帴缁撴潫娴佺▼
- if(approveParam.getNoleaderOpt().equals(Constants.ONE)&&!Objects.isNull(auditCompany.getParentId())){
+ if(Constants.equalsInteger(approveParam.getNoleaderOpt(),Constants.ONE)&&Objects.nonNull(auditCompany.getParentId())){
auditCompany = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getId,auditCompany.getParentId()));
//鏃犵埗绾� 鐩存帴娴佷紶涓嬩竴绾у鎵�
if(Objects.isNull(auditCompany)){
@@ -632,9 +647,11 @@
userIds.add(headMember.getId());
}
}else{
- //娣诲姞瀹℃壒浜�
- userIds.add(headMember.getId());
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇痆鎸囧畾瀹℃壒閮ㄩ棬涓荤鏈煡璇㈠埌]");
}
+ }else{
+ //娣诲姞瀹℃壒浜�
+ userIds.add(headMember.getId());
}
}
}
@@ -649,9 +666,9 @@
* @param objLevel 鏌ヨ绾у埆
*/
public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
- Integer queryLevel = Constants.ZERO;
Company auditCompany = companyMapper.selectById(companyId);
- while(queryLevel.equals(objLevel)){
+ Integer queryLevel = Constants.ONE;
+ while(queryLevel<objLevel){
auditCompany = companyMapper.selectById(auditCompany.getParentId());
if(Objects.isNull(auditCompany)){
return null;
@@ -680,6 +697,8 @@
.eq(Approve::getObjId,businessId)
.eq(Approve::getObjType,businessType)
.orderByAsc(Approve::getLevel)
+ .orderByAsc(Approve::getStatus)
+
);
//鏌ユ壘鍏ㄩ儴levelList
@@ -697,6 +716,7 @@
if (CollectionUtils.isNotEmpty(copyList)) {
Approve waitModel = new Approve();
waitModel.setApproveType(Constants.ONE);
+ waitModel.setCheckDate(copyList.get(Constants.ZERO).getCheckDate());
waitModel.setTitle("鎶勯�佷汉");
waitModel.setStatus(copyList.get(Constants.ZERO).getStatus());
waitModel.setType(Constants.ONE);
@@ -1006,6 +1026,7 @@
.eq(Notices::getUserId,approve.getChekorId())
.eq(Notices::getSendacopy,Constants.ZERO)
.eq(Notices::getIsdeleted,Constants.ZERO)
+ .eq(Notices::getStatus,Constants.ZERO)
.last(" limit 1 ")
);
if(Objects.isNull(notices)){
@@ -1057,29 +1078,29 @@
.eq(Approve::getObjType,approve.getObjType())
.ne(Approve::getId,approve.getId()));
//澶勭悊鎵�鏈塏otice閫氱煡涓哄凡澶勭悊
- if(approve.getApproveType().equals(Constants.ZERO)){
- //淇敼鑷繁鐨勯�氱煡璁板綍
+ //淇敼鑷繁鐨勯�氱煡璁板綍
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getEditDate,new Date())
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
+ .set(Notices::getInfo,"瀹℃壒鏈�氳繃")
+ .set(Notices::getReaded,Constants.ONE)
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getId,notices.getId())
+ );
+ //淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
+ if (!Constants.equalsInteger(approve.getApproveType(),Constants.TWO)){
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
- .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
- .set(Notices::getReaded,Constants.ONE)
- .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getSendacopy,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
- .eq(Notices::getId,notices.getId())
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getInfo,"瀹℃壒鏈�氳繃")
+ .eq(Notices::getObjId,notices.getObjId())
+ .eq(Notices::getObjType,notices.getObjType())
+ .eq(Notices::getReaded,Constants.ZERO)
+ .ne(Notices::getId,notices.getId())
);
- //淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
- if (!Constants.equalsInteger(approve.getApproveType(),Constants.TWO)){
- noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
- .set(Notices::getEditDate,new Date())
- .set(Notices::getSendacopy,Constants.ONE)
- .set(Notices::getStatus,Constants.ONE)
- .set(Notices::getParam2,Constants.TWO)
- .eq(Notices::getObjId,notices.getObjId())
- .eq(Notices::getObjType,notices.getObjType())
- .eq(Notices::getReaded,Constants.ZERO)
- .ne(Notices::getId,notices.getId())
- );
- }
}
}else{
//澶勭悊鍏朵粬涓氬姟鏁版嵁
@@ -1116,7 +1137,20 @@
.eq(Approve::getObjType,approve.getObjType())
.eq(Approve::getLevel,(approve.getLevel()+1))
);
- if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
+ Visits visits = visitsMapper.selectById(approve.getObjId());
+ if(Objects.nonNull(visits)){
+ if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁瀵硅薄!璇峰埛鏂伴噸璇�");
+ }
+ }
+
+
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
this.updDriver(approveDTO,approve,false);
}
@@ -1125,6 +1159,24 @@
//鏃犱粬浜哄鎵圭殑鎯呭喌 鍒欎慨鏀规暟鎹姸鎬�
if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){
dealBusinessBean = true;
+ }else{
+ if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
+ /**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.auditIng)
+ .set(Approve::getTitle,"瀹℃壒浜�")
+ .set(Approve::getCheckDate,new Date())
+ .eq(Approve::getStatus,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getLevel,(approve.getLevel()+1))
+ );
+ }
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ this.updDriver(approveDTO,approve,false);
+ }
}
}
this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
@@ -1142,6 +1194,14 @@
* @param approveList 鍚岀骇寰呭鎵规暟鎹�
*/
public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){
+ //鏈紑鍚笅涓�绾ф椂锛屾搷浣滃悗鐨勫緟瀹℃壒浜�
+ String memberNames =notices.getParam5()
+ .replaceAll(","+notices.getRemark(),"")
+ .replaceAll(notices.getRemark()+",","")
+ .replaceAll(notices.getRemark(),"");
+
+
+
//1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
@@ -1153,70 +1213,82 @@
);
if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){
//鎴栫
- //2銆佹洿鏂颁粬浜虹殑鍚岀骇璁板綍 涓烘妱閫�
+ //2銆佹洿鏂颁粬浜虹殑鍚岀骇璁板綍 涓烘妱閫� 骞舵洿鏂� info 淇℃伅
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
- .set(Notices::getReaded,Constants.ONE)
+ .set(Notices::getReaded,Constants.ZERO)
.set(Notices::getSendacopy,Constants.ONE)
.set(Notices::getStatus,Constants.ONE)
.set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.set(dealBusinessBean,Notices::getParam2,Constants.ONE)
.eq(Notices::getObjId,notices.getObjId())
+ .eq(Notices::getStatus,Constants.ZERO)
.eq(Notices::getObjType,notices.getObjType())
.ne(Notices::getId,notices.getId())
);
//3銆佸鏋滀笉鏄粓瀹＄敓鎴愪笅涓�绾х殑鏁版嵁璁板綍
if(Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)&&!dealBusinessBean){
- this.saveNextNotice(notices,approve);
+ memberNames = this.saveNextNotice(notices,approve);
}
}else if(Constants.equalsInteger(approve.getApproveType(),Constants.ONE)){
//浼氱
//2銆佸鏋滄槸鏈�鍚庝竴浣嶅鎵逛汉 涓斾笉鏄粓瀹″紑鍚笅涓�绾ф暟鎹�
if(Constants.equalsInteger(Constants.ZERO,approveList.size())){
if(Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
- this.saveNextNotice(notices,approve);
+ memberNames = this.saveNextNotice(notices,approve);
}
}
}else{
//鍗曚汉绛�
//2銆� 鏄惁鏄粓瀹� 寮�鍚笅涓�绾ф暟鎹�
if(Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
- this.saveNextNotice(notices,approve);
+ memberNames = this.saveNextNotice(notices,approve);
}
}
+ String info = "";
+ List<String> memberNameList = Arrays.asList(memberNames.split(","));
+ if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
+ info = "寰� "+memberNameList.get(0)+" 澶勭悊涓�";
+ }else{
+ info = "寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑";
+ }
+ //鏇存柊璇ヤ笟鍔℃暟鎹殑鎵�鏈夎褰曚俊鎭�
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(!dealBusinessBean,Notices::getInfo,info)
+ .set(dealBusinessBean,Notices::getInfo,"瀹℃壒閫氳繃")
+ .set(Notices::getParam5,memberNames)
+ .eq(Notices::getObjId,notices.getObjId())
+ .eq(Notices::getObjType,notices.getObjType()));
+
//缁堝涓氬姟 涓� 澶勭悊鏁版嵁 杩涜鎶勯�佸彂閫�
if (Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE) && dealBusinessBean) {
if(CollectionUtils.isNotEmpty(copyList)){
- Notices copyNotices = new Notices();
for (Approve copyApprove:copyList) {
- if(Objects.isNull(copyNotices)){
- BeanUtils.copyProperties(notices,copyNotices);
- notices.setId(null);
- notices.setCreateDate(new Date());
- notices.setEditDate(new Date());
- notices.setParam2("2");
- notices.setParam3("");
- notices.setUserId(copyApprove.getChekorId());
- notices.setStatus(Constants.ZERO);
- notices.setSendacopy(Constants.ONE);
- notices.setReaded(Constants.ZERO);
- noticesJoinMapper.insert(notices);
- }else{
- notices.setId(null);
- notices.setUserId(copyApprove.getChekorId());
- noticesJoinMapper.insert(notices);
- }
+ Notices copyNotices = new Notices();
+ BeanUtils.copyProperties(notices,copyNotices);
+ copyNotices.setId(null);
+ copyNotices.setCreateDate(new Date());
+ copyNotices.setEditDate(new Date());
+ copyNotices.setParam2("2");
+ copyNotices.setParam3("");
+ copyNotices.setInfo("瀹℃壒閫氳繃");
+ copyNotices.setUserId(copyApprove.getChekorId());
+ copyNotices.setStatus(Constants.ZERO);
+ copyNotices.setSendacopy(Constants.ONE);
+ copyNotices.setReaded(Constants.ZERO);
+ noticesJoinMapper.insert(copyNotices);
}
}
-
-
}
}
- public void saveNextNotice(Notices notices,Approve approve){
- List<Approve> nextApproveList = approveJoinMapper.selectList(new QueryWrapper<Approve>()
- .lambda()
+
+ public String saveNextNotice(Notices notices,Approve approve){
+ List<Approve> nextApproveList = approveJoinMapper.selectJoinList(Approve.class,new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .selectAs(Member::getName,Approve::getMemberName)
+ .leftJoin(Member.class,Member::getId,Approve::getChekorId)
.eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
.eq(Approve::getType,Constants.ZERO)
@@ -1225,26 +1297,30 @@
if(CollectionUtils.isEmpty(nextApproveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴佹暟鎹紓甯�");
}
- Notices newNotices = new Notices();
+ List<String> memberNameList =nextApproveList.stream().map(m->m.getMemberName()).collect(Collectors.toList());
+ String memberNames = String.join(",",memberNameList);
for (Approve nextDealApprove:nextApproveList) {
- if(Objects.isNull(newNotices)){
- BeanUtils.copyProperties(notices,newNotices);
- notices.setId(null);
- notices.setCreateDate(new Date());
- notices.setParam2("0");
- notices.setParam3("");
- notices.setEditDate(new Date());
- notices.setUserId(nextDealApprove.getChekorId());
- notices.setStatus(Constants.ZERO);
- notices.setSendacopy(Constants.ZERO);
- notices.setReaded(Constants.ZERO);
- noticesJoinMapper.insert(notices);
+ Notices newNotices = new Notices();
+ BeanUtils.copyProperties(notices,newNotices);
+ newNotices.setId(null);
+ newNotices.setCreateDate(new Date());
+ newNotices.setParam2("0");
+ newNotices.setParam3("");
+ newNotices.setEditDate(new Date());
+ newNotices.setUserId(nextDealApprove.getChekorId());
+ newNotices.setStatus(Constants.ZERO);
+ newNotices.setSendacopy(Constants.ZERO);
+ newNotices.setReaded(Constants.ZERO);
+ notices.setParam5(memberNames);
+ notices.setRemark(nextDealApprove.getMemberName());
+ if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
+ notices.setInfo("寰� "+memberNameList.get(0)+" 澶勭悊涓�");
}else{
- notices.setId(null);
- notices.setUserId(nextDealApprove.getChekorId());
- noticesJoinMapper.insert(notices);
+ notices.setInfo("寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑");
}
+ noticesJoinMapper.insert(newNotices);
}
+ return memberNames;
}
public void dealBusinessData(ApproveDTO approveDTO,Approve approve){
@@ -1269,6 +1345,15 @@
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ //澶勭悊閫氳繃 鏄剧ず鎵�鏈夌殑鎶勯�佽褰�
+ approveMapper.update(null,new UpdateWrapper<Approve>().lambda().set(Approve::getStatus,Constants.TWO)
+ .set(Approve::getCheckDate,new Date())
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getType,Constants.ONE)
+ );
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 5befe39..cffa394 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -186,6 +186,9 @@
.eq(CarUseBook::getId,id)
.last("limit 1" );
CarUseBook model = carUseBookMapper.selectJoinOne(CarUseBook.class,queryWrapper);
+ if(Objects.isNull(model)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
ApproveDataVO approveDataVO = approveService.arrangeApprovedData(id,
Constants.equalsInteger(model.getType(),Constants.ZERO)?3:4,
memberId);
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 87dfe19..3d3bcbe 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
@@ -144,7 +144,7 @@
createNotices.setSendacopy(Constants.ZERO);
createNotices.setParam2("0");
createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
- createNotices.setInfo("澶勭悊涓�");
+ createNotices.setInfo("寰� "+member.getName()+" 澶勭悊");
noticesJoinMapper.insert(createNotices);
//瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅
@@ -163,6 +163,7 @@
notices.setStatus(Constants.ZERO);
notices.setSendacopy(Constants.ZERO);
notices.setReaded(Constants.ZERO);
+ notices.setInfo("寰� "+member.getName()+" 澶勭悊");
noticesJoinMapper.insert(notices);
@@ -511,12 +512,15 @@
BeanUtils.copyProperties(notices,newNotices);
newNotices.setId(null);
newNotices.setCreateDate(new Date());
- newNotices.setParam2("3");
+ newNotices.setParam2("0");
newNotices.setUserId(hiddenDanger.getCheckUserId());
+ newNotices.setInfo("寰� "+member.getName()+" 澶勭悊");
noticesJoinMapper.insert(newNotices);
notices.setStatus(Constants.ONE);
+ notices.setParam2("3");
notices.setEditDate(new Date());
notices.setReaded(Constants.ONE);
+ notices.setInfo("寰� "+member.getName()+" 澶勭悊");
noticesJoinMapper.updateById(notices);
}
}
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 e9619f0..398ac8f 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
@@ -1108,7 +1108,9 @@
if(StringUtils.isNotBlank(member.getName())){
queryWrapper.like(Member::getName,member.getName());
}
-
+ if(Objects.nonNull(member.getCompanyType())){
+ queryWrapper.eq(Company::getType,member.getCompanyType());
+ }
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
}
--
Gitblit v1.9.3