Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
be31f8c381

+ 1 - 18
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -281,24 +281,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
         }
         return listGroup;
     }
-   /* public static void main(String[] args) {
-    	List<String> list=new ArrayList<>();
-		for (int i = 1; i < 888; i++) {
-			list.add(String.valueOf(i));
-		}
-		  List<List<String>> listGroup = new ArrayList<List<String>>();
-	        int listSize = list.size();
-	        //子集合的长度
-	        int toIndex = 100;
-	        for (int i = 0; i < list.size(); i += 100) {
-	            if (i + 100 > listSize) {
-	                toIndex = listSize - i;
-	            }
-	            List<String> newList = list.subList(i, i + toIndex);
-	            listGroup.add(newList);
-	        }
-	        System.out.println(listGroup);
-	}*/
+  
 
 	@Override
 	public List<Admin> getListDefaultPassword(String depId) {

+ 0 - 93
src/main/java/com/goafanti/common/controller/MainTest.java

@@ -1,93 +0,0 @@
-package com.goafanti.common.controller;
-
-import java.awt.print.Book;
-import java.awt.print.PageFormat;
-import java.awt.print.Paper;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-import javax.print.attribute.HashAttributeSet;
-import javax.print.attribute.standard.PrinterName;
-
-import com.goafanti.common.bo.Prient;
-import com.goafanti.common.bo.Test;
-
-/**
- * 打印测试类
- * 
- * @author admin
- * 
- */
-public class MainTest {
-
-	public static void main(String[] args) {
-		//这里是测试用的数据,自己定义就好了
-		List<Test> testList = new ArrayList<Test>();
-		Test t1 = new Test("麻辣牛肉", 23.00, 2);
-		Test t2 = new Test("麻辣牛肉", 23.00, 4);
-		Test t3 = new Test("精品千层肚", 24.00, 3);
-		Test t4 = new Test("麻辣牛肉", 23.00, 2);
-		Test t5 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t6 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t7 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t8 = new Test("极品鲜毛肚", 26.00, 1);
-		Test t9 = new Test("极品鲜毛肚", 26.00, 1);
-		testList.add(t1);
-		testList.add(t2);
-		testList.add(t3);
-		testList.add(t4);
-		testList.add(t5);
-		testList.add(t6);
-		testList.add(t7);
-		testList.add(t8);
-		testList.add(t9);
-		
-		// 设置小票模型菜品集合
-		Prient.setTestList(testList);
-		// 定义纸张高度
-//		int height = 842;
-		// 通俗理解就是书、文档
-		Book book = new Book();
-		// 打印格式
-		PageFormat pf = new PageFormat();
-		// 原点在纸张的左上方,x 指向右方,y 指向下方。
-		pf.setOrientation(PageFormat.PORTRAIT);
-		// 通过Paper设置页面的空白边距和可打印区域。必须与实际打印纸张大小相符。
-		Paper p = new Paper();
-		// 页面宽度 页面高度
-		p.setSize(592, 842);
-		// x轴 y轴 宽度 高度
-		p.setImageableArea(0, 0, 260, 842);
-		pf.setPaper(p);
-		// 把 PageFormat 和 Printable 添加到书中,组成一个页面
-		book.append(new Prient(), pf);
-		// 指定打印机打印(printerName打印机名称)
-//		HashAttributeSet hs = new HashAttributeSet();
-//		String printerName = "OneNote";
-//		hs.add(new PrinterName(printerName, null));
-//		PrintService[] pss = PrintServiceLookup.lookupPrintServices(null, hs);
-		PrintService ps = PrintServiceLookup.lookupDefaultPrintService();
-		if (ps==null) {
-			System.out.println("无法找到打印机!");
-			return;
-		}
-		// 获取打印服务对象
-		PrinterJob job = PrinterJob.getPrinterJob();
-		// 写入书
-		job.setPageable(book);
-		try {
-			Integer random6 = (int) ((Math.random() * 9 + 1) * 100000);
-			System.out.println("Z"+System.currentTimeMillis()+random6.toString());
-			// 添加指定的打印机
-			job.setPrintService(ps);
-			// 打印执行
-			job.print();
-		} catch (PrinterException e) {
-			System.out.println("================打印出现异常");
-		}
-	}
-}

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

@@ -492,7 +492,7 @@
   
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeDunOut">
 	select a.id,a.order_no orderNo,ifnull(a.tid,c.tid)tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
-  	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,
+  	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,a.ctid,
   	  ifnull(b.commodity_name,c.commodity_name) commodityName,a.money,a.status, a.appropriation_ratio appropriationRatio
   	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
     	where a.cid= #{id}

+ 0 - 26
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -185,32 +185,6 @@ public class ExcelUtils {
 			return "";
 	}
 	
-	public static void main(String[] args) {
-//		ExcelUtils utils = new ExcelUtils();
-//		String s = utils.checkMobile("18320746285", 1);
-//		System.out.println(s);
-		String mm = "201111";
-		if(mm.length() != 2 && mm.length() != 6){
-			System.out.println("cuowu=-----");
-		}else{
-			Integer m = Integer.valueOf(mm.substring(mm.length()-2, mm.length()));
-			System.out.println(m);
-			if(m>12 || m<0){
-				System.out.println("月份不对------");
-			}else{
-				Integer re = Integer.valueOf(mm);
-				if(re>m){
-					System.out.println(re);
-				}else{
-					String ym = new SimpleDateFormat("yyyy").format(new Date()) + m;
-					System.out.println(ym);
-				}
-			}
-			
-			
-			
-		}
-	}
 	
 	
 	public  Set<OrderReportBo> parseOrderExcel(String excelPath) throws IOException{

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

@@ -142,9 +142,5 @@ public class SendEmailUtil {
         Matcher m = p.matcher(email);
         return m.matches();
     }
-
-	/*public static void main(String[] args) {
-		System.out.println(isEmail("anderx@dingtalk.com"));
-	}*/
 	
 }

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

@@ -73,6 +73,7 @@ public class OrderChangeApiController extends CertifyApiController {
 		res.setData(orderChangeService.addChangeTask(t));
 		return res;
 	}
+	
 	/**
 	 *  变更项目列表
 	 * @param t
@@ -120,7 +121,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	}
 	
 	/**
-	 *  删除变更项目
+	 *  修改变更项目
 	 * @param t
 	 * @return
 	 */
@@ -135,7 +136,7 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 *  删除变更催款
+	  *     修改变更催款
 	 * @param t
 	 * @return
 	 */

+ 13 - 12
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -175,15 +175,16 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}
 				TChangeTaskMapper.insertSelectiveList(listck);
 			}
