1

mybusiness/src/main/resources/mapper/system/TGuijiHealthcommissionTjxxMapper.xml

@@ -82,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cardid != null  and cardid != ''"> and cardid = #{cardid}</if>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHealthcommissionTjxxById" parameterType="String" resultMap="TGuijiHealthcommissionTjxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiHealthcommissionXxMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="idcardnum != null  and idcardnum != ''"> and idcardnum = #{idcardnum}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHealthcommissionXxById" parameterType="String" resultMap="TGuijiHealthcommissionXxResult">

mybusiness/src/main/resources/mapper/system/TGuijiHealthcommissionYyryxxMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cardid != null  and cardid != ''"> and cardid = #{cardid}</if>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHealthcommissionYyryxxById" parameterType="String" resultMap="TGuijiHealthcommissionYyryxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiHousingconstructionJfpzxxMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yhbh != null  and yhbh != ''"> and yhbh = #{yhbh}</if>
             <if test="yhmc != null  and yhmc != ''"> and yhmc = #{yhmc}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHousingconstructionJfpzxxById" parameterType="String" resultMap="TGuijiHousingconstructionJfpzxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiHousingconstructionYhjbxxMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfjf != null  and sfjf != ''"> and sfjf = #{sfjf}</if>
             <if test="jfsj != null  and jfsj != ''"> and jfsj = #{jfsj}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHousingconstructionYhjbxxById" parameterType="String" resultMap="TGuijiHousingconstructionYhjbxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiHousingconstructionYsljcMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="snm != null  and snm != ''"> and snm like concat('%', #{snm}, '%')</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHousingconstructionYsljcById" parameterType="String" resultMap="TGuijiHousingconstructionYsljcResult">

mybusiness/src/main/resources/mapper/system/TGuijiHousingconstructionYslxxMapper.xml

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yhbh != null  and yhbh != ''"> and yhbh = #{yhbh}</if>
             <if test="yhmc != null  and yhmc != ''"> and yhmc = #{yhmc}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHousingconstructionYslxxById" parameterType="String" resultMap="TGuijiHousingconstructionYslxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiHousingconstructionZlskfrxMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="caseid != null  and caseid != ''"> and caseid = #{caseid}</if>
             <if test="incomingcall != null  and incomingcall != ''"> and incomingcall = #{incomingcall}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiHousingconstructionZlskfrxById" parameterType="String" resultMap="TGuijiHousingconstructionZlskfrxResult">

mybusiness/src/main/resources/mapper/system/TGuijiNaturalresourcesBdcdjxxMapper.xml

@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tsdw != null  and tsdw != ''"> and tsdw = #{tsdw}</if>
             <if test="fwxz != null  and fwxz != ''"> and fwxz = #{fwxz}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiNaturalresourcesBdcdjxxById" parameterType="String" resultMap="TGuijiNaturalresourcesBdcdjxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiNaturalresourcesBdcdjzxxMapper.xml

@@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zsbh != null  and zsbh != ''"> and zsbh = #{zsbh}</if>
             <if test="qzh != null  and qzh != ''"> and qzh = #{qzh}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiNaturalresourcesBdcdjzxxById" parameterType="String" resultMap="TGuijiNaturalresourcesBdcdjzxxResult">

mybusiness/src/main/resources/mapper/system/TGuijiNaturalresourcesQlrjbxxMapper.xml

@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
             <if test="tsdw != null  and tsdw != ''"> and tsdw = #{tsdw}</if>
         </where>
+        order by cd_time desc
     </select>
     
     <select id="selectTGuijiNaturalresourcesQlrjbxxById" parameterType="String" resultMap="TGuijiNaturalresourcesQlrjbxxResult">

mybusiness/src/main/resources/mapper/system/TUInterfaceinfoMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="callsuccnum != null  and callsuccnum != ''"> and callsuccnum = #{callsuccnum}</if>
             <if test="callfailnum != null  and callfailnum != ''"> and callfailnum = #{callfailnum}</if>
         </where>
+        order by cd_time desc
     </select>
 
     <select id="selectTUInterfaceinfoById" parameterType="String" resultMap="TUInterfaceinfoResult">

mybusiness/src/main/resources/templates/system/bdcdjxx/bdcdjxx.html

