Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -728,14 +728,15 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
                         .eq("id",contactsId)));
             }
         }else if(salesId!=null){
+            //要找销售订单对应的客户,然后再找客户对应的联系人
             SalesOrder salesOrder = salesOrderMapper.selectById(salesId);
-            if (salesOrder==null||salesOrder.getContactsId()==null){
+            if (salesOrder==null||salesOrder.getCustomId()==null){
                 mgs.setData(new ArrayList<Contacts>());
             }else {
-                Integer contactsId = salesOrder.getContactsId();
+                Integer contactsId = salesOrder.getCustomId();
                 mgs.setData(contactsMapper.selectList(new QueryWrapper<Contacts>()
                         .eq("company_id",user.getCompanyId())
-                        .eq("id",contactsId)));
+                        .eq("custom_id",contactsId)));
             }
 
         }

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

@@ -123,9 +123,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         BeanUtils.copyProperties(taskDto,task);
         task.setCreateDate(LocalDateTime.now());//任务的创建时间
         //根据任务的开始时间与当下时间判断任务的状态
-        if (taskDto.getStartDate()==null||taskDto.getStartDate().isAfter(LocalDateTime.now())){
+        if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isAfter(LocalDateTime.now())){
             task.setStatus(0);
-        }else {
+        }else if (taskDto.getEndDate()!=null&&taskDto.getEndDate().isBefore(LocalDateTime.now())){
+            task.setStatus(3);
+        } else if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isBefore(LocalDateTime.now())&&taskDto.getEndDate()!=null&&taskDto.getEndDate().isAfter(LocalDateTime.now()))
+        {
             task.setStatus(1);
         }
         task.setCreaterName(user.getName());
@@ -441,7 +444,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 task.setCompanyId(companyId);
                 task.setCreaterId(user.getId());
                 task.setCreateDate(LocalDateTime.now());
-                task.setStatus(0);
+//                task.setStatus(0);
                 task.setIsDelete(0);
                 for (int i = 0; i < cellNum; i++) {
                     String modelName = modelNameList.get(i);
@@ -690,6 +693,15 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                         msg.setError("任务:"+task.getTaskName()+"中客户/商机/销售订单不应一同存在");
                         return msg;
                     }
+                    if (task.getStartDate()!=null&&task.getStartDate().isAfter(LocalDateTime.now())){
+                        task.setStatus(0);
+                    }else if (task.getEndDate()!=null&&task.getEndDate().isBefore(LocalDateTime.now())){
+                        task.setStatus(3);
+                    } else if (task.getStartDate()!=null&&task.getStartDate().isBefore(LocalDateTime.now())&&task.getEndDate()!=null&&task.getEndDate().isAfter(LocalDateTime.now()))
+                    {
+                        task.setStatus(1);
+                    }
+
                 }
                 if(saveOrUpdateBatch(importTaskList)){
                     ArrayList<TaskExecutor> taskExecutors = new ArrayList<>();
@@ -781,7 +793,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         dataList.add(titleList);//设置表头
 
         taskDto.setCompanyId(user.getCompanyId());
-        taskDto.setPageIndex(null).setPageSize(null);//暂时部不分页
+        taskDto.setPageIndex(null).setPageSize(null);
         List<TasKVo> taskVoList =taskMapper.getPageListTask(taskDto);
         if (!taskVoList.isEmpty()){
             for (TasKVo tasKVo : taskVoList) {

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

@@ -105,7 +105,7 @@
             left join  clue on task.clue_id=clue.id
             left join  contacts on task.contacts_id=contacts.id
             <if test=" executorName!= null and executorName != '' " >
-                inner join task_executor on task.id=task_executor.task_id
+                inner join task_executor te on task.id=te.task_id
             </if>
             <if test=" departmentId!= null " >
             inner join task_executor on task.id=task_executor.task_id
@@ -144,7 +144,7 @@
                 AND task.status = #{status}
             </if>
             <if test=" executorName!= null and executorName != '' ">
-                AND task_executor.executor_name LIKE CONCAT('%', #{executorName}, '%')
+                AND te.executor_name LIKE CONCAT('%', #{executorName}, '%')
             </if>
             <if test=" startDate!= null">
                 AND task.start_date &gt; #{startDate}
@@ -185,7 +185,7 @@
         left join  clue on task.clue_id=clue.id
         left join  contacts on task.contacts_id=contacts.id
         <if test=" executorName!= null and executorName != '' " >
-            inner join task_executor on task.id=task_executor.task_id
+            inner join task_executor te on task.id=te.task_id
         </if>
         <if test=" departmentId!= null " >
             inner join task_executor on task.id=task_executor.task_id
@@ -226,7 +226,7 @@
                 AND task.status = #{status}
             </if>
             <if test=" executorName!= null and executorName != '' ">
-                AND task_executor.executor_name LIKE CONCAT('%', #{executorName}, '%')
+                AND te.executor_name LIKE CONCAT('%', #{executorName}, '%')
             </if>
             <if test=" startDate!= null  ">
                 AND task.start_date &gt; #{startDate}