Bladeren bron

修改日期

DESKTOP-USV654P\pc 2 jaren geleden
bovenliggende
commit
a5e8496d93

+ 2 - 1
src/main/java/com/xjrsoft/module/material/vo/MaterialTaskVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -45,7 +46,7 @@ public class MaterialTaskVo {
     */
     @ApiModelProperty("要求完成日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteTime;
+    private LocalDate requiredCompleteTime;
     /**
     * 要求
     */

+ 14 - 0
src/main/resources/sqlScript/init_sql.sql

@@ -1064,4 +1064,18 @@ create table file_receive
     primary key (`id`)
 ) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment '文件接收管理';
 
+-- ----------------------------
+-- APP 流程单独配置
+-- ----------------------------
+drop table if exists base_mobile_workflow_config;
+create table base_mobile_workflow_config
+(
+    id bigint not null comment '主键编号',
+    `name` varchar(100) NULL DEFAULT NULL COMMENT '名称',
+    `code` varchar(20) NULL DEFAULT NULL COMMENT '编号 统一标识,手机端根据标识查询',
+    `workflow_id`  bigint NULL DEFAULT NULL COMMENT '流程ID',
+    `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+    primary key (`id`)
+) engine=innodb default charset=utf8mb4 COLLATE = utf8mb4_0900_ai_ci comment 'APP 流程单独配置';
+
 SET FOREIGN_KEY_CHECKS = 1;

+ 28 - 0
src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -321,6 +321,34 @@ public class FreeMarkerGeneratorTest {
         params.setDs(ds);
 
 
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
+
+
+    @Test
+    public void gcMobileWorkflowConfig() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("base_mobile_workflow_config");
+        mainTable.setIsMain(true);
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("fanxp");
+        params.setPackageName("system");
+        params.setTableConfigs(tableConfigs);
+        params.setPage(false);
+        params.setImport(false);
+        params.setExport(false);
+        params.setOutMainDir(false);
+        params.setDs(ds);
+
+
         IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
 
         apiGeneratorService.generateCodes(params);