调整日期字段为string

src/main/java/com/xjrsoft/module/student/dto/BaseStudentPunishmentInfoPageDto.java

@@ -6,13 +6,7 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 
@@ -68,34 +62,40 @@ public class BaseStudentPunishmentInfoPageDto extends PageInput {
      */
     @ApiModelProperty("专业")
     private Long marjorSetId;
-
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("处分开始日期-开始")
-    private LocalDate startTimeStart;
+    private String startTimeStart;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("处分开始日期-结束")
-    private LocalDate startTimeEnd;
+    private String startTimeEnd;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("处分结束日期-开始")
-    private LocalDate endTimeStart;
+    private String endTimeStart;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("处分结束日期-结束")
-    private LocalDate endTimeEnd;
+    private String endTimeEnd;
 
     @ApiModelProperty("调整类型")
     private Integer adjustType;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("升级/降级日期-开始")
-    private LocalDate adjustDateStart;
+    private String adjustDateStart;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("升级/降级日期-结束")
-    private LocalDate adjustDateEnd;
-
+    private String adjustDateEnd;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("操作时间-开始")
-    private LocalDate modifyDateStart;
+    private String modifyDateStart;
 
+    @ContentStyle(dataFormat = 49)
     @ApiModelProperty("操作时间-结束")
-    private LocalDate modifyDateEnd;
+    private String modifyDateEnd;
 
     @ApiModelProperty("操作时间-结束")
     private Long classId;

src/main/java/com/xjrsoft/module/student/vo/BaseStudentPunishmentInfoPageVo.java

@@ -38,7 +38,7 @@ public class BaseStudentPunishmentInfoPageVo {
     * 修改时间
     */
     @ApiModelProperty("修改时间")
-    private Date modifyDate;
+    private String modifyDate;
     /**
     * 删除标记
     */
@@ -63,12 +63,12 @@ public class BaseStudentPunishmentInfoPageVo {
     * 处分开始日期
     */
     @ApiModelProperty("处分开始日期")
-    private Date startTime;
+    private String startTime;
     /**
     * 处分结束日期
     */
     @ApiModelProperty("处分结束日期")
-    private Date endTime;
+    private String endTime;
     /**
     * 是否公示(1:是 0:否)
     */

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -616,6 +616,44 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+    /**
+     * 学生考核项目
+     */
+    @Test
+    public void gcBaseStudentPunishmentInfo() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_student_punishment_info");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_punishment_student_relation");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("punishment_info_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("student");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
         apiGeneratorService.generateCodes(params);