From c52a775aeb3386dfab1ac78ac3430ff86934220a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十二月 2024 13:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 4 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java | 4 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 32 +++++++++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 9 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 11 ++++-
8 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 5698d26..d578330 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -37,7 +37,7 @@
@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉跨湡瀹�")
@RestController
@Slf4j
-@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRunAct")
public class PlatformJobRunActController extends BaseController {
@Autowired
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
index 33508f7..a1533a7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
@@ -40,7 +40,7 @@
@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉�")
@RestController
@Slf4j
-@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRunOld")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
public class PlatformJobRunController extends BaseController {
@Autowired
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index e0c6a02..e7cd30e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -254,7 +254,7 @@
thing13.put("value",Constants.equalsInteger(hiddenDanger.getStatus(),Constants.ONE)?"闅愭偅宸叉暣鏀�":"闅愭偅宸查��鍥�");
//鎻愪氦浜�
Map<String, Object> thing10 = new HashMap<String,Object>();
- thing10.put("value",hiddenDanger.getCheckorName());
+ thing10.put("value",hiddenDanger.getMemberName());
//閫氱煡鏃堕棿
Map<String, Object> time16 = new HashMap<String,Object>();
time16.put("value", DateUtil.getFomartDate(hiddenDanger.getDealTime(),"yyyy骞碝M鏈坉d鏃� HH:mm:ss") );
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 5490709..55bdfcb 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
@@ -311,6 +311,10 @@
@TableField(exist = false)
private String createMemberName;
+ @ApiModelProperty(value = "鍒涘缓浜虹數璇�", example = "1")
+ @TableField(exist = false)
+ private String createMobile;
+
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
private ApproveDataVO approveDateVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
index 5434080..f358047 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -46,8 +46,10 @@
@ApiModelProperty(value = "鎷滆鏃堕棿")
private String visitTime;
- @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵��")
+ @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵�佸��")
private String info;
+ @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵�� 1=寰呭鎵癸紱2=瀹℃壒閫氳繃锛�3=瀹℃壒鏈�氳繃锛�4=涓氬姟鍙栨秷")
+ private Integer infoStatus;
@ApiModelProperty(value = "闅忚浜哄憳淇℃伅")
private List<Visits> withVisitsList;
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 26effca..9f5485e 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
@@ -210,7 +210,6 @@
hiddenDanger.setMemberName(systemUser.getRealname());
//鎻愪氦浜虹殑寰俊鍏紬鍙烽�氱煡
if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
-
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -222,10 +221,9 @@
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId())
.last(" limit 1 "));
+
//澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
-
-
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -605,6 +603,7 @@
if(Objects.isNull(hiddenDangerCate)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
}
+ model.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
@@ -625,6 +624,7 @@
.eq(Notices::getObjId,hiddenDanger.getId())
.eq(Notices::getObjType,Constants.THREE)
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
+ .orderByDesc(Notices::getId)
.last(" limit 1 ")
);
if(Objects.nonNull(notices)){
@@ -651,6 +651,7 @@
return;
}
hiddenDanger.setMemberName(memberUser.getRealname());
+ model.setMemberName(memberUser.getRealname());
SystemUser checkUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
@@ -667,7 +668,7 @@
if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
- wxNoticeConfigMapper,hiddenDanger,
+ wxNoticeConfigMapper,model,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(checkUser.getOpenid().split(",")));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 9fb8713..4b577ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -368,19 +368,24 @@
//寮�鍚煭淇￠�氱煡
if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
- Visits visits = visitsMapper.selectById(objId);
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
+ .selectAs(SystemUser::getMobile,Visits::getCreateMobile)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Visits::getMemberId)
+ .eq(Visits::getId,objId)
+ .last(" limit 1")
+ );
if(Objects.nonNull(visits)){
if(objCode.equals(SmsConstants.visitReportingContent.visitReportingAuditSuccess)){
// 鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡缁忓鎵归�氳繃锛岃閫氱煡璁垮浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍚庝箻鍧恵杞︾墝鍙穧鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉銆�
content = content.replace("{棰勭害鍏ュ洯寮�濮嬫椂闂磢",DateUtil.getFomartDate(visits.getStarttime(),"yyyy-MM-dd HH:mm"))
.replace("{杞︾墝鍙穧",visits.getCarNos());
sendBusinessSms(emayService,smsEmailMapper,
- Arrays.asList(visits.getPhone().split(",")),SmsConstants.visitReport,content,visits.getId());
+ Arrays.asList(visits.getCreateMobile().split(",")),SmsConstants.visitReport,content,visits.getId());
}else if(objCode.equals(SmsConstants.visitReportingContent.visitReportingAuditFail)){
//鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯诲鎵逛汉銆�
content = content.replace("{椹冲洖鍘熷洜}",msg);
sendBusinessSms(emayService,smsEmailMapper,
- Arrays.asList(visits.getPhone().split(",")),SmsConstants.visitReport,content,visits.getId());
+ Arrays.asList(visits.getCreateMobile().split(",")),SmsConstants.visitReport,content,visits.getId());
}else if(objCode.equals(SmsConstants.visitReportingContent.visitReportingTimeOutSignOut)){
//鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡浜巤棰勭害鍏ュ洯缁撴潫鏃堕棿}鍒版湡锛岃鍙婃椂绂诲満锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉
content = content.replace("{棰勭害鍏ュ洯缁撴潫鏃堕棿}",DateUtil.getFomartDate(visits.getEndtime(),"yyyy-MM-dd HH:mm"));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 9a097fd..2876618 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1409,17 +1409,29 @@
memberId)
);
// }
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)){
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
+ .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .last(" limit 1 ")
+ );
+ visitDetailVO.setInfoStatus(1);
+ if(Objects.nonNull(notices)){
+ visitDetailVO.setInfo(notices.getInfo());
+ }else{
+ visitDetailVO.setInfo("鏆傛棤");
+ }
+ }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.noPass)){
+ visitDetailVO.setInfoStatus(Constants.VisitStatus.noPass);
+ visitDetailVO.setInfo("瀹℃壒鏈�氳繃");
- Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
- .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
- .eq(Notices::getUserId,memberId)
- .eq(Notices::getSendacopy,Constants.ZERO)
- .last(" limit 1 ")
- );
- if(Objects.nonNull(notices)){
- notices.setInfo(notices.getInfo());
+ }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.cancel)){
+ visitDetailVO.setInfoStatus(Constants.VisitStatus.cancel);
+ visitDetailVO.setInfo("宸插彇娑�");
}else{
- notices.setInfo("鏆傛棤");
+ visitDetailVO.setInfoStatus(Constants.VisitStatus.pass);
+ visitDetailVO.setInfo("瀹℃壒宸查�氳繃");
}
return visitDetailVO;
}
@@ -1797,7 +1809,7 @@
SmsEmailServiceImpl.sendVisitTimeOutSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,
SmsConstants.visitContent.visitTimeOutSignOutNum,
- visitReportTimeCount.toString(),Arrays.asList(mobile.split(","))
+ visitTimeCount.toString(),Arrays.asList(mobile.split(","))
);
}
}
--
Gitblit v1.9.3