zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加期间报表

master
e 2019-01-17 21:51:48 +08:00
parent 03d84a90bc
commit 5feb2287fd
3 changed files with 253 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

355
database/wms-20190108.sql → database/wms-20190117.sql
View File

File diff suppressed because one or more lines are too long

41
src/main/java/com/zzjee/bireport/controller/RpPeriodInOutController.java
View File

@ -114,7 +114,6 @@ public class RpPeriodInOutController extends BaseController {
public void datagrid(RpPeriodInOutEntity rpPeriodInOut,HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
CriteriaQuery cq = new CriteriaQuery(RpPeriodInOutEntity.class, dataGrid);
//查询条件组装器
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, rpPeriodInOut, request.getParameterMap());
try{
//自定义追加查询条件
String query_datePeriod_begin = request.getParameter("datePeriod_begin");
@ -129,12 +128,15 @@ public class RpPeriodInOutController extends BaseController {
wmUtil.genrp(query_datePeriod_begin,query_datePeriod_end,ResourceUtil.getSessionUserName().getUserName());
}catch (Exception e){
}
if(StringUtil.isNotEmpty(query_datePeriod_begin)){
cq.ge("datePeriod", Integer.parseInt(query_datePeriod_begin));
}
if(StringUtil.isNotEmpty(query_datePeriod_end)){
cq.le("datePeriod", Integer.parseInt(query_datePeriod_end));
}
// if(StringUtil.isNotEmpty(query_datePeriod_begin)){
// cq.ge("datePeriod", Integer.parseInt(query_datePeriod_begin));
// }
// if(StringUtil.isNotEmpty(query_datePeriod_end)){
// cq.le("datePeriod", Integer.parseInt(query_datePeriod_end));
// }
rpPeriodInOut.setDatePeriod(null);
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, rpPeriodInOut, request.getParameterMap());
cq.eq("username",ResourceUtil.getSessionUserName().getUserName());
}catch (Exception e) {
throw new BusinessException(e.getMessage());
@ -157,18 +159,19 @@ public class RpPeriodInOutController extends BaseController {
public String exportXls(RpPeriodInOutEntity rpPeriodInOut,HttpServletRequest request,HttpServletResponse response
, DataGrid dataGrid,ModelMap modelMap) {
//自定义追加查询条件
// String query_datePeriod_begin = request.getParameter("datePeriod_begin");
// String query_datePeriod_end = request.getParameter("datePeriod_end");
// try{
// if(!StringUtil.isNotEmpty(query_datePeriod_begin)){
// query_datePeriod_begin = "2018-01-01";
// }
// if(!StringUtil.isNotEmpty(query_datePeriod_end)){
// query_datePeriod_end = "2099-01-01";
// }
// wmUtil.genrp(query_datePeriod_begin,query_datePeriod_end,ResourceUtil.getSessionUserName().getUserName());
// }catch (Exception e){
// }
String query_datePeriod_begin = request.getParameter("datePeriod_begin");
String query_datePeriod_end = request.getParameter("datePeriod_end");
try{
if(!StringUtil.isNotEmpty(query_datePeriod_begin)){
query_datePeriod_begin = "2018-01-01";
}
if(!StringUtil.isNotEmpty(query_datePeriod_end)){
query_datePeriod_end = "2099-01-01";
}
wmUtil.genrp(query_datePeriod_begin,query_datePeriod_end,ResourceUtil.getSessionUserName().getUserName());
}catch (Exception e){
}
rpPeriodInOut.setDatePeriod(null);
rpPeriodInOut.setUsername(ResourceUtil.getSessionUserName().getUserName());
CriteriaQuery cq = new CriteriaQuery(RpPeriodInOutEntity.class, dataGrid);
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, rpPeriodInOut, request.getParameterMap());

4
src/main/resources/jeecg/jeecg_database.properties
View File

@ -1,9 +1,9 @@
#mysql
diver_name=com.mysql.jdbc.Driver
url=jdbc:mysql://localhost:3306/zzjee?useUnicode=true&characterEncoding=UTF-8
url=jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=UTF-8
username=root
password=Zzerp123
database_name=zzjee
database_name=wms
#oracle
#diver_name=oracle.jdbc.driver.OracleDriver