Browse Source

修改总裁审核得位置,调整为财务之后

anderx 6 years ago
parent
commit
bcfeaecfca

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

@@ -1123,7 +1123,7 @@
 	too.company_name as outsourceName, 0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,
 	date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')finalReceivablesTime,a.invoice_amount invoiceAmount from t_order_new o 
 left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no 
-left join t_order_outsource too on o.order_no=too.order_no where delete_sign != 1 and (approval = 0 or approval = 2) 
+left join t_order_outsource too on o.order_no=too.order_no where delete_sign != 1 and approval !=3 
 	and outsource=  #{o.outsource,jdbcType=INTEGER}	
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
@@ -1192,7 +1192,7 @@ left join t_order_outsource too on o.order_no=too.order_no where delete_sign !=
   <select id="financeCount" parameterType="Map" resultType="java.lang.Integer">
  select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id  
 left join department d on o.order_dep = d.id   left join t_order_mid a on o.order_no=a.order_no
- where delete_sign != 1 and (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}
+ where delete_sign != 1 and approval !=3 and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -469,7 +469,7 @@
 	left join t_order_task h on a.tid=h.id left join business_project bp on h.commodity_id=bp.id
 	left join business_category bc on bp.cid=bc.id left join admin pa on  h.task_receiver=pa.id
 	</if>
-	where b.approval in (0,2)
+	where b.approval !=3
 	<if test="type != null">
 	and a.type = #{type}
 	</if>
@@ -492,7 +492,7 @@
   </select>
   <select id="orderOutsourceCount" resultType="java.lang.Integer">
   select count(*) from t_order_outsource a left join t_order_new b on a.order_no=b.order_no 
-  left join `user` c on b.buyer_id=c.id where b.approval in (0,2)
+  left join `user` c on b.buyer_id=c.id where b.approval !=3
   <if test="type != null">
 	and a.type = #{type}
   </if>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -920,7 +920,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
-    select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,
+    select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
   a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
   c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
   a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,

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

@@ -507,12 +507,20 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (new1.getBackStatus()==3) {
 			t.setBackStatus(0);
 		}
-		t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
-		OrganizationListOut oo=organizationManagementMapper.selectAllById(new1.getOrderDep());
-		t.setFinanceId(oo.getFinanceId());
 		List<String> aids = new ArrayList<>();
-		for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
-			aids.add(admin.getId());
+		if (new1.getApproval()==ApprovalNewState.DSH.getCode()||
+				new1.getApproval()==ApprovalNewState.BH.getCode()) {
+			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
+			for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
+				aids.add(admin.getId());
+			}
+		}else {
+			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+			OrganizationListOut oo=organizationManagementMapper.selectAllById(new1.getOrderDep());
+			t.setFinanceId(oo.getFinanceId());
+			for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
+				aids.add(admin.getId());
+			}
 		}
 		TOrderLog tl=new TOrderLog();
 		tl.setAid(TokenManager.getAdminId());

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

@@ -101,6 +101,7 @@ import com.goafanti.order.enums.TaskState;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
+import com.goafanti.organization.bo.OrganizationListOut;
 
 @Service
 @EnableAsync
@@ -522,8 +523,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tl.setAid(TokenManager.getAdminId());
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			t.setOutsource(outsource);
-			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||
-					t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
+			//外包单给外包审核员 否则给财务专员
 				if(outsource==0) {
 					t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 					//如果是转的暂时不删除外包信息
@@ -538,12 +538,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					addOrderLog(tl,reason);
 					
 				}
-			}else {
-				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-				for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
-					aids.add(admin.getId());
-				}
-			}
+			
 			type=NoticeStatus.ORDER_YES.getCode();
 			tl.setOrderNo(orderNo);
 			tl.setProcess(OrderLogProcess.SH.getCode());
@@ -754,15 +749,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tl.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
-			if(t2.getOutsource()==0) {
-				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
-				aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
-			}else {
-				t.setProcessStatus(ProcessStatus.YPWBSH.getCode());
-				for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
+				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+				OrganizationListOut oo=organizationManagementMapper.selectAllById(t2.getOrderDep());
+				t.setFinanceId(oo.getFinanceId());
+				for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
 					aids.add(admin.getId());
 				}
-			}
 			type=NoticeStatus.ORDER_APPROVA_YES.getCode();
 			tl.setProcess(OrderLogProcess.TP.getCode());
 		} else {

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

@@ -112,7 +112,8 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 		Integer type=null;
 		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
 		//外包订单
-		if (o.getType()==0) {
+		if (o.getType()==null||o.getType()==0) {
+			o.setType(0);
 			TOrderNew t=new TOrderNew();
 			t.setOrderNo(o.getOrderNo());
 			if (o.getRefundStatus()==1) {