change - 代码生成

aucma-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -73,6 +73,7 @@
 				AND to_char(create_time, 'yyyy-mm-dd') <= #{params.endTime}
 			</if>
 		</where>
+		order by create_time desc
 	</select>
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">

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();

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();
         }

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"      />

aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -39,6 +39,7 @@
 				AND to_char(create_time, 'yyyy-mm-dd') <= #{params.endTime}
 			</if>
 		</where>
+		order by dict_id
 	</select>
 
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">