Browse Source

测试配置修改

anderx 6 years ago
parent
commit
de866f339a

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

@@ -641,11 +641,14 @@
   </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,
+     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,a.status,
      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 where a.status in (1,2) and a.approval in (0,2) 
+	on a.order_no=d.order_no where a.status in (1,2) and a.approval in (0,2)
+	<if test="type !=null">
+	and a.`type`= #{type,jdbcType=INTEGER} 
+	</if>
 	<if test="financeId !=null">
 	and b.finance_id= #{financeId,jdbcType=VARCHAR}
 	</if>
@@ -658,7 +661,7 @@
 	<if test="orderDep !=null">
 	and b.order_dep= #{orderDep,jdbcType=VARCHAR}
 	</if>
-	order by a.create_time desc
+	order by a.status ,a.create_time desc
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -668,7 +671,10 @@
   	select count(*) 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
-	where a.status in (1,2)
+	where a.status in (1,2) and a.approval in (0,2) 
+	<if test="type !=null">
+	and a.`type`= #{type,jdbcType=INTEGER} 
+	</if>
 	<if test="financeId !=null">
 	and b.finance_id= #{financeId,jdbcType=VARCHAR}
 	</if>
@@ -684,7 +690,7 @@
   </select>
   
   <select id="salesmanOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
-    select id ,order_no as orderNo,amount,date_format(create_time,'%Y-%m-%d %H:%I:%S') as createTime,
+    select id ,order_no as orderNo,amount,date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTime,
 	reject_reason as  rejectReason,status from t_order_invoice
 	where status !=4
 	<if test="orderNo !=null">
@@ -705,7 +711,7 @@
   
   <select id="approvalOrderInvoiceList" 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 ,
+     ifnull(d.sumAmount,0) as sumAmount, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTime ,
      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
@@ -750,7 +756,7 @@
     	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,a.reject_reason,a.create_time,a.update_time,a.approval,a.already_amount,b.contract_no as contractNo 
+    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
     where id = #{id,jdbcType=INTEGER}
   </select>

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

@@ -6,13 +6,17 @@ import java.util.Date;
 import java.util.Properties;
 
 import javax.mail.Authenticator;
+import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.MessagingException;
+import javax.mail.Multipart;
 import javax.mail.PasswordAuthentication;
 import javax.mail.Session;
 import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
 import javax.mail.internet.MimeUtility;
 
 import com.goafanti.common.bo.EmailBo;
@@ -121,9 +125,13 @@ public class SendEmailUtil {
 //		EmailBo bo =new EmailBo("催收通知","3298921364@qq.com,","管理员,","平台超管中心","管理员","<div>客户名称: 国防湖南</div><div>订单编号: 273822676366036992</div><div>催收时间: 273822676366036992</div><div>催收科目: 273822676366036992</div><div>催收情况: 273822676366036992</div>");
 //		send(bo);
 		EmailBo bo = new EmailBo("奖金信息", "3298921364@qq.com,", "limim,", "财务部", "财务专员彭晓丽", content);*/
+		
+		
+		
 		SendEmailUtil emailUtil = SendEmailUtil.getInstance();
-		String content = "<div>专利缴费提醒: "+ "专利1号" +"</div><div>客户名称: " + "湖南明和" + "</div>";
-		 content += "<div>专利编号: "+ "zl0001" +"</div>";
+		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>"+
+				"</body>";
 			EmailBo emailBo = new EmailBo("专利提醒","2304089483@qq.com", "客户", "科德集团", "技术员", content);
 			emailBo.SetEnd("详情请联系相关办理人员,谢谢!");
 			emailUtil.send(emailBo);

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

@@ -101,10 +101,10 @@ public class OrderInvoiceApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/financeOrderInvoiceList",method = RequestMethod.GET)
-	public Result financeOrderInvoiceList(String depId,String orderNo ,String name,Integer pageNo,Integer pageSize){
+	public Result financeOrderInvoiceList(String depId,String orderNo ,String name,String type,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		
-		res.data(orderInvoiceService.financeOrderInvoiceList( depId, orderNo , name,pageNo,pageSize));
+		res.data(orderInvoiceService.financeOrderInvoiceList( depId, orderNo , name,type,pageNo,pageSize));
 		return res;
 	}
 	/**

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

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

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

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	@Override
 	public int createServiceOrder(TOrderInvoice o) {
 		o.setCreateTime(new Date());
+		System.out.println(DateFormatUtils.format(o.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS));
 		return tOrderInvoiceMapper.insertSelective(o);
 	}
 
@@ -53,7 +55,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String depId, String orderNo, String name, Integer pageNo,
+	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String depId, String orderNo, String name, String type,Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -62,6 +64,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			params.put("financeId", TokenManager.getAdminId());
 		}
 		if(StringUtils.isNotBlank(depId))params.put("depId", depId);
+		if(StringUtils.isNotBlank(type))params.put("type", type);
 		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);
@@ -112,7 +115,6 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		TOrderInvoice t=new TOrderInvoice();
 		t.setId(id);
 		t.setRejectReason(reason);
-		t.setStatus(examine);
 		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

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.kedexinxi.com/1.1.0
+static.host=//static.kedexinxi.com/1.1.02
 portal.host=//static.kedexinxi.com/portal/2.0.6
 avatar.host=//static.kedexinxi.com
 avatar.upload.host=//static.kedexinxi.com/upload