|
@@ -65,6 +65,7 @@ import com.goafanti.organization.bo.NoticeInformationBo;
|
|
|
import com.goafanti.organization.bo.OutPaymentLog;
|
|
import com.goafanti.organization.bo.OutPaymentLog;
|
|
|
import com.goafanti.organization.bo.OutPaymentNode;
|
|
import com.goafanti.organization.bo.OutPaymentNode;
|
|
|
import com.goafanti.organization.bo.OutThirdPartyCompany;
|
|
import com.goafanti.organization.bo.OutThirdPartyCompany;
|
|
|
|
|
+import com.goafanti.organization.bo.ProjectTypePuls;
|
|
|
import com.goafanti.organization.bo.outFinancialPayment;
|
|
import com.goafanti.organization.bo.outFinancialPayment;
|
|
|
import com.goafanti.organization.bo.outNodeList;
|
|
import com.goafanti.organization.bo.outNodeList;
|
|
|
import com.goafanti.organization.bo.outPaymentList;
|
|
import com.goafanti.organization.bo.outPaymentList;
|
|
@@ -274,6 +275,12 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
p.setAid(a.getId());
|
|
p.setAid(a.getId());
|
|
|
p.setAname(a.getName());
|
|
p.setAname(a.getName());
|
|
|
|
|
+ if (p.getChooseType()==2) {
|
|
|
|
|
+ TOrderTask t=new TOrderTask();
|
|
|
|
|
+ t.setId(p.getTid());
|
|
|
|
|
+ t.setCheckStatus(3);
|
|
|
|
|
+ tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
|
|
+ }
|
|
|
tOrderPaymentMapper.insertSelectiveGetId(p);
|
|
tOrderPaymentMapper.insertSelectiveGetId(p);
|
|
|
NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
|
|
NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
|
|
|
addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_NODE.getCode());
|
|
addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_NODE.getCode());
|
|
@@ -876,11 +883,11 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
|
|
PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
|
|
|
count=pn.getUnitPrice().multiply(new BigDecimal(p.getQuantity()));
|
|
count=pn.getUnitPrice().multiply(new BigDecimal(p.getQuantity()));
|
|
|
}else if (p.getChooseType()==2) {
|
|
}else if (p.getChooseType()==2) {
|
|
|
- OutThirdPartyCompany ot=thirdPartyCompanyMapper.selectByTidPuls(p.getTid());
|
|
|
|
|
|
|
+ ProjectTypePuls ot=thirdPartyCompanyMapper.selectByTidPuls(p.getTid());
|
|
|
if (ot.getCostReduction()==0) {
|
|
if (ot.getCostReduction()==0) {
|
|
|
- count=new BigDecimal(ot.getOfficialUnitPrice()).multiply(new BigDecimal(ot.getQuantity()));
|
|
|
|
|
|
|
+ count=ot.getAmount().multiply(new BigDecimal(ot.getQuantity()));
|
|
|
}else {
|
|
}else {
|
|
|
- count=new BigDecimal(ot.getReductionAmount()).multiply(new BigDecimal(ot.getQuantity()));
|
|
|
|
|
|
|
+ count=ot.getProportion85().multiply(new BigDecimal(ot.getQuantity()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
p.setApplicationAmount(count);
|
|
p.setApplicationAmount(count);
|