调整日期显示

wuxw

2019-10-30 6b14a8bd143c548c29a464c9e479ec43def10506

调整日期显示

 ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html

@@ -5,9 +5,9 @@
                <div class="ibox-title">
                    <h5>查询条件</h5>
                    <div class="ibox-tools" style="top:10px;">
                        <!--<button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
                                v-on:click="_moreCondition()">{{payFeeManageInfo.moreCondition == true?'隐藏':'更多'}}
                        </button>-->
                        </button>
                    </div>
                </div>
                <div class="ibox-content">
@@ -23,23 +23,23 @@
                        </div>
                        <div class="col-sm-4">
                            <div class="form-group">
                                <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control form-control-sm start_time">
                                <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control  start_time">
                            </div>
                        </div>
                        <div class="col-sm-3">
                            <div class="form-group">
                                <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control form-control-sm end_time">
                                <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control  end_time">
                            </div>
                        </div>
                        <div class="col-sm-1">
                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeMethod()">
                                <i class="glyphicon glyphicon-search"></i> 查询
                                <i class="glyphicon glyphicon-search"></i>
                            </button>
                        </div>
                    </div>
                    <div class="row">
                    <div class="row" v-if="payFeeManageInfo.moreCondition == true">
                        <div class="col-sm-4">
                            <input size="16" type="text" placeholder="请填写员工编码"  v-model="payFeeManageInfo.conditions.userCode" readonly class="form-control form-control-sm">
                            <input size="16" type="text" placeholder="请填写员工编码"  v-model="payFeeManageInfo.conditions.userCode" class="form-control">
                        </div>
                    </div>
                </div>

 ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js

@@ -32,8 +32,22 @@
        },
        methods: {
            _initDate:function(){
                $(".start_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "day"});
                $(".end_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "hour"});
                $(".start_time").datetimepicker({
                    language: 'zh-CN',
                    format: 'yyyy-mm-dd',
                    minView: "month",
                    initialDate: new Date(),
                    autoClose: 1,
                    todayBtn: true
                });
                $(".end_time").datetimepicker({
                    language: 'zh-CN',
                    format: 'yyyy-mm-dd',
                    minView: "month",
                    initialDate: new Date(),
                    autoClose: 1,
                    todayBtn: true
                });
                $('.start_time').datetimepicker()
                    .on('changeDate', function (ev) {
                        var value = $(".start_time").val();

 java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java

@@ -249,9 +249,9 @@

            String currentSql = sqlObj.getString(dataQuery.getTemplateKey());
            //处理 if 判断
            logger.debug("dealSqlIf开始处理sql中的<if>节点 "+ currentSql + " 入参:" + params.toJSONString());
            logger.debug("dealSqlIf开始处理sql中的<if>节点 " + currentSql + " 入参:" + params.toJSONString());
            currentSql = dealSqlIf(currentSql, params);
            logger.debug("dealSqlIf处理完成sql中的<if>节点 "+ currentSql + " 入参:" + params.toJSONString());
            logger.debug("dealSqlIf处理完成sql中的<if>节点 " + currentSql + " 入参:" + params.toJSONString());


            String[] sqls = currentSql.split("#");
@@ -371,7 +371,7 @@
        }


        return newSql.toString();
        return newSql.toString().replace("&gt;", ">").replace("&lt;", "<");

    }