@@ -422,7 +422,8 @@
                 {
                     field: 'fwxz',
                     title: '房屋性质'
-                }, {
+                },
+                {
                     field: 'cdTime',
                     title: '数据归集时间',
                     formatter: function (value, row, index) {
@@ -432,18 +433,19 @@
                             var month = time.getMonth() + 1;
                             var date = time.getDate();
                             var hours = time.getHours();
-                            if(hours == ''){
+                            if (hours == '') {
                                 hours = "00"
                             }
                             var minute = time.getMinutes();
-                            if(minute == ''){
+                            if (minute == '') {
                                 minute = "00"
                             }
                             var second = time.getSeconds();
-                            if(second == ''){
+                            if (second == '') {
                                 second = "00"
                             }
-                            return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
                         }
                     }
                 },

mybusiness/src/main/resources/templates/system/bdcdjzxx/bdcdjzxx.html

@@ -1,72 +1,74 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('不动产登记证信息列表')" />
+    <th:block th:include="include :: header('不动产登记证信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>登记编号：</label>
-                                <input type="text" name="djbh"/>
-                            </li>
-                            <li>
-                                <label>权利人：</label>
-                                <input type="text" name="qlrmc"/>
-                            </li>
-                            <li>
-                                <label>坐落：</label>
-                                <input type="text" name="fwzl"/>
-                            </li>
-                            <!--<li>-->
-                                <!--<label>证书编号：</label>-->
-                                <!--<input type="text" name="zsbh"/>-->
-                            <!--</li>-->
-                            <!--<li>-->
-                                <!--<label>权证号：</label>-->
-                                <!--<input type="text" name="qzh"/>-->
-                            <!--</li>-->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>登记编号：</label>
+                            <input type="text" name="djbh"/>
+                        </li>
+                        <li>
+                            <label>权利人：</label>
+                            <input type="text" name="qlrmc"/>
+                        </li>
+                        <li>
+                            <label>坐落：</label>
+                            <input type="text" name="fwzl"/>
+                        </li>
+                        <!--<li>-->
+                        <!--<label>证书编号：</label>-->
+                        <!--<input type="text" name="zsbh"/>-->
+                        <!--</li>-->
+                        <!--<li>-->
+                        <!--<label>权证号：</label>-->
+                        <!--<input type="text" name="qzh"/>-->
+                        <!--</li>-->
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:bdcdjzxx:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:bdcdjzxx:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:bdcdjzxx:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:bdcdjzxx:remove')}]];
-        var prefix = ctx + "system/bdcdjzxx";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:bdcdjzxx:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:bdcdjzxx:remove')}]];
+    var prefix = ctx + "system/bdcdjzxx";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                detailUrl: prefix + "/edit/{id}",
-                modalName: "不动产登记证信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            detailUrl: prefix + "/edit/{id}",
+            modalName: "不动产登记证信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '序号',
@@ -291,23 +293,45 @@
                     field: 'zsmc',
                     title: '证书名称'
                 },
-                    {
-                        field: 'cdTime',
-                        title: '数据归集时间'
-                    },
+                {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs  ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\''
                             + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

mybusiness/src/main/resources/templates/system/grjbxx/grjbxx.html

@@ -214,18 +214,19 @@
                             var month = time.getMonth() + 1;
                             var date = time.getDate();
                             var hours = time.getHours();
-                            if(hours == ''){
+                            if (hours == '') {
                                 hours = "00"
                             }
                             var minute = time.getMinutes();
-                            if(minute == ''){
+                            if (minute == '') {
                                 minute = "00"
                             }
                             var second = time.getSeconds();
-                            if(second == ''){
+                            if (second == '') {
                                 second = "00"
                             }
-                            return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
                         }
                     }
                 },

mybusiness/src/main/resources/templates/system/jfpzxx/jfpzxx.html

@@ -1,66 +1,63 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('缴费凭证信息列表')" />
+    <th:block th:include="include :: header('缴费凭证信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>用户编号：</label>
-                                <input type="text" name="yhbh"/>
-                            </li>
-                            <li>
-                                <label>用户名称：</label>
-                                <input type="text" name="yhmc"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>用户编号：</label>
+                            <input type="text" name="yhbh"/>
+                        </li>
+                        <li>
+                            <label>用户名称：</label>
+                            <input type="text" name="yhmc"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:jfpzxx:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:jfpzxx:remove')}]];
-        var prefix = ctx + "system/jfpzxx";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:jfpzxx:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:jfpzxx:remove')}]];
+    var prefix = ctx + "system/jfpzxx";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                detailUrl: prefix + "/edit/{id}",
-                modalName: "缴费凭证信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            detailUrl: prefix + "/edit/{id}",
+            modalName: "缴费凭证信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '主键ID',
                     visible: false
                 },
                 {
-                    field: 'cdTime',
-                    title: '推送时间',
-                    visible: false
-                },
-                {
                     field: 'cdBatch',
                     title: '批次号',
                     visible: false
@@ -96,18 +93,44 @@
                     title: '缴费时间'
                 },
                 {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
+                {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs  ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\''
                             + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

mybusiness/src/main/resources/templates/system/library/baseinfo/baseinfo.html

@@ -156,7 +156,29 @@
                 },
                 {
                     field: 'cdTime',
-                    title: '数据归集时间'
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
                 },
                 {
                     title: '操作',

mybusiness/src/main/resources/templates/system/library/borrow/borrow.html

@@ -137,7 +137,29 @@
                 },
                 {
                     field: 'cdTime',
-                    title: '数据归集时间'
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
                 },
                 {
                     title: '操作',

mybusiness/src/main/resources/templates/system/library/creditpoints/creditpoints.html

@@ -168,7 +168,29 @@
                 },
                 {
                     field: 'cdTime',
-                    title: '数据归集时间'
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
                 },
                 {
                     title: '操作',

mybusiness/src/main/resources/templates/system/library/give/give.html

@@ -140,7 +140,29 @@
                 },
                 {
                     field: 'cdTime',
-                    title: '数据归集时间'
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
                 },
                 {
                     title: '操作',

mybusiness/src/main/resources/templates/system/sfz/sfz.html

@@ -136,6 +136,32 @@
                     }
                 },
                 {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
+                {
                     title: '操作',
                     align: 'center',
                     formatter: function (value, row, index) {

mybusiness/src/main/resources/templates/system/tjxx/tjxx.html

@@ -367,18 +367,19 @@
                             var month = time.getMonth() + 1;
                             var date = time.getDate();
                             var hours = time.getHours();
-                            if(hours == ''){
+                            if (hours == '') {
                                 hours = "00"
                             }
                             var minute = time.getMinutes();
-                            if(minute == ''){
+                            if (minute == '') {
                                 minute = "00"
                             }
                             var second = time.getSeconds();
-                            if(second == ''){
+                            if (second == '') {
                                 second = "00"
                             }
-                            return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
                         }
                     }
                 },

mybusiness/src/main/resources/templates/system/xx/xx.html

@@ -159,18 +159,19 @@
                             var month = time.getMonth() + 1;
                             var date = time.getDate();
                             var hours = time.getHours();
-                            if(hours == ''){
+                            if (hours == '') {
                                 hours = "00"
                             }
                             var minute = time.getMinutes();
-                            if(minute == ''){
+                            if (minute == '') {
                                 minute = "00"
                             }
                             var second = time.getSeconds();
-                            if(second == ''){
+                            if (second == '') {
                                 second = "00"
                             }
-                            return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
                         }
                     }
                 },
@@ -196,6 +197,7 @@
             return '男 ';
         }
     }
+
     function donkind(row) {
         if (row.status == 0) {
             return '全血 ';

mybusiness/src/main/resources/templates/system/yhjbxx/pzyhjbxx.html

@@ -1,112 +1,114 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('自来水人员基本信息列表')" />
+    <th:block th:include="include :: header('自来水人员基本信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <!--
-                            <li>
-                                <label>推送时间：</label>
-                                <input type="text" name="cdTime"/>
-                            </li>
-                            <li>
-                                <label>批次号：</label>
-                                <input type="text" name="cdBatch"/>
-                            </li>
-                            <li>
-                                <label>操作状态：</label>
-                                <input type="text" name="cdOperation"/>
-                            </li>
-                            <li>
-                                <label>数据来源：</label>
-                                <input type="text" name="cdSource"/>
-                            </li>
-                            <li>
-                                <label>用户编号：</label>
-                                <input type="text" name="yhbh"/>
-                            </li>
-                            -->
-                            <li>
-                                <label>用户名称：</label>
-                                <input type="text" name="yhmc"/>
-                            </li>
-                            <!--
-                            <li>
-                                <label>用户地址：</label>
-                                <input type="text" name="yhdz"/>
-                            </li>
-                            <li>
-                                <label>用水月份：</label>
-                                <input type="text" name="ysyf"/>
-                            </li>
-                            <li>
-                                <label>用水量：</label>
-                                <input type="text" name="ysl"/>
-                            </li>
-                            -->
-                            <li>
-                                <label>是否缴费：</label>
-                                <input type="text" name="sfjf"/>
-                            </li>
-                            <li>
-                                <label>缴费时间：</label>
-                                <input type="text" name="jfsj"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <!--
+                        <li>
+                            <label>推送时间：</label>
+                            <input type="text" name="cdTime"/>
+                        </li>
+                        <li>
+                            <label>批次号：</label>
+                            <input type="text" name="cdBatch"/>
+                        </li>
+                        <li>
+                            <label>操作状态：</label>
+                            <input type="text" name="cdOperation"/>
+                        </li>
+                        <li>
+                            <label>数据来源：</label>
+                            <input type="text" name="cdSource"/>
+                        </li>
+                        <li>
+                            <label>用户编号：</label>
+                            <input type="text" name="yhbh"/>
+                        </li>
+                        -->
+                        <li>
+                            <label>用户名称：</label>
+                            <input type="text" name="yhmc"/>
+                        </li>
+                        <!--
+                        <li>
+                            <label>用户地址：</label>
+                            <input type="text" name="yhdz"/>
+                        </li>
+                        <li>
+                            <label>用水月份：</label>
+                            <input type="text" name="ysyf"/>
+                        </li>
+                        <li>
+                            <label>用水量：</label>
+                            <input type="text" name="ysl"/>
+                        </li>
+                        -->
+                        <li>
+                            <label>是否缴费：</label>
+                            <input type="text" name="sfjf"/>
+                        </li>
+                        <li>
+                            <label>缴费时间：</label>
+                            <input type="text" name="jfsj"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!--
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:yhjbxx:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:yhjbxx:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:yhjbxx:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                -->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:yhjbxx:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:yhjbxx:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:yhjbxx:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:yhjbxx:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            -->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:yhjbxx:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:yhjbxx:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:yhjbxx:remove')}]];
-        var detailFlag = [[${@permission.hasPermi('system:yhjbxx:detail')}]];
-        var prefix = ctx + "system/yhjbxx";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:yhjbxx:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:yhjbxx:remove')}]];
+    var detailFlag = [[${@permission.hasPermi('system:yhjbxx:detail')}]];
+    var prefix = ctx + "system/yhjbxx";
 
-        $(function() {
-            var options = {
-                url: prefix + "/listpz",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                detailUrl: prefix + "/detail/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "用户基本信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/listpz",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            detailUrl: prefix + "/detail/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "用户基本信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '主键ID',
@@ -158,18 +160,44 @@
                     title: '缴费时间'
                 },
                 {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
+                {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a>');
                         // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

mybusiness/src/main/resources/templates/system/yhjbxx/yhjbxx.html

@@ -1,112 +1,114 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('自来水人员基本信息列表')" />
+    <th:block th:include="include :: header('自来水人员基本信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <!--
-                            <li>
-                                <label>推送时间：</label>
-                                <input type="text" name="cdTime"/>
-                            </li>
-                            <li>
-                                <label>批次号：</label>
-                                <input type="text" name="cdBatch"/>
-                            </li>
-                            <li>
-                                <label>操作状态：</label>
-                                <input type="text" name="cdOperation"/>
-                            </li>
-                            <li>
-                                <label>数据来源：</label>
-                                <input type="text" name="cdSource"/>
-                            </li>
-                            <li>
-                                <label>用户编号：</label>
-                                <input type="text" name="yhbh"/>
-                            </li>
-                            -->
-                            <li>
-                                <label>用户名称：</label>
-                                <input type="text" name="yhmc"/>
-                            </li>
-                            <!--
-                            <li>
-                                <label>用户地址：</label>
-                                <input type="text" name="yhdz"/>
-                            </li>
-                            <li>
-                                <label>用水月份：</label>
-                                <input type="text" name="ysyf"/>
-                            </li>
-                            <li>
-                                <label>用水量：</label>
-                                <input type="text" name="ysl"/>
-                            </li>
-                            <li>
-                                <label>是否缴费：</label>
-                                <input type="text" name="sfjf"/>
-                            </li>
-                            <li>
-                                <label>缴费时间：</label>
-                                <input type="text" name="jfsj"/>
-                            </li>
-                            -->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <!--
+                        <li>
+                            <label>推送时间：</label>
+                            <input type="text" name="cdTime"/>
+                        </li>
+                        <li>
+                            <label>批次号：</label>
+                            <input type="text" name="cdBatch"/>
+                        </li>
+                        <li>
+                            <label>操作状态：</label>
+                            <input type="text" name="cdOperation"/>
+                        </li>
+                        <li>
+                            <label>数据来源：</label>
+                            <input type="text" name="cdSource"/>
+                        </li>
+                        <li>
+                            <label>用户编号：</label>
+                            <input type="text" name="yhbh"/>
+                        </li>
+                        -->
+                        <li>
+                            <label>用户名称：</label>
+                            <input type="text" name="yhmc"/>
+                        </li>
+                        <!--
+                        <li>
+                            <label>用户地址：</label>
+                            <input type="text" name="yhdz"/>
+                        </li>
+                        <li>
+                            <label>用水月份：</label>
+                            <input type="text" name="ysyf"/>
+                        </li>
+                        <li>
+                            <label>用水量：</label>
+                            <input type="text" name="ysl"/>
+                        </li>
+                        <li>
+                            <label>是否缴费：</label>
+                            <input type="text" name="sfjf"/>
+                        </li>
+                        <li>
+                            <label>缴费时间：</label>
+                            <input type="text" name="jfsj"/>
+                        </li>
+                        -->
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!--
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:yhjbxx:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:yhjbxx:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:yhjbxx:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                -->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:yhjbxx:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--
+            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:yhjbxx:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:yhjbxx:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:yhjbxx:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+            -->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:yhjbxx:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:yhjbxx:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:yhjbxx:remove')}]];
-        var detailFlag = [[${@permission.hasPermi('system:yhjbxx:detail')}]];
-        var prefix = ctx + "system/yhjbxx";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:yhjbxx:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:yhjbxx:remove')}]];
+    var detailFlag = [[${@permission.hasPermi('system:yhjbxx:detail')}]];
+    var prefix = ctx + "system/yhjbxx";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                detailUrl: prefix + "/detail/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "用户基本信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            detailUrl: prefix + "/detail/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "用户基本信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '主键ID',
@@ -139,7 +141,29 @@
                 },
                 {
                     field: 'cdTime',
-                    title: '数据归集时间'
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
                 },
                 // {
                 //     field: 'ysyf',
@@ -160,16 +184,16 @@
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a>');
                         // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

mybusiness/src/main/resources/templates/system/ysljc/ysljc.html

@@ -1,59 +1,61 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('调度系统-用水量检测列表')" />
+    <th:block th:include="include :: header('调度系统-用水量检测列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>地区名称：</label>
-                                <input type="text" name="dnm"/>
-                            </li>
-                            <li>
-                                <label>站点名称：</label>
-                                <input type="text" name="snm"/>
-                            </li>
-                            <!--<li>-->
-                                <!--<label>传感器名称：</label>-->
-                                <!--<input type="text" name="name"/>-->
-                            <!--</li>-->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>地区名称：</label>
+                            <input type="text" name="dnm"/>
+                        </li>
+                        <li>
+                            <label>站点名称：</label>
+                            <input type="text" name="snm"/>
+                        </li>
+                        <!--<li>-->
+                        <!--<label>传感器名称：</label>-->
+                        <!--<input type="text" name="name"/>-->
+                        <!--</li>-->
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:ysljc:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:ysljc:remove')}]];
-        var prefix = ctx + "system/ysljc";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:ysljc:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:ysljc:remove')}]];
+    var prefix = ctx + "system/ysljc";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                detailUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "调度系统-用水量检测",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            detailUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "调度系统-用水量检测",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '传感器编号',
@@ -101,10 +103,32 @@
                     field: 'value',
                     title: '数值'
                 },
-                    {
-                        field: 'cdTime',
-                        title: '数据归集时间'
-                    },
+                {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
                 // {
                 //     field: 'ssid',
                 //     title: 'null',
@@ -113,16 +137,16 @@
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs  ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\''
                             + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

mybusiness/src/main/resources/templates/system/yslxx/yslxx.html

@@ -1,66 +1,63 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('用水量信息列表')" />
+    <th:block th:include="include :: header('用水量信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>用户编号：</label>
-                                <input type="text" name="yhbh"/>
-                            </li>
-                            <li>
-                                <label>用户名称：</label>
-                                <input type="text" name="yhmc"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>用户编号：</label>
+                            <input type="text" name="yhbh"/>
+                        </li>
+                        <li>
+                            <label>用户名称：</label>
+                            <input type="text" name="yhmc"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:yslxx:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:yslxx:remove')}]];
-        var prefix = ctx + "system/yslxx";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:yslxx:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:yslxx:remove')}]];
+    var prefix = ctx + "system/yslxx";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                detailUrl: prefix + "/edit/{id}",
-                modalName: "用水量信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            detailUrl: prefix + "/edit/{id}",
+            modalName: "用水量信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '主键ID',
                     visible: false
                 },
                 {
-                    field: 'cdTime',
-                    title: '推送时间',
-                    visible: false
-                },
-                {
                     field: 'cdBatch',
                     title: '批次号',
                     visible: false
@@ -96,18 +93,44 @@
                     title: '用水量'
                 },
                 {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
+                {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs  ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\''
                             + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

mybusiness/src/main/resources/templates/system/yyryxx/yyryxx.html

@@ -61,11 +61,6 @@
                     visible: false
                 },
                 {
-                    field: 'cdTime',
-                    title: '插入时间',
-                    visible: false
-                },
-                {
                     field: 'cdBatch',
                     title: '批次号',
                     visible: false
@@ -153,7 +148,7 @@
                     title: '预约时间'
                 },
                 {
-                    field: 'createTime',
+                    field: 'cdTime',
                     title: '数据归集时间',
                     formatter: function (value, row, index) {
                         if (value != null) {
@@ -162,18 +157,19 @@
                             var month = time.getMonth() + 1;
                             var date = time.getDate();
                             var hours = time.getHours();
-                            if(hours == ''){
+                            if (hours == '') {
                                 hours = "00"
                             }
                             var minute = time.getMinutes();
-                            if(minute == ''){
+                            if (minute == '') {
                                 minute = "00"
                             }
                             var second = time.getSeconds();
-                            if(second == ''){
+                            if (second == '') {
                                 second = "00"
                             }
-                            return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
                         }
                     }
                 },

mybusiness/src/main/resources/templates/system/zlskfrx/zlskfrx.html

@@ -1,55 +1,57 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('自来水客服热线列表')" />
+    <th:block th:include="include :: header('自来水客服热线列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>编号：</label>
-                                <input type="text" name="caseid"/>
-                            </li>
-                            <li>
-                                <label>来电号码：</label>
-                                <input type="text" name="incomingcall"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>编号：</label>
+                            <input type="text" name="caseid"/>
+                        </li>
+                        <li>
+                            <label>来电号码：</label>
+                            <input type="text" name="incomingcall"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:zlskfrx:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:zlskfrx:remove')}]];
-        var prefix = ctx + "system/zlskfrx";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:zlskfrx:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:zlskfrx:remove')}]];
+    var prefix = ctx + "system/zlskfrx";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                detailUrl: prefix + "/edit/{id}",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "自来水客服热线",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            detailUrl: prefix + "/edit/{id}",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "自来水客服热线",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '序号',
@@ -61,11 +63,6 @@
                     visible: false
                 },
                 {
-                    field: 'cdTime',
-                    title: '插入时间',
-                    visible: false
-                },
-                {
                     field: 'cdBatch',
                     title: '批次号',
                     visible: false
@@ -105,18 +102,44 @@
                     title: '创建时间'
                 },
                 {
+                    field: 'cdTime',
+                    title: '数据归集时间',
+                    formatter: function (value, row, index) {
+                        if (value != null) {
+                            var time = new Date(value);
+                            var year = time.getFullYear();
+                            var month = time.getMonth() + 1;
+                            var date = time.getDate();
+                            var hours = time.getHours();
+                            if (hours == '') {
+                                hours = "00"
+                            }
+                            var minute = time.getMinutes();
+                            if (minute == '') {
+                                minute = "00"
+                            }
+                            var second = time.getSeconds();
+                            if (second == '') {
+                                second = "00"
+                            }
+                            // return year + '-' + month + '-' + date + ' ' + hours + ":" + minute + ":" + second;
+                            return year + '-' + month + '-' + date;
+                        }
+                    }
+                },
+                {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs  ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\''
                             + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>