-		
-		OrderChangeLog ocl=new OrderChangeLog();
-		ocl.setAuditor(TokenManager.getAdminId());
-		ocl.setOrderNo(t.getOrderNo());
-		ocl.setRemarks(startRemarks);
-		ocl.setChangeId(ncb.getId());
-		ocl.setStatus(0);
-		//sendNotice(0, t);//设置与通过一样发送信息
-		orderChangeLogMapper.insertSelective(ocl);
+			if (t.getType()==OrderChangeType.TDTK.getCode()) {
+				OrderChangeLog ocl=new OrderChangeLog();
+				ocl.setAuditor(TokenManager.getAdminId());
+				ocl.setOrderNo(t.getOrderNo());
+				ocl.setRemarks(startRemarks);
+				ocl.setChangeId(ncb.getId());
+				ocl.setStatus(0);
+				sendNotice(0, t);//设置与通过一样发送信息
+				orderChangeLogMapper.insertSelective(ocl);
+			}
 		return 1;
 	}
 	
@@ -259,7 +260,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				 if(nb.getProcessState()==1){//营销管理通过则设置技术管理员通过表
 					 if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
 						 insertOrderExamine(orderNo);
-					 } 
+					 } else {
+						 orderExamineMapper.updateByOrderNo(orderNo,null);
+					 }
 					 nb.setProcessState(nb.getProcessState()+1);
 					}
 				 //必须放置在咨询师与咨询师经理前,否则会直接通过不走咨询师管理员
@@ -779,6 +782,4 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				list =newOrderChangeMapper.getOrderChange(orderNo);
 				return list;
 			}
-		
-
 }