期间报表

master
e 2019-01-17 22:13:07 +08:00
parent 5feb2287fd
commit 413adbbad2
3 changed files with 14 additions and 14 deletions

File diff suppressed because one or more lines are too long

View File

@ -116,8 +116,8 @@ public class RpPeriodInOutController extends BaseController {
//查询条件组装器
try{
//自定义追加查询条件
String query_datePeriod_begin = request.getParameter("datePeriod_begin");
String query_datePeriod_end = request.getParameter("datePeriod_end");
String query_datePeriod_begin = request.getParameter("createDate_begin");
String query_datePeriod_end = request.getParameter("createDate_end");
try{
if(!StringUtil.isNotEmpty(query_datePeriod_begin)){
query_datePeriod_begin = "2018-01-01";
@ -134,7 +134,7 @@ public class RpPeriodInOutController extends BaseController {
// if(StringUtil.isNotEmpty(query_datePeriod_end)){
// cq.le("datePeriod", Integer.parseInt(query_datePeriod_end));
// }
rpPeriodInOut.setDatePeriod(null);
rpPeriodInOut.setCreateDate(null);
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, rpPeriodInOut, request.getParameterMap());
cq.eq("username",ResourceUtil.getSessionUserName().getUserName());
@ -159,8 +159,8 @@ 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");
String query_datePeriod_begin = request.getParameter("createDate_begin");
String query_datePeriod_end = request.getParameter("createDate_end");
try{
if(!StringUtil.isNotEmpty(query_datePeriod_begin)){
query_datePeriod_begin = "2018-01-01";
@ -171,7 +171,7 @@ public class RpPeriodInOutController extends BaseController {
wmUtil.genrp(query_datePeriod_begin,query_datePeriod_end,ResourceUtil.getSessionUserName().getUserName());
}catch (Exception e){
}
rpPeriodInOut.setDatePeriod(null);
rpPeriodInOut.setCreateDate(null);
rpPeriodInOut.setUsername(ResourceUtil.getSessionUserName().getUserName());
CriteriaQuery cq = new CriteriaQuery(RpPeriodInOutEntity.class, dataGrid);
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, rpPeriodInOut, request.getParameterMap());

View File

@ -7,14 +7,14 @@
<t:dgCol title="主键" field="id" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建人名称" field="createName" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建人登录名称" field="createBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="创建日期" field="createDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="期间选择" field="createDate" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="更新人名称" field="updateName" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新人登录名称" field="updateBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="更新日期" field="updateDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="流程状态" field="bpmStatus" hidden="true" queryMode="single" dictionary="bpm_status" width="120"></t:dgCol>
<t:dgCol title="期间" field="datePeriod" formatter="yyyy-MM-dd" query="true" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="期间" field="datePeriod" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="用户名" field="username" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="商品编码" field="goodsId" query="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="商品名称" field="goodsName" query="true" queryMode="single" width="220"></t:dgCol>