|
|
@@ -27,6 +27,7 @@ import com.goafanti.order.controller.InputTaskStopLog;
|
|
|
import com.goafanti.order.enums.*;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderProjectService;
|
|
|
+import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
import com.goafanti.organization.bo.OutPaymentNode;
|
|
|
import com.goafanti.techproject.enums.TaskState;
|
|
|
import org.apache.commons.collections4.map.HashedMap;
|
|
|
@@ -128,6 +129,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
private TaskTimeMapper taskTimeMapper;
|
|
|
@Autowired
|
|
|
private FinanceCountMapper financeCountMapper;
|
|
|
+ @Autowired
|
|
|
+ private TOrderExamineMapper tOrderExamineMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1285,15 +1288,36 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
//0=财务 1=特批
|
|
|
if (in.getType()==0){
|
|
|
if(task.getProcessStatus()!=1)throw new BusinessException("审核状态错误");
|
|
|
+ List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(task.getOrderNo(), 1);
|
|
|
+ int count =0;
|
|
|
+ for (TOrderExamine e : list) {
|
|
|
+ //当前未审核修改为审核
|
|
|
+ if (e.getStatus()==0&&e.getAid().equals(TokenManager.getAdminId())){
|
|
|
+ e.setStatus(1);
|
|
|
+ tOrderExamineMapper.updateByPrimaryKey(e);
|
|
|
+ count++;
|
|
|
+ }else if (e.getStatus()==1){
|
|
|
+ count++;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (task.getMemberType()==1||task.getMemberType()==2){
|
|
|
- nt.setProcessStatus(2);
|
|
|
+ if(count==list.size()){
|
|
|
+ nt.setProcessStatus(2);
|
|
|
+ }
|
|
|
status=1;
|
|
|
}else if (task.getMemberType()==0){
|
|
|
- nt.setProcessStatus(3);
|
|
|
- status=3;
|
|
|
- result=1;
|
|
|
+ if(count==list.size()){
|
|
|
+ nt.setProcessStatus(3);
|
|
|
+ status=3;
|
|
|
+ result=1;
|
|
|
+ }else {
|
|
|
+ status=1;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ if(count==list.size()){
|
|
|
+ subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
|
|
|
}
|
|
|
- subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),1);
|
|
|
}else if(in.getType()==1){
|
|
|
if(task.getProcessStatus()!=2)throw new BusinessException("审核状态错误");
|
|
|
nt.setProcessStatus(3);
|
|
|
@@ -1419,13 +1443,27 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
|
|
|
addMemberLog(tOrderTask.getId(),0,"新增会员项目");
|
|
|
if(memberType!=null){
|
|
|
+ addMemberExamine(tOrderTask.getOrderNo());
|
|
|
addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
|
|
|
-
|
|
|
addFinanceCountMember(tOrderTask.getOrderNo(),date);
|
|
|
}
|
|
|
return tb;
|
|
|
}
|
|
|
|
|
|
+ private void addMemberExamine(String orderNo) {
|
|
|
+ OrganizationListOut dep = tOrderNewMapper.selectOrderFinance(orderNo);
|
|
|
+ List<TOrderExamine> list=new ArrayList<>();
|
|
|
+ if(!Objects.isNull(dep)){
|
|
|
+ if (!Objects.isNull(dep.getFinanceId())){
|
|
|
+ list.add(new TOrderExamine(orderNo,1,dep.getFinanceId(),dep.getFinanceName()));
|
|
|
+ }
|
|
|
+ if (!Objects.isNull(dep.getRetrialFinanceId())){
|
|
|
+ list.add(new TOrderExamine(orderNo,1,dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ tOrderExamineMapper.insertBatch(list);
|
|
|
+ }
|
|
|
+
|
|
|
private void addFinanceCountMember(String orderNo, Date date) {
|
|
|
Admin admin = adminMapper.selectOrderByFinanace(orderNo);
|
|
|
String startTime = DateUtils.formatDate(date, AFTConstants.YYYYMMDD);
|
|
|
@@ -1457,7 +1495,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
sb.append("客户名称【").append(b.getUserName()).append("】,订单编号【").append(b.getOrderNo()).append("】,");
|
|
|
if (type.equals(NoticeStatus.MENBER_START.getCode())){
|
|
|
sb=sb.append("发起会员项目,请及时审核");
|
|
|
- aid=b.getFinanceId();
|
|
|
+ pushTOrderExamineAid(b.getOrderNo(),admins);
|
|
|
}else if (type.equals(NoticeStatus.MENBER_YES.getCode())){
|
|
|
sb=sb.append("会员项目审核");
|
|
|
if(shiroType==0){
|
|
|
@@ -1490,6 +1528,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void pushTOrderExamineAid(String orderNo, List<Admin> admins) {
|
|
|
+ List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(orderNo, 1);
|
|
|
+ for (TOrderExamine e : list) {
|
|
|
+ Admin admin = new Admin();
|
|
|
+ admin.setId(e.getAid());
|
|
|
+ admins.add(admin);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/**
|