Browse Source

开票修改

anderx 6 years ago
parent
commit
9db1e2bb2e

+ 13 - 5
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -728,6 +728,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.create_time desc
 	<if test="page_sql!=null">
 			${page_sql}
@@ -750,14 +753,19 @@
 	<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="selectByInvoiceDitails" parameterType="java.lang.Integer"  resultType="com.goafanti.order.bo.TOrderInvoiceDetails">
-    	select 
-    a.id ,a.order_no as orderNo,a.`type`,a.status,a.reject_reason as rejectReason,a.remarks,a.invoice_type as invoiceType,a.unit_name as unitName,a.tax_number as taxNumber,a.amount,a.banks,a.content,
-    a.unit_address as unitAddress,a.invoice_remarks as invoiceRemarks,a.unit_mobile as unitMobile,a.voucher_url as voucherUrl ,a.post,a.addressee,a.addressee_area as addresseeArea,a.addressee_city as addresseeCity,
-    a.addressee_province as addresseeProvince,a.addressee_mobile as addresseeMobile,a.recipient_address as recipientAddress,a.create_time,a.update_time,a.approval,a.already_amount,b.contract_no as contractNo 
-    from t_order_invoice a left join t_order_new b on a.order_no=b.order_no
+    	select a.id ,a.order_no as orderNo,a.`type`,a.status,a.reject_reason as rejectReason,a.remarks,a.invoice_type as invoiceType,
+	a.unit_name as unitName,a.tax_number as taxNumber,a.amount,a.banks,a.content,a.unit_address as unitAddress,
+	a.invoice_remarks as invoiceRemarks,a.unit_mobile as unitMobile,a.voucher_url as voucherUrl ,a.post,a.addressee,
+	a.addressee_area as addresseeArea,a.addressee_city as addresseeCity,a.addressee_province as addresseeProvince,
+	a.addressee_mobile as addresseeMobile,a.recipient_address as recipientAddress,a.create_time,a.update_time,a.approval,
+	a.already_amount as alreadyAmount,b.contract_no as contractNo from t_order_invoice a 
+	left join t_order_new b on a.order_no=b.order_no
     where id = #{id,jdbcType=INTEGER}
   </select>
 </mapper>

+ 2 - 2
src/main/java/com/goafanti/common/utils/SendEmailUtil.java

@@ -129,8 +129,8 @@ public class SendEmailUtil {
 		
 		
 		SendEmailUtil emailUtil = SendEmailUtil.getInstance();
-		String content ="<body background='https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1558411404908&di=f6f2ddf72713da7c559870d717896f4e&imgtype=0&src=http%3A%2F%2Fwww.codeproject.com%2FKB%2Fdatabase%2F846204%2FPicture9.jpg'>"+ 
-				"<div>专利缴费提醒: "+ "专利1号" +"</div><div>客户名称: " + "湖南明和" + "</div>" +"<div>专利编号: "+ "zl0001" +"</div>"+
+		String content ="<body>"+ 
+				"<div style='background-color:red'>专利缴费提醒: "+ "专利1号" +"</div><div>客户名称: " + "湖南明和" + "</div>" +"<div>专利编号: "+ "zl0001" +"</div>"+
 				"</body>";
 			EmailBo emailBo = new EmailBo("专利提醒","2304089483@qq.com", "客户", "科德集团", "技术员", content);
 			emailBo.SetEnd("详情请联系相关办理人员,谢谢!");

+ 14 - 0
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -12,8 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderInvoiceMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.TOrderInvoice;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -29,6 +31,8 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	TOrderInvoiceMapper tOrderInvoiceMapper;
 	@Autowired
 	TOrderNewMapper		tOrderNewMapper;
+	@Autowired
+	AdminMapper	adminMapper;
 	@Override
 	public int createServiceOrder(TOrderInvoice o) {
 		o.setCreateTime(new Date());
@@ -107,6 +111,11 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
 		if(StringUtils.isNotBlank(name))params.put("name", name);
 		if(type!=null)params.put("type", type);
+		if (type ==1) {
+			//如果是省外则直接查本部门
+			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			params.put("aDep", a.getDepartmentId());
+		}
 		return (Pagination<TOrderInvoiceBo>)findPage("approvalOrderInvoiceList", "approvalOrderInvoiceCount", params, pageNo, pageSize);
 	}
 
@@ -115,7 +124,12 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		TOrderInvoice t=new TOrderInvoice();
 		t.setId(id);
 		t.setRejectReason(reason);
+		//examine 2通过 3拒绝
+		if(examine==3) {
+		t.setStatus(examine);	
+		}else {
 		t.setApproval(examine);
+		}
 		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 	}
 

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.01
+static.host=//sb.jishutao.com/1.1.02
 avatar.host=//sb.jishutao.com
 
 #连生产
 #avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.1.01
+#static.host=//s.kedexinxi.com/1.1.02
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload