Browse Source

配置修改

anderx 2 years ago
parent
commit
90a4b4f073

+ 5 - 2
ruoyi-system/src/main/java/com/ruoyi/project/domain/ProjectStaffRecordLog.java

@@ -1,11 +1,13 @@
 package com.ruoyi.project.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * project_staff_record_log
- * @author 
+ * @author
  */
 public class ProjectStaffRecordLog implements Serializable {
     /**
@@ -41,6 +43,7 @@ public class ProjectStaffRecordLog implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     private static final long serialVersionUID = 1L;
@@ -100,4 +103,4 @@ public class ProjectStaffRecordLog implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-}
+}

+ 5 - 6
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -82,7 +82,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         projectStaffRecordMapper.insertSelective(in);
         addRecordLog(in);
         if (flag){
-            addWechatAppSend(in, String.format("[%s]发起研发打卡,请及时审核!", username));
+            addWechatAppSend(in, String.format("[%s]发起打卡,请及时审核!", username));
         }
         return AjaxResult.success();
     }
@@ -273,8 +273,6 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         switch (processStatus) {
             case 0: return "修改了内容!";
             case 1: return "发起了审核!";
-            case 2: return "完成了审核!";
-            case 3: return "驳回了审核!";
         }
         return "";
     }
@@ -290,7 +288,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         if(in.getProcessStatus()>1)in.setProcessStatus(1);
         projectStaffRecordMapper.updateByPrimaryKeySelective(in);
         if (in.getProcessStatus()==1){
-            addWechatAppSend(in, String.format("[%s]发起研发打卡,及时是审核!", username));
+            addWechatAppSend(in, String.format("[%s]发起打卡,及时是审核!", username));
         }
         addRecordLog(in);
         return AjaxResult.success();
@@ -313,12 +311,13 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
             newP.setExamineName(username);
             newP.setExamineId(SecurityUtils.getUserId());
             newP.setExamineTime(new Date());
+            newP.setExamineContent(in.getContent());
         }
         projectStaffRecordMapper.updateByPrimaryKeySelective(newP);
         if (in.getProcessStatus()==2){
-            addWechatAppSend(in, String.format("[%s]已审核[%s]您的研发打卡.", username,"同意"));
+            addWechatAppSend(in, String.format("[%s]%s您的研发打卡.", username,"同意"));
         }else if (in.getProcessStatus()==3){
-            addWechatAppSend(in, String.format("[%s]已审核[%s]您的研发打卡.", username,"驳回"));
+            addWechatAppSend(in, String.format("[%s]%s您的研发打卡.", username,"驳回"));
         }
         addRecordLog(in);
         return AjaxResult.success();

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/weChat/service/WeChatService.java

@@ -161,6 +161,7 @@ public class WeChatService {
 	private Map<String, Object> getPublicData(String dateTime,  String remarks) {
 		Map<String, Object> we=new HashMap<String, Object>();
 		if (remarks.length()>20)remarks=remarks.substring(0,17)+"...";
+//		if (remarks.length()>30)remarks=remarks.substring(0,27)+"...";
 			Map<String, Object> v1=new HashMap<String, Object>();
 			v1.put("value",dateTime);
 			we.put("time15", v1);