|
|
@@ -3,6 +3,7 @@ package com.goafanti.organization.service.impl;
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
@@ -22,6 +23,7 @@ import com.goafanti.common.dao.NoticeMapper;
|
|
|
import com.goafanti.common.dao.PaymentLogMapper;
|
|
|
import com.goafanti.common.dao.PaymentNodeMapper;
|
|
|
import com.goafanti.common.dao.TOrderPaymentMapper;
|
|
|
+import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
import com.goafanti.common.dao.ThirdPartyCompanyMapper;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.model.CompanyLibrary;
|
|
|
@@ -29,11 +31,14 @@ import com.goafanti.common.model.Notice;
|
|
|
import com.goafanti.common.model.PaymentLog;
|
|
|
import com.goafanti.common.model.PaymentNode;
|
|
|
import com.goafanti.common.model.TOrderPayment;
|
|
|
+import com.goafanti.common.model.TOrderTask;
|
|
|
import com.goafanti.common.model.ThirdPartyCompany;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.SendEmailUtil;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import com.goafanti.order.bo.TOrderTaskDetailBo;
|
|
|
+import com.goafanti.order.enums.NewOrderDunType;
|
|
|
import com.goafanti.organization.bo.InputPaymentNode;
|
|
|
import com.goafanti.organization.bo.InuptFinancialPayment;
|
|
|
import com.goafanti.organization.bo.NoticeInformationBo;
|
|
|
@@ -63,6 +68,9 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
private NoticeMapper noticeMapper;
|
|
|
@Autowired
|
|
|
private FinancialPaymentMapper financialPaymentMapper;
|
|
|
+ @Autowired
|
|
|
+ private TOrderTaskMapper tOrderTaskMapper;
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -252,7 +260,7 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
list=tOrderPaymentMapper.selectList(null,p.getNodeId());
|
|
|
}
|
|
|
for (outOrderPayment o : list) {
|
|
|
- a=a.add(o.getNodeTotalAmount());
|
|
|
+ a=a.add(o.getPaymentAmount());
|
|
|
}
|
|
|
if (p.getPaymentType()==0) {
|
|
|
ThirdPartyCompany t=thirdPartyCompanyMapper.selectByPrimaryKey(p.getTpcId());
|
|
|
@@ -268,5 +276,52 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
+ public boolean checkprojectDun(TOrderPayment p) {
|
|
|
+ PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(p.getNodeId());
|
|
|
+ TOrderTaskDetailBo tt=tOrderTaskMapper.getOrderTaskDetail(p.getTid().toString());
|
|
|
+// 项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,7-项目下证,8-项目验收,
|
|
|
+// 9-项目拨款 10- 项目进度10% 11- 项目进度30% 12- 项目进度70%
|
|
|
+ if (pn.getDunType()==0&&pn.getPartyTime().getTime()<new Date().getTime()) {//如果自定义则看触发时间
|
|
|
+ return false;
|
|
|
+ }else if (NewOrderDunType.CGZH_WC.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ }else if (NewOrderDunType.COMMON_NGS.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ }else if (NewOrderDunType.COMMON_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.KJXM_LX.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>2&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.KJXM_BK.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>8&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.KJJR_BK.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>8&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.RJKF_LX.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>2&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.RJKF_WZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ } else if (NewOrderDunType.ZSCQ_GS_SL_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())) {
|
|
|
+ if (tt.getBpType()==1&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ }else if (tt.getBpType()!=1&&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ } else if (NewOrderDunType.ZSCQ_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
|
|
|
+ &&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}
|