Kaynağa Gözat

200107开发版本

Signed-off-by: anderx <312518615@qq.com>
anderx 6 yıl önce
ebeveyn
işleme
70263ba51b

+ 0 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -36,8 +36,6 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.BusinessListBo;
-import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.order.bo.TOrderNewBo;
 
 @Service
 public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements AdminService {

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

@@ -1284,7 +1284,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="starTime !=null and endTime !=null">
   	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
-  	order by 
+  	order by
+  	<if test="specially == 3">
+  	a.approval,
+  	</if> 
   	<if test="specially == 4">
   	a.process_status,
   	</if>

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

@@ -148,7 +148,6 @@ public class ExportExcelUtil {
 		//map 数据 ,comment表头 (列名称)
  		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
-		int count = 0;
 		//遍历map
 		for (Map.Entry<String,List<TOrderBillNew>> entry : map.entrySet()) {
 			//2.创建一个sheet
@@ -158,7 +157,6 @@ public class ExportExcelUtil {
 			//4.创建一个cell
 			XSSFCell cell = row.createCell(0);
 			cell.setCellValue(entry.getKey()+" 流水记录");
-			count ++;
 			XSSFCellStyle style1 = setCellStyle1(wb);
 			cell.setCellStyle(style1);
 			//合并列
@@ -251,7 +249,6 @@ public class ExportExcelUtil {
 		//map 数据 ,comment表头 (列名称)
 		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
-		int count = 0;
 		//遍历map
 		for (Map.Entry<String,List<TOrderBonusBo>> entry : map.entrySet()) {
 			//2.创建一个sheet
@@ -261,7 +258,6 @@ public class ExportExcelUtil {
 			//4.创建一个cell
 			XSSFCell cell = row.createCell(0);
 			cell.setCellValue(entry.getKey()+" 奖金记录");
-			count ++;
 			XSSFCellStyle style1 = setCellStyle1(wb);
 			cell.setCellStyle(style1);
 			//合并列
@@ -440,7 +436,7 @@ public class ExportExcelUtil {
 					case "未收款(万元)": o = ob.getUncollectedAmount().toString(); break;
 					case "订单部门": o =ob.getDepName(); break;
 					case "订单负责人": o =ob.getSalesmanName(); break;
-					case "催收科目": o = getDunSuBubject(ob.getDunSubject()); break;
+//					case "催收科目": o = ob.getDunSubjectToString(); break;
 					case "催款启动日期": o = ob.getStartDate(); break;
 					default: o = ""; break;
 					}
@@ -452,20 +448,7 @@ public class ExportExcelUtil {
 		
 	}
 
-	public static String getDunSuBubject(String dunSubject) {
-		if ("12".equals(dunSubject)) return "订单审核通过";
-		if ("20".equals(dunSubject)) return "项目待提交";
-		if ("21".equals(dunSubject)) return "项目已提交";
-		if ("22".equals(dunSubject)) return "项目评审";
-		if ("23".equals(dunSubject)) return "项目立项";
-		if ("24".equals(dunSubject)) return "项目公示";
-		if ("25".equals(dunSubject)) return "项目抽查";
-		if ("26".equals(dunSubject)) return "项目备案";
-		if ("27".equals(dunSubject)) return "项目下证";
-		if ("28".equals(dunSubject)) return "项目验收";
-		if ("29".equals(dunSubject)) return "项目拨款";
-		return "";
-	}
+	
 
 
 	public static XSSFWorkbook exportTaskHoursListData(List<TOrderTaskListBo> list, String[] comment, String filePath) {
@@ -618,7 +601,6 @@ public class ExportExcelUtil {
 		//map 数据 ,comment表头 (列名称)
 		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
-		int count = 0;
 		//遍历map
 		for (Map.Entry<String,List<TOrderBonusBo>> entry : map.entrySet()) {
 			//2.创建一个sheet
@@ -628,7 +610,6 @@ public class ExportExcelUtil {
 			//4.创建一个cell
 			XSSFCell cell = row.createCell(0);
 			cell.setCellValue(entry.getKey()+" 奖金记录");
-			count ++;
 			XSSFCellStyle style1 = setCellStyle1(wb);
 			cell.setCellStyle(style1);
 			//合并列

+ 1 - 1
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -48,8 +48,8 @@ public class TOrderNewBo extends TOrderNew{
 	private BigDecimal setUpAmount;
 	
 	public String getDunSubject() {
-		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
+		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
 		return dunSubject;
 	}
 	public Integer getLocationProvince() {

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

@@ -486,16 +486,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
 	public Result exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,
-			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException{
+			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response){
 		 Result res = new Result();
  		try {
  			orderNewService.exportOrderDunData( name, orderNo, starTime, endTime, specially, adminName, depId,newStatus, pageNo, pageSize, response);
 		} catch (Exception e) {
 			res.getError().add(buildError("格式不正确"));
-			e.printStackTrace();
 			return res;
 		}
- 		res.data(1); 
  		return res;
 	}
 	/**
@@ -503,13 +501,12 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
-	public Result exportOrderTaskData(String orderNo,HttpServletResponse response) throws IOException{
+	public Result exportOrderTaskData(String orderNo,HttpServletResponse response){
 		 Result res = new Result();
  		try {
  			orderNewService.exportOrderTaskData(  orderNo,response);
 		} catch (Exception e) {
 			res.getError().add(buildError("格式不正确"));
-			e.printStackTrace();
 			return res;
 		}
  		return res;

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

@@ -167,7 +167,7 @@ public interface OrderNewService {
 	boolean checkORderTask(String orderNo);
 	
 	void exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,
-			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException ;
+			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws  Exception;
 	
 	int updateOrderOver(String orderNo);
 	

+ 7 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -934,19 +935,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 */
 	@Override
 	public void exportOrderDunData(String name,String orderNo,String starTime,String endTime,Integer specially,String adminName,
-			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws IOException {
+			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws Exception  {
 		OutputStream out = response.getOutputStream();
 		try {
 			@SuppressWarnings("unchecked")
-			List<TOrderNewBo> list=(List<TOrderNewBo>) dunOrderNewList( name,  orderNo,  starTime,  endTime,
+			List<outOrderDunListBo> list=(List<outOrderDunListBo>) dunOrderNewList( name,  orderNo,  starTime,  endTime,
 					 specially,  adminName, depId,newStatus, pageNo,  pageSize).getList();
+			
     		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","应收款","已收款","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
     		String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"催款信息");
     		//根据列表编写文档
     		XSSFSheet sheet =wb.getSheetAt(0);
-    		for (TOrderNewBo ob : list) {
+    		System.out.println(list.get(0).getAccountsReceivable());
+    		for (outOrderDunListBo ob : list) {
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
     			for (int i = 0; i < comment.length; i++) {
@@ -987,7 +990,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			throw new BusinessException(new Error("表格生成错误。"));
 		}finally {
 			out.flush(); 
-			 out.close(); 
+			out.close(); 
 		}
 		
 	}