anderx лет назад: 2
Родитель
Сommit
a11b9edb1a

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -198,7 +198,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		OrganizationListOut dep = departmentMapper.selectAllById(o.getOrderDep());
 		List<TOrderExamine> list =new ArrayList<>();
 		if(!Objects.isNull(dep)){
-			if (!Objects.isNull(dep.getFinanceId())){
+			if (StringUtils.isNotBlank(dep.getFinanceId())){
 				list.add(new TOrderExamine(o.getOrderNo(),0,dep.getFinanceId(),dep.getFinanceName()));
 			}
 			if (StringUtils.isNotBlank(dep.getRetrialFinanceId())){
@@ -1481,6 +1481,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (confirm==2) {
 			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCTG.getCode());
 			else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZTG.getCode());
+			else if (t2.getApproval()==ApprovalNewState.FZCDSH.getCode())t.setApproval(ApprovalNewState.FZCTG.getCode());
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
 				t.setFinanceId(oo.getFinanceId());

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1509,7 +1509,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderExamineMapper.deleteByTid(t.getId());
 		List<TOrderExamine> list=new ArrayList<>();
 		TOrderTask tOrderTask= new TOrderTask();
-		if(!Objects.isNull(dep)){
+		if(StringUtils.isNotBlank(dep.getFinanceId())){
 			int examineType=0;
 			if (!Objects.isNull(dep.getFinanceId())){
 				list.add(new TOrderExamine(t.getOrderNo(),1,t.getId(),dep.getFinanceId(),dep.getFinanceName()));
@@ -1531,6 +1531,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderExamineMapper.insertBatch(list);
 	}
 
+
+
 	private void addFinanceCountMember(String orderNo, Date date) {
 		Admin admin = adminMapper.selectOrderByFinanace(orderNo);
 		String startTime = DateUtils.formatDate(date, AFTConstants.YYYYMMDD);