数据代码

src/main/java/com/jeeplus/core/service/CrudService.java

@@ -21,13 +21,13 @@ import com.jeeplus.core.persistence.Page;
  */
 @Transactional(readOnly = true)
 public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<T>> extends BaseService {
-	
+
 	/**
 	 * 持久层对象
 	 */
 	@Autowired
 	protected M mapper;
-	
+
 	/**
 	 * 获取单条数据
 	 * @param id
@@ -36,7 +36,7 @@ public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<
 	public T get(String id) {
 		return mapper.get(id);
 	}
-	
+
 	/**
 	 * 获取单条数据
 	 * @param entity
@@ -45,7 +45,7 @@ public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<
 	public T get(T entity) {
 		return mapper.get(entity);
 	}
-	
+
 	/**
 	 * 查询列表数据
 	 * @param entity
@@ -66,7 +66,7 @@ public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<
 		dataRuleFilter(entity);
 		return mapper.findAllList(entity);
 	}
-	
+
 	/**
 	 * 查询分页数据
 	 * @param page 分页对象
@@ -79,6 +79,17 @@ public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<
 		page.setList(mapper.findList(entity));
 		return page;
 	}
+	/**
+	 * 查询分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<T> findOverPage(Page<T> page, T entity) {
+		dataRuleFilter(entity);
+		entity.setPage(page);
+		return page;
+	}
 
 	/**
 	 * 保存数据（插入或更新）
@@ -104,8 +115,8 @@ public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<
 	public void delete(T entity) {
 		mapper.delete(entity);
 	}
-	
-	
+
+
 	/**
 	 * 删除全部数据
 	 * @param entitys
@@ -128,7 +139,7 @@ public abstract class CrudService<M extends BaseMapper<T>, T extends DataEntity<
 		}
 	}
 
-	
+
 	/**
 	 * 获取单条数据
 	 * @param propertyName, value

src/main/java/com/jeeplus/modules/supply/judgementBills/web/SupplyJudgementBillsController.java

@@ -124,10 +124,11 @@ public class SupplyJudgementBillsController extends BaseController {
         try {
             ImportExcel ei = new ImportExcel(file, 0, 0);
             List<SupplyJudgementBills> list = ei.getDataList(SupplyJudgementBills.class);
+            int size = list.size();
             Map<String,Object> map = service.disposeJudgementBills(list);
             Boolean bool = (Boolean) map.get("success");
             if(bool){
-                j.setMsg("已成功导入 " + list.size() +" 条审定单记录");
+                j.setMsg("已成功导入 " + size +" 条审定单记录");
             }else{
                 j.setMsg(map.get("message").toString());
             }

src/main/java/com/jeeplus/modules/supply/stockOut/web/SupplyStockOutController.java

@@ -126,10 +126,11 @@ public class SupplyStockOutController extends BaseController {
         try {
             ImportExcel ei = new ImportExcel(file, 0, 0);
             List<SupplyStockOut> list = ei.getDataList(SupplyStockOut.class);
+            int size = list.size();
             Map<String,Object> map = supplyStockOutService.disposeStockOut(list);
             Boolean bool = (Boolean) map.get("success");
             if(bool){
-                j.setMsg("已成功导入 " + list.size() +" 条出库单记录");
+                j.setMsg("已成功导入 " + size +" 条出库单记录");
             }else{
                 j.setMsg(map.get("message").toString());
             }