From eeb1f08ecdcb5d627d458b92e32daf1947059b25 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 20 Sep 2023 11:02:00 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/generator/GenTableMapper.xml  |  1 +
 .../src/main/resources/vm/java/controller.java.vm  | 11 ++++++-----
 .../src/main/resources/vm/java/domain.java.vm      | 14 +++++++-------
 .../resources/mapper/quartz/SysJobLogMapper.xml    |  2 +-
 .../resources/mapper/system/SysDictTypeMapper.xml  |  1 +
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/aucma-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/aucma-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 982c6cf..9395e00 100644
--- a/aucma-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/aucma-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -73,6 +73,7 @@
 				AND to_char(create_time, 'yyyy-mm-dd') &lt;= #{params.endTime}
 			</if>
 		</where>
+		order by create_time desc
 	</select>
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
diff --git a/aucma-generator/src/main/resources/vm/java/controller.java.vm b/aucma-generator/src/main/resources/vm/java/controller.java.vm
index feb94f8..7058591 100644
--- a/aucma-generator/src/main/resources/vm/java/controller.java.vm
+++ b/aucma-generator/src/main/resources/vm/java/controller.java.vm
@@ -3,6 +3,7 @@ package ${packageName}.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.aucma.common.utils.DateUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,11 +38,11 @@ public class ${ClassName}Controller extends BaseController {
     @Autowired
     private I${ClassName}Service ${className}Service;
 
-/**
- * 查询${functionName}列表
- */
-@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')" )
-@GetMapping("/list" )
+    /**
+     * 查询${functionName}列表
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')" )
+    @GetMapping("/list" )
     #if($table.crud || $table.sub)
     public TableDataInfo list(${ClassName} ${className}) {
         startPage();
diff --git a/aucma-generator/src/main/resources/vm/java/domain.java.vm b/aucma-generator/src/main/resources/vm/java/domain.java.vm
index 5d1dbd0..21733e7 100644
--- a/aucma-generator/src/main/resources/vm/java/domain.java.vm
+++ b/aucma-generator/src/main/resources/vm/java/domain.java.vm
@@ -38,12 +38,12 @@ private static final long serialVersionUID=1L;
                 #set($comment=$column.columnComment)
             #end
             #if($parentheseIndex != -1)
-            @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()" )
+            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
             #elseif($column.javaType == 'Date')
-            @JsonFormat(pattern = "yyyy-MM-dd" )
-            @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd" )
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
             #else
-            @Excel(name = "${comment}" )
+            @Excel(name = "${comment}")
             #end
         #end
     private $column.javaType $column.javaField;
@@ -51,7 +51,7 @@ private static final long serialVersionUID=1L;
     #end
 #end
 #if($table.sub)
-/** $table.subTable.functionName信息 */
+    /** $table.subTable.functionName信息 */
 private List<${subClassName}> ${subclassName}List;
 
 #end
@@ -95,10 +95,10 @@ public String toString(){
         #else
             #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
         #end
-            .append("${column.javaField}" ,get${AttrName}())
+            .append("${column.javaField}",get${AttrName}())
     #end
     #if($table.sub)
-            .append("${subclassName}List" ,get${subClassName}List())
+            .append("${subclassName}List",get${subClassName}List())
     #end
         .toString();
         }
diff --git a/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index fcf9d8c..c33fc66 100644
--- a/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aucma.quartz.mapper.SysJobMapper">
+<mapper namespace="com.aucma.quartz.mapper.SysJobLogMapper">
 
 	<resultMap type="SysJobLog" id="SysJobLogResult">
 		<id     property="jobLogId"       column="job_log_id"      />
diff --git a/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 2c29494..a637f3d 100644
--- a/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -39,6 +39,7 @@
 				AND to_char(create_time, 'yyyy-mm-dd') &lt;= #{params.endTime}
 			</if>
 		</where>
+		order by dict_id
 	</select>
 
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">