Browse Source

修改财务管理查看列表

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
1bd6967b52

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

@@ -703,7 +703,7 @@ select
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	<if test="complete ==0 and processState != 8">
-	 and a.process_state &gt; = #{processState}
+	 and a.process_state &gt;= #{processState}
 	</if>
 	<if test="complete ==0 and processState == 8">
 	 and a.process_state &gt;= #{processState} and  a.process_state &lt; 9

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

@@ -1525,15 +1525,16 @@ where super_id is null ) e on e.order_no=a.order_no
   select sum(b.amount) actuallyTotalAmount,sum(o.total_amount) signTotalAmount 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 ( select sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no
-    where delete_sign != 1 and outsource=  #{outsource,jdbcType=INTEGER}
+    where delete_sign != 1  and (approval = 0 or approval = 2) and outsource=  #{outsource,jdbcType=INTEGER}
   	 	<if test="processStatus == 3">
 	  	and o.process_status = #{processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	<if test="processStatus == 4">
 	  	and o.process_status &gt;= #{processStatus,jdbcType=INTEGER}
 	  	</if>
-  		and (approval = 0 or approval = 2)
+  		<if test="financeId != null and financeId != &quot;&quot;">
 	  	and d.finance_id = #{financeId,jdbcType=VARCHAR}
+	  	</if>
   		<if test="orderStatus != null and orderStatus != &quot;&quot;">
 	  	and o.order_status = #{orderStatus,jdbcType=INTEGER}
 	  	</if>

+ 2 - 2
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -90,8 +90,8 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	public Result financeList(OrderListBo order, Integer pageNo, Integer pageSize ){
 		Result res = new Result();
 		//财务专员自己的id
-		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN) || !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
-		|| !TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)) {
+		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
+		&& !TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)) {
 			order.setFinanceId(TokenManager.getAdminId());
 		}
 		//order.setProcessStatus(3);//分配给自己 改为前端 传3未分配  4已分配

+ 1 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -368,6 +368,7 @@
 				uid : /*[[${adminData.id}]]*/'',
 				departmentId : /*[[${adminData.departmentId}]]*/'',
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
+				isFinanceAdmin : /*[[${shiro.hasRole('99997')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;