|
|
@@ -14,7 +14,7 @@ import com.goafanti.techproject.bo.InputTaskDetailsBo;
|
|
|
import com.goafanti.techproject.bo.InputTaskFeature;
|
|
|
import com.goafanti.techproject.bo.TaskDetailsBo;
|
|
|
import com.goafanti.techproject.service.TaskDetailsService;
|
|
|
-import org.apache.commons.beanutils.BeanUtils;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -82,87 +82,32 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
yearSum=e.getYearSum();
|
|
|
}
|
|
|
}
|
|
|
- if (tOrderTask.getProgressTid()==null){
|
|
|
- //首先直接查找,找不到的情况下找订单
|
|
|
- //如果是会员
|
|
|
- TOrderTaskBo thisTask = null;
|
|
|
- for (TOrderTaskBo e : collect2) {
|
|
|
- if (e.getId().equals(id)){
|
|
|
- thisTask=e;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
-
|
|
|
- Integer tid=null;
|
|
|
- for (TOrderTaskBo e : collect2) {
|
|
|
- //添加判定去掉赠字比对
|
|
|
- String serviceYear2 =getServiceYer(e.getServiceYear());
|
|
|
- if (serviceYear2.equals(serviceYear)){
|
|
|
- Map<String,Object> map=new HashMap<>();
|
|
|
- map.put("serviceYear", e.getServiceYear());
|
|
|
- map.put("taskName", e.getCommodityName());
|
|
|
- map.put("id",e.getId());
|
|
|
- //第一次进来是查本项目,没有的情况下查询同项目
|
|
|
- if (taskDetails==null){
|
|
|
- taskDetails=taskDetailsMapper.selectByTid(id);
|
|
|
- }
|
|
|
- if (taskDetails==null&&!e.getId().equals(id)&&e.getcSort()==6){
|
|
|
- taskDetails=taskDetailsMapper.selectByTid(e.getId());
|
|
|
- }
|
|
|
- list.add(map);
|
|
|
- }
|
|
|
- }
|
|
|
- if (taskDetails !=null){
|
|
|
- try {
|
|
|
- BeanUtils.copyProperties(res, taskDetails);
|
|
|
- } catch (IllegalAccessException | InvocationTargetException e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
- }
|
|
|
- }
|
|
|
- res.setUserName(mid.getBuyerName());
|
|
|
- res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
- res.setContractNo(tOrderNew.getContractNo());
|
|
|
- res.setMemberStatus(mid.getProjectType());
|
|
|
- res.setServiceYear(serviceYear);
|
|
|
- res.setTaskList(list);
|
|
|
- BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
- String lvl=getOrderLvl(totalAmount);
|
|
|
- res.setMemberLvl(lvl);
|
|
|
- res.setFeatureList(taskFeatureMapper.selectByTdId(id));
|
|
|
-
|
|
|
- }else {
|
|
|
- taskDetails=taskDetailsMapper.selectByTid(tOrderTask.getProgressTid());
|
|
|
- //如果是会员
|
|
|
- TOrderTaskBo thisTask = null;
|
|
|
- for (TOrderTaskBo e : collect2) {
|
|
|
- if (e.getId().equals(id)){
|
|
|
- thisTask=e;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
- list=addOrderList(collect2,serviceYear);
|
|
|
- if (taskDetails !=null){
|
|
|
- try {
|
|
|
- BeanUtils.copyProperties( res,taskDetails);
|
|
|
- } catch (IllegalAccessException | InvocationTargetException e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
- }
|
|
|
- }
|
|
|
- res.setUserName(mid.getBuyerName());
|
|
|
- res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
- res.setContractNo(tOrderNew.getContractNo());
|
|
|
- res.setServiceYear(serviceYear);
|
|
|
- res.setMemberStatus(mid.getProjectType());
|
|
|
- res.setTaskList(list);
|
|
|
- BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
- String lvl=getOrderLvl(totalAmount);
|
|
|
- res.setMemberLvl(lvl);
|
|
|
- if (taskDetails!=null&&taskDetails.getTid()!=null){
|
|
|
- res.setFeatureList(taskFeatureMapper.selectByTdId(taskDetails.getId()));
|
|
|
+ taskDetails=taskDetailsMapper.selectById(tOrderTask.getProgressTid());
|
|
|
+ //如果是会员
|
|
|
+ TOrderTaskBo thisTask = null;
|
|
|
+ for (TOrderTaskBo e : collect2) {
|
|
|
+ if (e.getId().equals(id)){
|
|
|
+ thisTask=e;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
+ String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
+ list=addOrderList(collect2,serviceYear);
|
|
|
+ if (taskDetails !=null){
|
|
|
+ BeanUtils.copyProperties( taskDetails,res);
|
|
|
+ }
|
|
|
+ res.setUserName(mid.getBuyerName());
|
|
|
+ res.setOrderNo(tOrderNew.getOrderNo());
|
|
|
+ res.setContractNo(tOrderNew.getContractNo());
|
|
|
+ res.setServiceYear(serviceYear);
|
|
|
+ res.setMemberStatus(mid.getProjectType());
|
|
|
+ res.setTaskList(list);
|
|
|
+ BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
+ String lvl=getOrderLvl(totalAmount);
|
|
|
+ res.setMemberLvl(lvl);
|
|
|
+ if (taskDetails!=null&&taskDetails.getTid()!=null){
|
|
|
+ res.setFeatureList(taskFeatureMapper.selectByTdId(taskDetails.getId()));
|
|
|
+ }
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -248,11 +193,27 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
private void updateTask(TaskDetails taskDetails, String orderNo) {
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
|
|
|
List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
+ //如果是会员
|
|
|
+ TOrderTaskBo thisTask = null;
|
|
|
+ for (TOrderTaskBo e : collect) {
|
|
|
+ if (e.getId().equals(taskDetails.getTid())){
|
|
|
+ thisTask=e;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
for (TOrderTaskBo tOrderTaskBo : collect) {
|
|
|
- TOrderTask updatedTask = new TOrderTask();
|
|
|
- updatedTask.setId(tOrderTaskBo.getId());
|
|
|
- updatedTask.setProgressTid(taskDetails.getTid());
|
|
|
- tOrderTaskMapper.update(updatedTask);
|
|
|
+ if (serviceYear != null ){
|
|
|
+ String serviceYer2 = getServiceYer(tOrderTaskBo.getServiceYear());
|
|
|
+ if (serviceYear.equals(serviceYer2)){
|
|
|
+ TOrderTask updatedTask = new TOrderTask();
|
|
|
+ updatedTask.setId(tOrderTaskBo.getId());
|
|
|
+ updatedTask.setProgressTid(taskDetails.getId());
|
|
|
+ tOrderTaskMapper.update(updatedTask);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -265,7 +226,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
private void addTaskDetailsLog(TaskDetails taskDetails) throws InvocationTargetException, IllegalAccessException {
|
|
|
Admin adminToken = TokenManager.getAdminToken();
|
|
|
TaskDetailsLog log=new TaskDetailsLog();
|
|
|
- BeanUtils.copyProperties(log, taskDetails);
|
|
|
+ BeanUtils.copyProperties( taskDetails,log);
|
|
|
log.setTdid(taskDetails.getId());
|
|
|
log.setId(null);
|
|
|
log.setAid(adminToken.getId());
|
|
|
@@ -275,7 +236,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
List<TaskFeature> list = taskFeatureMapper.selectByTdId(taskDetails.getId());
|
|
|
for (TaskFeature feature : list) {
|
|
|
TaskFeatureLog tfLog = new TaskFeatureLog();
|
|
|
- BeanUtils.copyProperties(tfLog, feature);
|
|
|
+ BeanUtils.copyProperties(feature, tfLog);
|
|
|
tfLog.setTdlId(log.getId());
|
|
|
tfLog.setId(null);
|
|
|
tfLog.setAid(adminToken.getId());
|
|
|
@@ -464,11 +425,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
String serviceYear = getServiceYer(thisTask.getServiceYear());
|
|
|
list=addOrderList(tOrderTaskBos, serviceYear);
|
|
|
if (taskDetails !=null){
|
|
|
- try {
|
|
|
- BeanUtils.copyProperties(res, log);
|
|
|
- } catch (IllegalAccessException | InvocationTargetException e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
- }
|
|
|
+ BeanUtils.copyProperties(log, res);
|
|
|
}
|
|
|
res.setUserName(mid.getBuyerName());
|
|
|
res.setOrderNo(tOrderNew.getOrderNo());
|