#当前本版十分完美、冻结

luxiaotao1123

2020-07-29 d3c596bf20e6c41429a162a32b0602de24fab915

#当前本版十分完美、冻结

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.web.BaseController;
@@ -150,7 +151,9 @@
    @ManagerAuth(memo = "日入库明细统计导出")
    public R viewWorkInExport(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(new ViewWorkInBean());
        ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
        bean.setQuery_date(bean.getQuery_date());
        List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
        return R.ok(exportSupport(list, fields));
    }


 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java

@@ -142,7 +142,7 @@
        this.bname = bname;
    }
    public String getIo_time() {
        return io_time;
        return io_time.substring(0,19);
    }
    public void setIo_time(String io_time) {
        this.io_time = io_time;

 src/main/webapp/static/js/report/workIn.js

@@ -88,8 +88,13 @@
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'fields': fields
                        fields: fields,
                        exportData: exportData
                    };
                    $.ajax({
                        url: baseUrl+"/report/viewWorkInExport.action",

 src/main/webapp/views/report/viewWorkIn.html

@@ -31,7 +31,7 @@
    </div>
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="入库起始时间 - 入库终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div id="data-search-btn" class="layui-btn-container layui-form-item">