yusm 9 月之前
父節點
當前提交
7871217d18

+ 1 - 1
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/TaskController.java

@@ -300,7 +300,7 @@ public class TaskController {
             for (String userId : executorIdList) {
                 Information information = new Information();
                 information.setUserId(userId).setMsg(msg)
-                        .setTime(LocalDateTime.now()).setChecked(0);
+                        .setTime(new Date()).setChecked(0);
                 informationArrayList.add(information);
             }
             informationService.saveBatch(informationArrayList);

+ 6 - 1
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Information.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -53,7 +55,7 @@ public class Information extends Model<Information> {
      * 时间
      */
     @TableField("time")
-    private LocalDateTime time;
+    private Date time;
 
     /**
      * 是否被查看
@@ -64,6 +66,9 @@ public class Information extends Model<Information> {
     @TableField("msg")
     private String msg;
 
+    @TableField(exist = false)
+    private String path;
+
 
     @Override
     protected Serializable pkVal() {

+ 2 - 2
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessTripServiceImpl.java

@@ -348,7 +348,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         //系统内消息
         Information information=new Information();
         information.setUserId(owner.getId());
-        information.setTime(LocalDateTime.now());
+        information.setTime(new Date());
         information.setMsg("您"+applyTimeDesc + "出差申请审核"+(sheet.getStatus() == 0?"已通过":"已驳回")+", 审核人:"
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(5);
@@ -360,7 +360,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         //系统内消息
         Information information=new Information();
         information.setUserId(sheet.getAuditorId());
-        information.setTime(LocalDateTime.now());
+        information.setTime(new Date());
         User owner = userMapper.selectById(sheet.getOwnerId());
         information.setMsg("出差待审核, 申请人:" + (owner.getCorpwxUserid() != null?("$userName="+owner.getCorpwxUserid()+"$"):owner.getName()));
         information.setType(5);

+ 1 - 1
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -142,7 +142,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
                 return msg;
             }
 
-            if (custom.getCustomName() != null && contactsMapper.selectCount(new QueryWrapper<Contacts>()
+            if (custom.getContactsName() != null && contactsMapper.selectCount(new QueryWrapper<Contacts>()
                     .eq("name", custom.getContactsName())
             ) == 0) {
                 msg.setError("此联系人不存在");

+ 5 - 5
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -247,7 +247,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     for (User item : targetUserList) {
                         Information information=new Information();
                         information.setUserId(item.getId());
-                        information.setTime(LocalDateTime.now());
+                        information.setTime(new Date());
                         information.setMsg("费用报销待审核");
                         information.setType(3);
                         information.setContent(sheet.getCreateDate()+"");
@@ -342,7 +342,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     for (User item : targetUserList) {
                         Information information=new Information();
                         information.setUserId(item.getId());
-                        information.setTime(LocalDateTime.now());
+                        information.setTime(new Date());
                         information.setMsg("费用报销待审核");
                         information.setType(3);
                         information.setContent(sheet.getCreateDate()+"");
@@ -394,7 +394,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
             for (User item : targetUserList) {
                 Information information=new Information();
                 information.setUserId(item.getId());
-                information.setTime(LocalDateTime.now());
+                information.setTime(new Date());
                 information.setMsg("费用报销待审核");
                 information.setType(3);
                 information.setContent(sheet.getCreateDate()+"");
@@ -676,7 +676,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 for (User item : targetUserList) {
                     Information information=new Information();
                     information.setUserId(item.getId());
-                    information.setTime(LocalDateTime.now());
+                    information.setTime(new Date());
                     information.setMsg("费用报销待审核");
                     information.setType(3);
                     information.setContent(sheet.getCreateDate()+"");
@@ -789,7 +789,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         //系统内消息
         Information information=new Information();
         information.setUserId(owner.getId());
-        information.setTime(LocalDateTime.now());
+        information.setTime(new Date());
         information.setMsg("您"+(sheet.getCreateDate() == null?"":dateTimeFormatter.format(sheet.getCreateDate())) + "费用报销申请审核"+(sheet.getStatus() == 0?"已通过":"已驳回")+", 审核人:"
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(3);//费用报销模块

+ 4 - 0
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/InformationServiceImpl.java

@@ -69,6 +69,10 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
                     }
                 }
             }
+
+            information.forEach(i->{
+                i.setPath("/tasks");
+            });
             httpRespMsg.data = information;
         } catch (NullPointerException e) {
             //httpRespMsg.setError("验证失败");

+ 2 - 2
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -209,7 +209,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         //系统内消息
         Information information=new Information();
         information.setUserId(owner.getId());
-        information.setTime(LocalDateTime.now());
+        information.setTime(new Date());
         information.setMsg("您"+applyTimeDesc + "请假申请审核"+(sheet.getStatus() == 0?"已通过":"已驳回")+", 审核人:"
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(4);
@@ -221,7 +221,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         //系统内消息
         Information information=new Information();
         information.setUserId(sheet.getAuditorId());
-        information.setTime(LocalDateTime.now());
+        information.setTime(new Date());
         User owner = userMapper.selectById(sheet.getOwnerId());
         information.setMsg("请假待审核, 请假人:" + (owner.getCorpwxUserid() != null?("$userName="+owner.getCorpwxUserid()+"$"):owner.getName()));
         information.setType(4);

+ 2 - 2
fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -171,7 +171,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 taskExecutorMapper.insert(taskExecutor);
                 information.setUserId(executorId);
             }
-            information.setTime(LocalDateTime.now()).setChecked(0).setMsg("你有新的任务");
+            information.setTime(new Date()).setChecked(0).setMsg("你有新的任务");
             informationArrayList.add(information);
             informationService.saveBatch(informationArrayList);
         }
@@ -872,7 +872,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                         taskLogs.add(taskLog);
 
 
-                        information.setMsg("你有新的任务").setTime(LocalDateTime.now()).setChecked(0);
+                        information.setMsg("你有新的任务").setTime(new Date()).setChecked(0);
                         informationArrayList.add(information);
                     }