|
|
@@ -102,6 +102,7 @@ import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.customer.bo.LockingReleaseBo;
|
|
|
import com.goafanti.order.bo.InputArrearsDunListBo;
|
|
|
import com.goafanti.order.bo.OrderDunTaskBo;
|
|
|
+import com.goafanti.order.bo.OrderOutsourceDtails;
|
|
|
import com.goafanti.order.bo.OrderRefundDetailBo;
|
|
|
import com.goafanti.order.bo.OutArrearsDunListBo;
|
|
|
import com.goafanti.order.bo.OutNewOrderDunBo;
|
|
|
@@ -1317,31 +1318,34 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//旧项目变更,如果驳回修改成新的项目变更
|
|
|
if(o.getUnitNumber()!=null)tOrderOutsourceMapper.updateByidNull(o.getId());
|
|
|
}
|
|
|
- updateOrderCostAmount(o);
|
|
|
+ updateOrderCostAmount(o.getTid(),o.getStartType());
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 发起外包时,通过计算获取项目的成本,订单的成本
|
|
|
- * @param tid
|
|
|
+ *
|
|
|
+ * @param tid 项目编号
|
|
|
+ * @param type 0外包 1供应商
|
|
|
*/
|
|
|
- private void updateOrderCostAmount(TOrderOutsource o) {
|
|
|
+ @Override
|
|
|
+ public void updateOrderCostAmount(Integer tid,Integer type) {
|
|
|
//计算项目成本
|
|
|
- List<OutThirdPartyCompany>list=thirdPartyCompanyMapper.selectByTid(o.getTid());
|
|
|
+ List<OutThirdPartyCompany>list=thirdPartyCompanyMapper.selectByTid(tid);
|
|
|
BigDecimal tCount=new BigDecimal(0);
|
|
|
for (OutThirdPartyCompany op : list) {
|
|
|
tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
|
|
|
}
|
|
|
- tTaskMidMapper.updateCostAmount(o.getTid(),tCount);
|
|
|
+ tTaskMidMapper.updateCostAmount(tid,tCount);
|
|
|
//计算订单成本
|
|
|
BigDecimal oCount=new BigDecimal(0);
|
|
|
- List <TTaskMid> tlist=tTaskMidMapper.selectListByTid(o.getTid());
|
|
|
+ List <TTaskMid> tlist=tTaskMidMapper.selectListByTid(tid);
|
|
|
for (TTaskMid tm : tlist) {
|
|
|
if (tm!=null&&tm.getCostAmount()!=null)oCount=oCount.add(tm.getCostAmount()==null?new BigDecimal(0):tm.getCostAmount());
|
|
|
}
|
|
|
//订单成本计算
|
|
|
- if (o.getStartType()==1) {
|
|
|
- ProjectTypePuls op= thirdPartyCompanyMapper.selectByTidGetDtails( o.getTid());
|
|
|
+ if (type==1) {
|
|
|
+ ProjectTypePuls op= thirdPartyCompanyMapper.selectByTidGetDtails(tid);
|
|
|
if (op.getOfficialCost()==1) {
|
|
|
BigDecimal mCount=op.getOfficialAmount().multiply(new BigDecimal(op.getQuantity()));
|
|
|
if (op.getCostReduction()==1) {
|
|
|
@@ -1349,8 +1353,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
oCount=oCount.add(mCount);
|
|
|
}
|
|
|
- tOrderMidMapper.updateCostAmount(o.getTid(),oCount,null);
|
|
|
}
|
|
|
+ tOrderMidMapper.updateCostAmount(tid,oCount,null);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -1404,5 +1408,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}
|