|
@@ -4,12 +4,10 @@ import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.TaskAnnualReportMapper;
|
|
import com.goafanti.common.dao.TaskAnnualReportMapper;
|
|
|
import com.goafanti.common.dao.TaskDetailsLogMapper;
|
|
import com.goafanti.common.dao.TaskDetailsLogMapper;
|
|
|
import com.goafanti.common.dao.TaskDetailsMapper;
|
|
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.common.model.*;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
|
|
+import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -78,27 +76,21 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
//数据计算
|
|
//数据计算
|
|
|
countTaskDetails(taskDetails);
|
|
countTaskDetails(taskDetails);
|
|
|
this.taskDetailsMapper.insert(taskDetails);
|
|
this.taskDetailsMapper.insert(taskDetails);
|
|
|
- TaskDetailsLog log=new TaskDetailsLog();
|
|
|
|
|
- BeanUtils.copyProperties(log, taskDetails);
|
|
|
|
|
- System.out.println(log);
|
|
|
|
|
-// pushPram(taskDetails, log);
|
|
|
|
|
|
|
+ addTaskDetailsLog(taskDetails);
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
return taskDetails;
|
|
return taskDetails;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void pushPram(TaskDetails taskDetails, TaskDetailsLog log) {
|
|
|
|
|
|
|
+ private void addTaskDetailsLog(TaskDetails taskDetails) {
|
|
|
|
|
+ TaskDetailsLog log=new TaskDetailsLog();
|
|
|
|
|
+ BeanUtils.copyProperties(taskDetails, log);
|
|
|
log.setTdid(taskDetails.getId());
|
|
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());
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+ log.setId(null);
|
|
|
|
|
+ Admin adminToken = TokenManager.getAdminToken();
|
|
|
|
|
+ log.setAid(adminToken.getId());
|
|
|
|
|
+ log.setAname(adminToken.getName());
|
|
|
|
|
+ taskDetailsLogMapper.insert(log);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void countTaskDetails(TaskDetails taskDetails) {
|
|
private void countTaskDetails(TaskDetails taskDetails) {
|
|
@@ -163,8 +155,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public TaskDetails update(TaskDetails taskDetails) {
|
|
public TaskDetails update(TaskDetails taskDetails) {
|
|
|
|
|
+ taskDetails.setUpdateTime(new Date());
|
|
|
this.taskDetailsMapper.update(taskDetails);
|
|
this.taskDetailsMapper.update(taskDetails);
|
|
|
- return this.queryById(taskDetails.getId());
|
|
|
|
|
|
|
+ TaskDetails res = this.queryById(taskDetails.getId());
|
|
|
|
|
+ addTaskDetailsLog(res);
|
|
|
|
|
+ return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|