anderx лет назад: 6
Родитель
Сommit
6eec41b1f0

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderInvoiceMapper.java

@@ -75,7 +75,7 @@ public interface TOrderInvoiceMapper {
 	 */
 	int updateByPrimaryKey(TOrderInvoice record);
 
-	int checkApplyAmount(@Param("orderNo")String orderNo,@Param("id")Integer id);
+	Double checkApplyAmount(@Param("orderNo")String orderNo,@Param("id")Integer id);
 
 	TOrderInvoiceDetails selectByInvoiceDitails(Integer id);
 }

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

@@ -632,7 +632,7 @@
       already_amount = #{alreadyAmount,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="checkApplyAmount" resultType="Integer">
+  <select id="checkApplyAmount" resultType="java.lang.Double">
   select ifnull(sum(amount),0) from t_order_invoice
 	where order_no= #{orderNo,jdbcType=VARCHAR}  and status !=4
 	<if test="id != null">
@@ -661,6 +661,9 @@
 	<if test="orderDep !=null">
 	and b.order_dep= #{orderDep,jdbcType=VARCHAR}
 	</if>
+	<if test="aDep !=null">
+	and c.department_id=#{aDep,jdbcType=VARCHAR}
+	</if>
 	order by a.status ,a.create_time desc
 	<if test="page_sql!=null">
 			${page_sql}
@@ -687,6 +690,9 @@
 	<if test="orderDep !=null">
 	and b.order_dep= #{orderDep,jdbcType=VARCHAR}
 	</if>
+	<if test="aDep !=null">
+	and c.department_id=#{aDep,jdbcType=VARCHAR}
+	</if>
   </select>
   
   <select id="salesmanOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">

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

@@ -101,7 +101,7 @@ public class OrderInvoiceApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/financeOrderInvoiceList",method = RequestMethod.GET)
-	public Result financeOrderInvoiceList(String orderDep,String orderNo ,String name,String type,Integer pageNo,Integer pageSize){
+	public Result financeOrderInvoiceList(String orderDep,String orderNo ,String name,  Integer type,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		
 		res.data(orderInvoiceService.financeOrderInvoiceList( orderDep, orderNo , name,type,pageNo,pageSize));
@@ -144,7 +144,7 @@ public class OrderInvoiceApiController extends CertifyApiController {
 	}
 	
 	/**
-	 *   开票审核
+	 *   特批审核
 	 * @param uid
 	 * @param orderType
 	 * @return

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderInvoiceService.java

@@ -28,7 +28,7 @@ public interface OrderInvoiceService {
 
 	
 
-	Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name,String type, Integer pageNo, Integer pageSize);
+	Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name,Integer type, Integer pageNo, Integer pageSize);
 
 	TOrderInvoiceDetails selectByIdOrderInvoice(Integer id);
 

+ 9 - 4
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -49,7 +49,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	public boolean checkAmount(TOrderInvoice t) {
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		
-			int i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
+			Double i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
 		int	flag=t.getAmount().add(new BigDecimal(i)).compareTo(tn.getTotalAmount());
 		if (flag>0) {
 			return true;
@@ -59,16 +59,21 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, String type,Integer pageNo,
+	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, Integer type,Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
+		if(type==0 &&(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN))) {
 			params.put("financeId", TokenManager.getAdminId());
 		}
 		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
-		if(StringUtils.isNotBlank(type))params.put("type", type);
+		if(type!=null)params.put("type", type);
+		if (type ==1) {
+			//如果是省外则直接查本部门
+			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			params.put("aDep", a.getDepartmentId());
+		}
 		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
 		if(StringUtils.isNotBlank(name))params.put("name", name);
 		return (Pagination<TOrderInvoiceBo>)findPage("financeOrderInvoiceList", "financeOrderInvoiceCount", params, pageNo, pageSize);