|
|
@@ -2,13 +2,16 @@ package com.goafanti.techproject.service.impl;
|
|
|
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TaskAnnualReportMapper;
|
|
|
+import com.goafanti.common.dao.TaskDetailsLogMapper;
|
|
|
import com.goafanti.common.dao.TaskDetailsMapper;
|
|
|
import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.common.model.TaskAnnualReport;
|
|
|
import com.goafanti.common.model.TaskDetails;
|
|
|
+import com.goafanti.common.model.TaskDetailsLog;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
@@ -32,6 +35,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
private TaskDetailsMapper taskDetailsMapper;
|
|
|
|
|
|
@Resource
|
|
|
+ private TaskDetailsLogMapper taskDetailsLogMapper;
|
|
|
+
|
|
|
+ @Resource
|
|
|
private TOrderNewMapper tOrderNewMapper;
|
|
|
@Resource
|
|
|
private TaskAnnualReportMapper taskAnnualReportMapper;
|
|
|
@@ -72,10 +78,29 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
//数据计算
|
|
|
countTaskDetails(taskDetails);
|
|
|
this.taskDetailsMapper.insert(taskDetails);
|
|
|
-
|
|
|
+ TaskDetailsLog log=new TaskDetailsLog();
|
|
|
+ BeanUtils.copyProperties(log, taskDetails);
|
|
|
+ System.out.println(log);
|
|
|
+// pushPram(taskDetails, log);
|
|
|
return taskDetails;
|
|
|
}
|
|
|
|
|
|
+ private void pushPram(TaskDetails taskDetails, TaskDetailsLog log) {
|
|
|
+ log.setTdid(taskDetails.getId());
|
|
|
+ log.setUid(taskDetails.getUid());
|
|
|
+ log.setWorkersNumber(taskDetails.getWorkersNumber());
|
|
|
+ log.setTechnologyNumber(taskDetails.getTechnologyNumber());
|
|
|
+ log.setWorkersRate(taskDetails.getWorkersRate());
|
|
|
+ log.setRdBudget(taskDetails.getRdBudget());
|
|
|
+ log.setRdSalesAmount(taskDetails.getRdSalesAmount());
|
|
|
+ log.setActualRdNumber(taskDetails.getActualRdNumber());
|
|
|
+ log.setThreeYearsRdBudgetRate(taskDetails.getThreeYearsRdBudgetRate());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
private void countTaskDetails(TaskDetails taskDetails) {
|
|
|
//计算人员占比
|
|
|
if (taskDetails.getWorkersNumber()!=null||
|