联系人相关bug修改

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

@@ -538,21 +538,25 @@ public class SalesOrderController {
                 return msg;
             }
             double sum = list.stream().mapToDouble(s -> s.getMoney().doubleValue()).sum();
-            if((sum)>salesOrder.getPrice().doubleValue()){
-                msg.setError("总回款金额不能大于订单金额");
-                return msg;
-            }
             //找到原回款数据
             BigDecimal nowMoney = new BigDecimal(money);
             BigDecimal oldMoney = payment.getMoney();
+
+            BigDecimal tmpSum = new BigDecimal(sum);
+            tmpSum = tmpSum.subtract(oldMoney).add(nowMoney);
+            if(tmpSum.compareTo(salesOrder.getPrice()) > 0){
+                msg.setError("总回款金额不能大于订单金额");
+                return msg;
+            }
+
             //离当前回款数据最近一次回款的未回款数据作为依据
             BigDecimal unReceivedPayment = new BigDecimal(0);
             if(i ==0){
-                unReceivedPayment = salesOrder.getPrice().subtract(payment.getMoney());
+                unReceivedPayment = salesOrder.getPrice().subtract(nowMoney);
             }else{
                 SalesOrderPayment salesOrderPayment =list.size()>1?list.get(i-1):list.get(i);
                 unReceivedPayment = salesOrderPayment.getUnReceivedPayment();
-                unReceivedPayment=unReceivedPayment.add(oldMoney).subtract(nowMoney);
+                unReceivedPayment=unReceivedPayment.subtract(nowMoney);
             }
             payment.setMoney(new BigDecimal(money));
             payment.setUnReceivedPayment(unReceivedPayment);

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

@@ -39,7 +39,7 @@ public class VisitPlanController {
             @RequestParam(value = "planId",required = false) Long planId,
             @RequestParam("planName") String planName,
             @RequestParam("customId") Integer customId,
-            @RequestParam("inchargerId") String inchargerId,
+//            @RequestParam("inchargerId") String inchargerId,
             @RequestParam("visitGoal") Integer visitGoal,
             @RequestParam("visitTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")Date visitTime,
             @RequestParam("remark") String remark,
@@ -51,7 +51,7 @@ public class VisitPlanController {
         visitPlan.setId(planId);
         visitPlan.setPlanName(planName);
         visitPlan.setCustomId(customId);
-        visitPlan.setInchargerId(inchargerId);
+//        visitPlan.setInchargerId(inchargerId);
         visitPlan.setVisitGoal(visitGoal);
         visitPlan.setVisitTime(visitTime);
         visitPlan.setRemark(remark);

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

@@ -444,7 +444,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             }
             //合同编号不可重复
             if (StringUtils.isNotBlank(contract.getNumber()) && user.getCompanyId() != 4215){
-                Contract number = contractMapper.selectOne(new QueryWrapper<Contract>().eq("number", contract.getNumber()).eq("company_id", contract.getCompanyId()));
+                Contract number = contractMapper.selectOne(new QueryWrapper<Contract>().eq("number", contract.getNumber()).eq("company_id", user.getCompanyId()));
                 if (number != null && !number.getId().equals(contract.getId())){
                     httpRespMsg.setError("[" + contract.getNumber() + "]" + MessageUtils.message("contract.numberRepeat"));
                     return httpRespMsg;
@@ -1177,6 +1177,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
      * @return
      */
     @Override
+    @Transactional
     public HttpRespMsg deleteContract(HttpServletRequest request, Integer id) {
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");

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

@@ -1035,6 +1035,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         }
         Map<String,Object> resultMap=new HashMap<>();
 
+        customLambdaQueryWrapper.ne(Custom::getIsDelete,1);
+        contactsLambdaQueryWrapper.ne(Contacts::getIsDelete,1);
+        businessOpportunityLambdaQueryWrapper.ne(BusinessOpportunity::getIsDelete,1);
+        salesOrderLambdaQueryWrapper.ne(SalesOrder::getIsDelete,1);
+        clueLambdaQueryWrapper.ne(Clue::getIsDelete,1);
         int customCount = customService.count(customLambdaQueryWrapper);
         int contactsCount = contactsService.count(contactsLambdaQueryWrapper);
         int businessOpportunityCount = businessOpportunityService.count(businessOpportunityLambdaQueryWrapper);
@@ -1045,6 +1050,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         double salesOrdersPrice = salesOrders.stream().filter(i->i.getPrice()!=null).mapToDouble(s -> s.getPrice().doubleValue()).sum();
         Integer clueCount = clueMapper.selectCount(clueLambdaQueryWrapper);
 
+        customLambdaQueryWrapper1.ne(Custom::getIsDelete,1);
+        contactsLambdaQueryWrapper1.ne(Contacts::getIsDelete,1);
+        businessOpportunityLambdaQueryWrapper1.ne(BusinessOpportunity::getIsDelete,1);
+        salesOrderLambdaQueryWrapper1.ne(SalesOrder::getIsDelete,1);
+        clueLambdaQueryWrapper1.ne(Clue::getIsDelete,1);
         int customCount1 = customService.count(customLambdaQueryWrapper1);
         int contactsCount1 = contactsService.count(contactsLambdaQueryWrapper1);
         int businessOpportunityCount1 = businessOpportunityService.count(businessOpportunityLambdaQueryWrapper1);

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

@@ -1301,6 +1301,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 Contacts contacts = contactsMapper.selectById(task.getContactsId());
                 if (contacts!=null){
                     tasKVo.setContactsName(contacts.getName());
+                    tasKVo.setContactsPhone(contacts.getPhone());
                 }
             }
             if (task.getClueId()!=null){

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

@@ -148,6 +148,7 @@ public class VisitPlanServiceImpl extends ServiceImpl<VisitPlanMapper, VisitPlan
 
         }else{
             //新增
+            visitPlan.setInchargerId(user.getId());
             visitPlan.setCompanyId(user.getCompanyId());
             visitPlan.setCorpwxUserid(user.getCorpwxUserid());
 //            Long delayTime = 0L;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ClueMapper.xml

@@ -408,7 +408,7 @@
         c.plate5,
         c.create_time,
         c.create_id,c.need_pin,c.pin_time,
-        (select company_name from company where c.company_id = id) companyName,
+        (select company.company_name from company where c.company_id = company.id) companyName,
         (select name from `user` where id = c.incharger_id) inchargerName,
         (select name from `user` where id = c.create_id) createName,
         (select name from sys_dict where c.clue_source_id = id and code = 'ClueSources') clueSourceValue,
@@ -462,7 +462,7 @@
     <select id="list1ByPin" resultType="com.management.platform.entity.Clue">
         select c.id,
         c.company_id,
-        (select company_name from company where company_id = c.id) companyName,
+        (select company.company_name from company where c.company_id = company.id) companyName,
         c.clue_name,
         c.clue_source_id,
         c.phone,
@@ -536,7 +536,7 @@
     <select id="list2ByPin" resultType="com.management.platform.entity.Clue">
         select c.id,
         c.company_id,
-        (select company_name from company where c.company_id = c.id) companyName,
+        (select company.company_name from company where c.company_id = company.id) companyName,
         c.clue_name,
         c.clue_source_id,
         c.phone,