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

+ 3 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -5,6 +5,7 @@ import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.outStatistics.OutOrderSalesSourceAmount;
+import com.goafanti.organization.bo.OrganizationListOut;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -91,4 +92,6 @@ public interface TOrderNewMapper {
 
 
     List<FinanceCount> selectCountByFinance(String id);
+
+    OrganizationListOut selectOrderFinance(String orderNo);
 }

+ 8 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2155,5 +2155,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
               and b.finance_id = #{aid})x
       group by x.aid, x.dates;
     </select>
+  <select id="selectOrderFinance" resultType="com.goafanti.organization.bo.OrganizationListOut">
+    select b.id,b.finance_id financeId,c.name financeName,b.retrial_finance_id retrialFinanceId,
+           d.retrialFinanceName
+    from t_order_new a left join department b on a.order_dep = b.id
+    left join admin c on b.finance_id=c.id
+    left join admin d on b.retrial_finance_id=d.id
+    where a.order_no =#{orderNo}
+  </select>
 
 </mapper>

+ 2 - 1
src/main/java/com/goafanti/common/model/TOrderExamine.java

@@ -101,8 +101,9 @@ public class TOrderExamine implements Serializable {
     public TOrderExamine() {
     }
 
-    public TOrderExamine(String orderNo, String aid,String aname) {
+    public TOrderExamine(String orderNo,Integer type, String aid,String aname) {
         this.orderNo = orderNo;
+        this.type = type;
         this.aid = aid;
         this.aname=aname;
         this.status=0;

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

@@ -187,7 +187,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	private void addOrderExamine(TOrderNew o) {
-		List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(o.getOrderNo());
+		List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(o.getOrderNo(),0);
 		if (tOrderExamines.isEmpty()){
 			addTOrderExamines(o);
 		}
@@ -198,15 +198,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		List<TOrderExamine> list =new ArrayList<>();
 		if(!Objects.isNull(dep)){
 			if (!Objects.isNull(dep.getFinanceId())){
-				list.add(new TOrderExamine(o.getOrderNo(),dep.getFinanceId(),dep.getFinanceName()));
+				list.add(new TOrderExamine(o.getOrderNo(),0,dep.getFinanceId(),dep.getFinanceName()));
 			}
 			if (!Objects.isNull(dep.getRetrialFinanceId())){
-				list.add(new TOrderExamine(o.getOrderNo(),dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
+				list.add(new TOrderExamine(o.getOrderNo(),0,dep.getRetrialFinanceId(),dep.getRetrialFinanceName()));
 			}
 		}
 		List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.TECH_ADMIN);
 		for (Admin admin : admins) {
-			list.add(new TOrderExamine(o.getOrderNo(),admin.getId(),admin.getName()));
+			list.add(new TOrderExamine(o.getOrderNo(),0,admin.getId(),admin.getName()));
 		}
 		tOrderExamineMapper.insertBatch(list);
 		return list;
@@ -1167,7 +1167,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}else if (t.getProcessStatus()==ProcessStatus.YPCW_JSZJ.getCode()){
 			if (t.getOrderDep()!=null){
-				List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(t.getOrderNo());
+				List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(t.getOrderNo(),0);
 				for (TOrderExamine e : list) {
 					str=str.append(e.getAname()).append(",");
 				}

+ 53 - 7
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -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);
+		}
+	}
 
 
 	/**