钉钉消息模版添加推送时间

src/main/java/com/fdkankan/sale/entity/RepairLog.java

@@ -9,6 +9,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -22,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 @Getter
 @Setter
 @TableName("t_repair_log")
+@ToString
 public class RepairLog implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/fdkankan/sale/httpClient/request/OaData.java

@@ -1,5 +1,6 @@
 package com.fdkankan.sale.httpClient.request;
 
+import com.fdkankan.sale.util.DateUtil;
 import lombok.Data;
 
 @Data
@@ -14,4 +15,11 @@ public class OaData {
     private String  description;
 
     private Long sysUserId;
+
+    private String sendDate;
+
+    public String getSendDate() {
+
+        return DateUtil.getDate();
+    }
 }

src/main/java/com/fdkankan/sale/service/impl/DingService.java

@@ -102,6 +102,9 @@ public class DingService {
             HashSet<String> phones = new HashSet<>();
 
             OaData oaData = getOaData(repairLog);
+            if(oaData == null){
+                return;
+            }
             if(oaData.getSysUserId() != null){
                 Long sysUserId = oaData.getSysUserId();
                 SysUser sysUser = sysUserService.getById(sysUserId);
@@ -135,7 +138,8 @@ public class DingService {
                 }
             }
             if(phones.size() <=0){
-                throw new BusinessException(ResultCode.DING_SEND_ERROR);
+                log.info("send-dingding:repairLog:{},phone:{}",repairLog,phones);
+                return;
             }
             DingMsgReq dingMsgReq = new DingMsgReq();
             dingMsgReq.setAgent_id(dingConfig.getAgentId());
@@ -163,6 +167,7 @@ public class DingService {
             fileContent = fileContent.replaceAll("\\{warrantyTypeStr}",oaData.getWarrantyTypeStr());
             fileContent = fileContent.replaceAll("\\{repairStatusStr}",oaData.getRepairStatusStr());
             fileContent = fileContent.replaceAll("\\{description}",oaData.getDescription());
+            fileContent = fileContent.replaceAll("\\{sendDate}",oaData.getSendDate());
             dingMsgReq.setUserid_list(userIds);
             dingMsgReq.setMsg(JSONObject.parseObject(fileContent));
             dingMsgReq.setTo_all_user(false);
@@ -189,6 +194,9 @@ public class DingService {
         RepairLogVo repairLogVo = new RepairLogVo();
         BeanUtils.copyProperties(repairLog,repairLogVo);
         RepairLogVo nextStepVo = repairInfoService.getNextStepVo(repairLogVo);
+        if(nextStepVo == null){
+            return null;
+        }
         oaData.setDescription(nextStepVo.getSubTitle());
         oaData.setSysUserId(nextStepVo.getSysUserId());
         return oaData;