Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 5 years ago
parent
commit
fc3c0c64c1

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

@@ -1088,16 +1088,23 @@
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,
 a.task_receiver taskReceiver,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
-e.approval,l.refund_status outsourceStatus,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,
+e.approval,l.refund_status outsourceStatus,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
 ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
-    group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
-    on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
+    group by task_id) i on a.id=i.task_id left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
     on a.id=l.tid where e.delete_sign !=1  and e.order_status not in (5,7) 
     and a.outsource= #{outsource,jdbcType=INTEGER}
+    <if test="role == 0 ">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
+    </if>
+    <if test="role ==1 and fids != null and fids.size() &gt; 0">
+	  	and e.finance_id in 
+	   <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+       		#{item}
+     	</foreach>
+	</if>
     <if test="specially == 0 ">
     and a.split_status !=1 
     </if>
@@ -1153,7 +1160,15 @@ ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.s
   	select  count(*) from t_order_task a left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
     left join admin g on e.salesman_id=g.id left join department h on g.department_id=h.id where e.delete_sign !=1 and e.order_status not in (5,7)
     and a.outsource= #{outsource,jdbcType=INTEGER}
+   <if test="role == 0 ">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
+    </if>
+    <if test="role ==1 and fids != null and fids.size() &gt; 0">
+	  	and e.finance_id in 
+	   <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+       		#{item}
+     	</foreach>
+	</if>
     <if test="specially == 0 ">
     and a.split_status !=1 
     </if>
@@ -1223,14 +1238,14 @@ select
   </select>
   
    <select id="selectTaskHoursListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,a.project_status projectStatus,
+  	   select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,a.receiver_name as receiverName,dep.name as depName,a.project_status projectStatus,
     a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity,a.commodity_price commodityPrice,
     e.contract_no as contractNo,date_format(e.create_time,'%Y-%m-%d %H:%i:%S')as creteTime,date_format(e.sign_time,'%Y-%m-%d')as signTime,a.outsource,
     date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S')taskDistributionTime, date_format(a.task_end_time,'%Y-%m-%d')taskEndTime,tm.salesman_name salesmanName,
     a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId
   	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
-    left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join department dep on e.order_dep=dep.id  
-    left join user f on e.buyer_id=f.id left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
+    left join t_order_new e on a.order_no=e.order_no left join department dep on e.order_dep=dep.id  
+    left join user f on e.buyer_id=f.id left join (select tid,sum(hours)hours from task_hours_count group by tid) g on a.id=g.tid
     left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2)
   	<if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
@@ -1269,9 +1284,9 @@ select
   </select>
   
    <select id="selectTaskHoursListCount" resultType="java.lang.Integer">
-  	select  count(*) from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
-  	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2)
+  	select count(*) from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
+    left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no=tm.order_no
+    where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2) 
   <if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>

+ 18 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -204,7 +204,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		
 		if (null!=specially) params.put("specially", specially);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
@@ -217,7 +217,23 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
 		params.put("outsource", outsource==null?0:outsource);
 		if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);
-		
+		List<String> fids=new ArrayList<>();
+		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN) ||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
+				TokenManager.hasRole(AFTConstants.VICE_CEO)) {
+			params.put("role", 2);
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+			params.put("role", 1);
+			fids =adminMapper.selectBySuperId(TokenManager.getAdminId());
+			params.put("fids",fids);
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+			params.put("role", 1);
+			 fids.add(TokenManager.getAdminId());
+			 params.put("fids",fids);
+		} else {
+			params.put("role", 0);
+			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		} 
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, pageNo, pageSize);
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
 		for (TOrderTaskListBo t : list) {

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570