information相关bug修改

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -235,6 +235,10 @@ public class SalesOrderController {
                 msg.setError("存在关联产品的订单,删除失败");
                 return msg;
             }
+            if(taskService.count(new LambdaQueryWrapper<Task>().eq(Task::getIsDelete,0).in(Task::getOrderId,idList))>0){
+                msg.setError("存在关联任务的订单,删除失败");
+                return msg;
+            }
             orderList.forEach(o->{
                 o.setIsDelete(1);
                 o.setUpdateTime(LocalDateTime.now());
@@ -513,7 +517,17 @@ public class SalesOrderController {
         SalesOrderPayment payment = salesOrderPaymentService.getById(paymentId);
         SalesOrder salesOrder = salesOrderService.getById(payment.getOrderId());
         List<SalesOrderPayment> list = salesOrderPaymentService.list(new LambdaQueryWrapper<SalesOrderPayment>().eq(SalesOrderPayment::getOrderId, salesOrder.getId()).orderByAsc(SalesOrderPayment::getCreateTime));
-        int i = list.indexOf(payment);
+//        int i = list.indexOf(payment);
+        int i = 0;
+        for (SalesOrderPayment salesOrderPayment : list) {
+            if(salesOrderPayment.getId().equals(paymentId)){
+                break;
+            }
+            i++;
+        }
+
+        System.out.println("i==="+i);
+
         if(money!=null){
             if(salesOrder.getReceivedStatus()==2){
                 msg.setError("当前订单已完全回款");
@@ -532,9 +546,14 @@ public class SalesOrderController {
             BigDecimal nowMoney = new BigDecimal(money);
             BigDecimal oldMoney = payment.getMoney();
             //离当前回款数据最近一次回款的未回款数据作为依据
-            SalesOrderPayment salesOrderPayment =list.size()>1?list.get(i-1):list.get(i);
-            BigDecimal unReceivedPayment = salesOrderPayment.getUnReceivedPayment();
-            unReceivedPayment=unReceivedPayment.add(oldMoney).subtract(nowMoney);
+            BigDecimal unReceivedPayment = new BigDecimal(0);
+            if(i ==0){
+                unReceivedPayment = salesOrder.getPrice().subtract(payment.getMoney());
+            }else{
+                SalesOrderPayment salesOrderPayment =list.size()>1?list.get(i-1):list.get(i);
+                unReceivedPayment = salesOrderPayment.getUnReceivedPayment();
+                unReceivedPayment=unReceivedPayment.add(oldMoney).subtract(nowMoney);
+            }
             payment.setMoney(new BigDecimal(money));
             payment.setUnReceivedPayment(unReceivedPayment);
             if(!salesOrderPaymentService.updateById(payment)){

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

@@ -316,7 +316,8 @@ public class TaskController {
             for (String userId : executorIdList) {
                 Information information = new Information();
                 information.setUserId(userId).setMsg(msg)
-                        .setTime(new Date()).setChecked(0);
+                        .setTime(new Date()).setChecked(0)
+                        .setPath("/tasks");
                 informationArrayList.add(information);
             }
             informationService.saveBatch(informationArrayList);
@@ -335,7 +336,7 @@ public class TaskController {
             for (String userId : executorIdList) {
                 Information information = new Information();
                 information.setUserId(userId).setMsg(msg)
-                        .setTime(new Date()).setChecked(0);
+                        .setTime(new Date()).setChecked(0).setPath("/tasks");
                 informationArrayList.add(information);
                 User user = userMapper.selectById(userId);
                 WxCorpInfo corpinfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));

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

@@ -1,17 +1,16 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-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 com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 提示消息
@@ -66,7 +65,7 @@ public class Information extends Model<Information> {
     @TableField("msg")
     private String msg;
 
-    @TableField(exist = false)
+    @TableField("path")
     private String path;
 
 

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

@@ -1,17 +1,15 @@
 package com.management.platform.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.controller.AuditWorkflowSettingController;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
 import com.management.platform.service.AuditWorkflowSettingService;
 import com.management.platform.service.BusinessTripService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.service.DepartmentService;
 import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.util.ExcelUtil;
@@ -353,6 +351,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(5);
         information.setContent(sheet.getId()+"");
+        information.setPath("/business-trip");
         informationMapper.insert(information);
     }
 
@@ -365,6 +364,7 @@ public class BusinessTripServiceImpl extends ServiceImpl<BusinessTripMapper, Bus
         information.setMsg("出差待审核, 申请人:" + (owner.getCorpwxUserid() != null?("$userName="+owner.getCorpwxUserid()+"$"):owner.getName()));
         information.setType(5);
         information.setContent(sheet.getId()+"");
+        information.setPath("/business-trip");
         informationMapper.insert(information);
     }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -1116,6 +1116,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             information.setUserId(target.getCreatorId());
             information.setType(6);
             information.setMsg("您提交的合同[" + target.getName() + "]由[" + user.getName() + "]审核通过。");
+            information.setPath("/contract");
             informationMapper.insert(information);
         }else if (status.equals(2)){
             contractLog.setType(3);
@@ -1130,6 +1131,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             int i = item.indexOf("原因：");
             String substring = item.substring(i, item.length());
             information.setMsg("您提交的合同[" + target.getName() + "]被[" + user.getName() + "]驳回，" + substring + "。");
+            information.setPath("/contract");
             informationMapper.insert(information);
         }
         contractLogMapper.insert(contractLog);

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

@@ -5,11 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jayway.jsonpath.internal.function.numeric.Sum;
-import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
@@ -20,7 +17,6 @@ import com.management.platform.util.MessageUtils;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Header;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -37,7 +33,6 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -251,6 +246,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         information.setMsg("费用报销待审核");
                         information.setType(3);
                         information.setContent(sheet.getCreateDate()+"");
+                        information.setPath("/expense-sheet");
                         informationList.add(information);
                     }
                     informationService.saveBatch(informationList);
@@ -346,6 +342,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         information.setMsg("费用报销待审核");
                         information.setType(3);
                         information.setContent(sheet.getCreateDate()+"");
+                        information.setPath("/expense-sheet");
                         informationList.add(information);
                     }
                     informationService.saveBatch(informationList);
@@ -398,6 +395,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 information.setMsg("费用报销待审核");
                 information.setType(3);
                 information.setContent(sheet.getCreateDate()+"");
+                information.setPath("/expense-sheet");
                 informationList.add(information);
             }
             informationService.saveBatch(informationList);
@@ -680,6 +678,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                     information.setMsg("费用报销待审核");
                     information.setType(3);
                     information.setContent(sheet.getCreateDate()+"");
+                    information.setPath("/expense-sheet");
                     informationList.add(information);
                 }
                 informationService.saveBatch(informationList);
@@ -794,6 +793,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(3);//费用报销模块
         information.setContent(sheet.getId()+"");
+        information.setPath("/expense-sheet");
         informationMapper.insert(information);
     }
 

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

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

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

@@ -5,13 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.controller.AuditWorkflowSettingController;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
 import com.management.platform.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
 import com.management.platform.util.MessageUtils;
 import com.management.platform.util.WorkDayCalculateUtils;
@@ -19,15 +18,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.xml.transform.Source;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -214,6 +209,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
                 +(auditor.getCorpwxUserid() != null ? ("$userName="+auditor.getCorpwxUserid()+"$"):auditor.getName()));
         information.setType(4);
         information.setContent(sheet.getId()+"");
