任务详情,合同详情

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

@@ -78,6 +78,13 @@ public class ContractController {
         return contractService.exportContractOneToMany(request,number,name,typeName,status,startDate,endDate, paymentStartDate, paymentEndDate, secTypeId,customerOrg,finishStatus);
     }
 
+
+    @RequestMapping("/getContractDetail")
+    public HttpRespMsg getContractDetail (HttpServletRequest request, Integer id){
+        return contractService.getContractDetail(request,id);
+    }
+
+
     /**
      * 导入合同
      */

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

@@ -124,6 +124,11 @@ public class TaskController {
         return taskService.updateTaskStatus(taskDto,request);
     }
 
+    @RequestMapping("getTaskDetail")
+    public HttpRespMsg getTaskDetail(Integer id){
+        return taskService.getTaskDetail(id,request);
+    }
+
     /**
      * 定时修改过期的任务状态
      */

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

@@ -44,4 +44,6 @@ public interface ContractService extends IService<Contract> {
     HttpRespMsg pinContract(Contract contract, HttpServletRequest request);
 
     HttpRespMsg undoPin(Contract contract, HttpServletRequest request);
+
+    HttpRespMsg getContractDetail(HttpServletRequest request, Integer id);
 }

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

@@ -40,4 +40,6 @@ public interface TaskService extends IService<Task> {
     HttpRespMsg pinTasks(Task task, HttpServletRequest request);
 
     HttpRespMsg undoPin(Task task, HttpServletRequest request);
+
+    HttpRespMsg getTaskDetail(Integer id, HttpServletRequest request);
 }

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

@@ -1672,4 +1672,21 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         );
         return respMsg;
     }
+
+    @Override
+    public HttpRespMsg getContractDetail(HttpServletRequest request, Integer id) {
+        HttpRespMsg respMsg = new HttpRespMsg();
+        Contract contract = contractMapper.selectById(id);
+        List<ContractCustom> selectedList = contractCustomMapper.selectList(new QueryWrapper<ContractCustom>().eq("contract_id", contract.getId()));
+        if (selectedList != null && !selectedList.isEmpty()) {
+            contract.setCustomData(selectedList.get(0));
+        }
+        List<ContractPayCustomized> payCustomizedList = contractPayCustomizedMapper.selectList(new QueryWrapper<ContractPayCustomized>().eq("contract_id", contract.getId()));
+        if (payCustomizedList != null && !payCustomizedList.isEmpty()) {
+            contract.setPayCustomizedData(payCustomizedList.get(0));
+        }
+        respMsg.setData(contract);
+        return respMsg;
+
+    }
 }

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

@@ -14,6 +14,7 @@ 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;
@@ -1290,6 +1291,57 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         return respMsg;
     }
 
+    @Override
+    public HttpRespMsg getTaskDetail(Integer id, HttpServletRequest request) {
+        HttpRespMsg respMsg = new HttpRespMsg();
+        TasKVo tasKVo = new TasKVo();
+        Task task = taskMapper.selectById(id);
+        if (task!=null){
+            BeanUtils.copyProperties(task,tasKVo);
+            if (task.getContactsId()!=null){
+                Contacts contacts = contactsMapper.selectById(task.getContactsId());
+                if (contacts!=null){
+                    tasKVo.setContactsName(contacts.getName());
+                }
+            }
+            if (task.getClueId()!=null){
+                Clue clue = clueMapper.selectById(task.getClueId());
+                if (clue!=null){
+                    tasKVo.setClueName(clue.getClueName());
+                }
+            }
+            if (task.getCustomId()!=null){
+                Custom custom = customMapper.selectById(task.getCustomId());
+                if (custom!=null){
+                    tasKVo.setCustomName(custom.getCustomName());
+                }
+            }
+            if (task.getBusinessOpportunityId()!=null){
+                BusinessOpportunity businessOpportunity = businessOpportunityMapper.selectById(task.getBusinessOpportunityId());
+                if (businessOpportunity!=null){
+                    tasKVo.setBusinessName(businessOpportunity.getName());
+                }
+            }
+            if (task.getOrderId()!=null){
+                SalesOrder salesOrder = salesOrderMapper.selectById(task.getOrderId());
+                if (salesOrder!=null){
+                    tasKVo.setOrderName(salesOrder.getOrderName());
+                }
+            }
+            List<TaskExecutor> executorList = taskExecutorService.list(new QueryWrapper<TaskExecutor>().eq("task_id", id));
+            if (!executorList.isEmpty()){
+                List<String> collect = executorList.stream().map(TaskExecutor::getExecutorName).collect(Collectors.toList());
+                tasKVo.setTaskExecutors(collect);
+            }
+            List<TaskLog> taskLogList = taskLogService.list(new QueryWrapper<TaskLog>().eq("task_id", id));
+            if (!taskLogList.isEmpty()){
+                tasKVo.setTaskLogs(taskLogList);
+            }
+        }
+        respMsg.setData(tasKVo);
+        return respMsg;
+    }
+
     public void updateTaskRepeatConfigure(Task task){
         task.setRepeatType(null).setRepeatEndNever(null).setRepeatEndCount(null)
                 .setRepeatEndDate(null).setRepeatDesignDay(null).setRepeatDesignSameday(null)