Browse Source

科德系统省内特批列表剔除已删除订单。

anderx 3 years ago
parent
commit
2557fe17fa

+ 22 - 8
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -640,13 +640,20 @@
 	</if>
   </select>
   <select id="financeOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
-      	  select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,
-     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status,b.process_status processStatus,
-     b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a
-	left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
-	left join (select order_no,sum(amount)as  sumAmount from t_order_invoice where status =2 group by order_no) d
-	on a.order_no=d.order_no left join department e on b.order_dep=e.id
-	where a.status in (1,2) and a.approval in (0,2)
+    select a.id,a.unit_name as unitName,a.order_no as orderNo,c.name,b.project_status as projectStatus,a.amount,a.approval,
+    ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status,b.process_status processStatus,
+    b.settlement_amount as settlementAmount, (b.total_amount-b.settlement_amount) as notAmount from t_order_invoice a
+    left join t_order_new b on a.order_no=b.order_no left join admin c on b.salesman_id=c.id
+    left join (select order_no,sum(amount)as  sumAmount from t_order_invoice where status =2 group by order_no) d
+    on a.order_no=d.order_no left join department e on b.order_dep=e.id
+    where b.delete_sign in (0,2)
+    <if test="all ==0">
+      and a.status in (1,2)
+      and a.approval in (0,2)
+    </if>
+    <if test="all ==1">
+      and a.status in (1,2,3)
+    </if>
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER}
 	</if>
@@ -685,7 +692,14 @@
 	left join t_order_new b on a.order_no=b.order_no
 	left join admin c on b.salesman_id=c.id
 	 left join department e on b.order_dep=e.id
-	where a.status in (1,2) and a.approval in (0,2)
+    where b.delete_sign in (0,2)
+    <if test="all ==0">
+      and a.status in (1,2)
+      and a.approval in (0,2)
+    </if>
+    <if test="all ==1">
+      and a.status in (1,2,3)
+    </if>
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER}
 	</if>

+ 13 - 3
src/main/java/com/goafanti/order/bo/InputOrderInvoiceBo.java

@@ -7,6 +7,16 @@ public class InputOrderInvoiceBo {
 	private Integer type;
 	private Integer approval;
 	private Integer status;
+	private Integer all;
+
+	public Integer getAll() {
+		return all;
+	}
+
+	public void setAll(Integer all) {
+		this.all = all;
+	}
+
 	public String getOrderDep() {
 		return orderDep;
 	}
@@ -43,7 +53,7 @@ public class InputOrderInvoiceBo {
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
-	
-	
-	
+
+
+
 }

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

@@ -30,7 +30,7 @@ public class OrderInvoiceApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/createOrderInvoice",method = RequestMethod.POST)
-	public Result createOrderInvoice(TOrderInvoice t,Integer submit ){
+	public Result createOrderInvoice(TOrderInvoice t){
 		Result res = new Result();
 		if(t==null||null==t.getInvoiceType()||StringUtils.isBlank(t.getTaxNumber())||
 				null==t.getAmount()||null==t.getBanks()||StringUtils.isBlank(t.getContent())

+ 12 - 2
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -48,6 +48,9 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	public int createServiceOrder(TOrderInvoice o) {
 		o.setCreateTime(new Date());
 		sendNoticeAndEmail(o);
+		//前端直接会直接调取上一个发起数据给新开票,防止前一个数据为审核后
+		if (o.getApproval()==2)o.setApproval(1);
+		if (o.getStatus()!=1)o.setStatus(1);
 		 Integer i=tOrderInvoiceMapper.insertSelective(o);
 		addInvoiceLog(o.getId(),0);
 		return i;
@@ -127,6 +130,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		//财务专员查看自己的
 		if (TokenManager.hasRole(AFTConstants.FINANCE)) {
 			params.put("financeId", TokenManager.getAdminId());
+
 		}
 		//财务经理
 		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
@@ -140,11 +144,17 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
 			aDep.add(a.getDepartmentId());
 			params.put("aDep", aDep);
+
+		}
+		if (null !=o.getAll()){
+			params.put("all",o.getAll());
+		}else {
+			params.put("all",0);
 		}
 		if(StringUtils.isNotBlank(o.getOrderNo()))params.put("orderNo", o.getOrderNo());
 		if(StringUtils.isNotBlank(o.getName()))params.put("name", o.getName());
-		if(null==o.getApproval())params.put("approval", o.getApproval());
-		if(null==o.getStatus())params.put("status", o.getStatus());
+		if(null!=o.getApproval())params.put("approval", o.getApproval());
+		if(null!=o.getStatus())params.put("status", o.getStatus());
 		return (Pagination<TOrderInvoiceBo>)findPage("financeOrderInvoiceList", "financeOrderInvoiceCount", params, pageNo, pageSize);
 
 	}