+        information.setPath("/leave-sheet");
         informationMapper.insert(information);
     }
 
@@ -226,6 +222,7 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
         information.setMsg("请假待审核, 请假人:" + (owner.getCorpwxUserid() != null?("$userName="+owner.getCorpwxUserid()+"$"):owner.getName()));
         information.setType(4);
         information.setContent(sheet.getId()+"");
+        information.setPath("/leave-sheet");
         informationMapper.insert(information);
     }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -2598,6 +2598,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             information.setContent(format);//日报的日期
             //information.setMsg(projectName+"项目，日报审批通过");
             information.setMsg(projectName + MessageUtils.message("other.proDailyRep"));
+            information.setPath("/report");
             informationList.add(information);
 
             userIdList.add(n.getUserId());
@@ -2819,7 +2820,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             fillUserId = oneReport.getCreatorId();
         }
 
-        informationMapper.insert(new Information().setType(0).setContent(date).setUserId(fillUserId).setMsg(str));
+        informationMapper.insert(new Information().setType(0).setContent(date).setUserId(fillUserId).setMsg(str).setPath("/report"));
         //对导入审核，添加记录
         int channel = oldState == -1 ? 0 : 1; //0-导入审核, 项目报告审核
         ReportAuditLog log = new ReportAuditLog();
@@ -6259,7 +6260,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             String str = MessageUtils.message("report.dailyReject", createDate, pNames, user.getName(), reason);
             String fillUserId = oneReport.getCreatorId();
 
-            informationMapper.insert(new Information().setType(0).setContent(createDate).setUserId(fillUserId).setMsg(str));
+            informationMapper.insert(new Information().setType(0).setContent(createDate).setUserId(fillUserId).setMsg(str).setPath("/report"));
 
             //发送企业微信通知消息
             User reporter = userMapper.selectById(fillUserId);

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

@@ -14,7 +14,6 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.*;
 import com.management.platform.util.ExcelUtil;
 import com.management.platform.util.HttpRespMsg;
-import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -171,7 +170,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 taskExecutorMapper.insert(taskExecutor);
                 information.setUserId(executorId);
             }
-            information.setTime(new Date()).setChecked(0).setMsg("你有新的任务");
+            information.setTime(new Date()).setChecked(0).setMsg("你有新的任务").setPath("/tasks");
             informationArrayList.add(information);
             informationService.saveBatch(informationArrayList);
             if (wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
@@ -865,7 +864,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
                                 Information information = new Information();
                                 information.setUserId(userList.stream().filter(u -> u.getId().equals(userId)).collect(Collectors.toList()).get(0).getId());
-                                information.setMsg("你有新的任务").setTime(new Date()).setChecked(0);
+                                information.setMsg("你有新的任务").setTime(new Date()).setChecked(0).setPath("/tasks");
                                 informationArrayList.add(information);
                             }
                         }