fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
@@ -89,7 +89,7 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Column(name = "audit_date", columnDefinition = "datetime COMMENT '审批时间'") @TableField("audit_date") private String auditDate; private Date auditDate; @Column(name = "complete_status", columnDefinition = "varchar(20) COMMENT '完成状态(NONE=未完成，COMPLETE=已完成)'") @TableField("complete_status") @@ -100,8 +100,14 @@ @TableField("complete_time") private Date completeTime; @Column(name = "bank_id", columnDefinition = "varchar(40) COMMENT '监管银行'") @TableField("bank_id") private String bankId; @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '备注说明'") @TableField("remark") private String remark; } fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
@@ -89,7 +89,7 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Column(name = "audit_date", columnDefinition = "datetime COMMENT '审批时间'") @TableField("audit_date") private String auditDate; private Date auditDate; @Column(name = "complete_status", columnDefinition = "varchar(20) COMMENT '完成状态(NONE=未完成，COMPLETE=已完成)'") @TableField("complete_status") @@ -100,6 +100,10 @@ @TableField("complete_time") private Date completeTime; @Column(name = "bank_id", columnDefinition = "varchar(40) COMMENT '监管银行'") @TableField("bank_id") private String bankId; @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '备注说明'") @TableField("remark") private String remark; fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -69,8 +69,8 @@ } } if (null == prefix) return String.format("%s%04d", currentTimestamp, seq); return prefix + "_" + String.format("%s%04d", currentTimestamp, seq); if (null == prefix) return String.format("%s%02d", currentTimestamp, seq); return prefix + "_" + String.format("%s%02d", currentTimestamp, seq); } @@ -178,4 +178,12 @@ public static String getTimeId(int start, int end) { return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextInt(start, end); } public static void main(String[] args) { for (int i = 0; i < 10; i++){ String id = generateId(); System.out.println(id); } } } fzzy-igdss-core/src/main/java/com/fzzy/work/domain/WorkOrder.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fzzy.igds.domain.BizBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,7 +23,7 @@ @Table(name = "work_order") @TableName("work_order") @EqualsAndHashCode(callSuper = false) public class WorkOrder implements Serializable { public class WorkOrder extends BizBaseEntity implements Serializable { /** * */ @@ -65,17 +66,9 @@ @TableField("recive_time") private Date receiveTime; @Column(name = "create_time") @TableField("create_time") private Date createTime; @Column(name = "create_user_id", columnDefinition = "varchar(30) COMMENT '创建人'") @TableField("create_user_id") private String createUserId; @Column(name = "create_user_name", columnDefinition = "varchar(30) COMMENT '创建人'") @TableField("create_user_name") private String createUserName; @Column(name = "create_by_id", columnDefinition = "varchar(30) COMMENT '创建人'") @TableField("create_by_id") private String createById; @Column(name = "business_id", columnDefinition = "varchar(40) COMMENT '业务关联主键'") @TableField("business_id") @@ -85,16 +78,12 @@ @TableField("business_url") private String businessUrl; /* @Column(name = "remark", columnDefinition = "varchar(200) COMMENT '备注说明'") @TableField("remark") private String remark;*/ @Column(name = "company_id", columnDefinition = "varchar(10) COMMENT '所属组织'") @TableField("company_id") private String companyId; @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '所属库区'") @TableField("dept_id") private String deptId; @Column(name = "bank_id", columnDefinition = "varchar(40) COMMENT '监管银行'") @TableField("bank_id") private String bankId; } fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
@@ -308,6 +308,7 @@ <Property name="width">120</Property> <Property name="iconClass">fa fa-print</Property> </ToolBarButton> <Fill/> </ToolBar> <DataGrid id="dataGridMain" layoutConstraint="padding:8"> <ClientEvent name="onDataRowClick">self.set("selection",arg.data);</ClientEvent> fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -326,6 +326,7 @@ <Property name="width">120</Property> <Property name="iconClass">fa fa-print</Property> </ToolBarButton> <Fill/> </ToolBar> <DataGrid id="dataGridMain" layoutConstraint="padding:8"> <ClientEvent name="onDataRowDoubleClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent> fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderConf.view.xml
@@ -6,15 +6,15 @@ <DataType name="dtWorkConf"> <Property name="creationType">com.fzzy.work.domain.WorkOrderConf</Property> <PropertyDef name="id"> <Property/> <Property></Property> </PropertyDef> <PropertyDef name="deptId"> <Property/> <Property></Property> <Property name="label">所属库区</Property> <Property name="required">true</Property> </PropertyDef> <PropertyDef name="bizType"> <Property/> <Property></Property> <Property name="label">业务类型</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("workOrderPR#triggerType").getResult()}</Property> @@ -24,7 +24,7 @@ <Property name="required">true</Property> </PropertyDef> <PropertyDef name="valTag"> <Property/> <Property></Property> <Property name="label">启用流程</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerYN").getResult()}</Property> @@ -34,38 +34,38 @@ <Property name="required">true</Property> </PropertyDef> <PropertyDef name="nodeName1"> <Property/> <Property></Property> <Property name="label">节点名称</Property> </PropertyDef> <PropertyDef name="nodeVal1"> <Property/> <Property></Property> <Property name="label">是否有效</Property> </PropertyDef> <PropertyDef name="nodeName2"> <Property/> <Property></Property> <Property name="label">节点名称</Property> </PropertyDef> <PropertyDef name="nodeVal2"> <Property/> <Property></Property> <Property name="label">是否有效</Property> </PropertyDef> <PropertyDef name="nodeName3"> <Property/> <Property></Property> <Property name="label">节点名称</Property> </PropertyDef> <PropertyDef name="nodeVal3"> <Property/> <Property></Property> <Property name="label">是否有效</Property> </PropertyDef> <PropertyDef name="remark"> <Property/> <Property></Property> <Property name="label">备注信息</Property> </PropertyDef> <PropertyDef name="companyId"> <Property/> <Property></Property> </PropertyDef> <PropertyDef name="createBy"> <Property/> <Property></Property> <Property name="label">创建人</Property> </PropertyDef> <PropertyDef name="createTime"> @@ -73,7 +73,7 @@ <Property name="label">创建时间</Property> </PropertyDef> <PropertyDef name="updateBy"> <Property/> <Property></Property> <Property name="label">修改人</Property> </PropertyDef> <PropertyDef name="updateTime"> @@ -156,17 +156,17 @@ <Property name="iconClass">fa fa-pencil-square-o</Property> </ToolBarButton> <ToolBarButton> <ClientEvent name="onClick">var data = view.get("#dsMian.data:#"); <ClientEvent name="onClick">var data = view.get("#dsMain.data:#"); if (!data) { $alert("请选择数据"); return; } view.get("#ajaxDelData").set("parameter", data).execute(function(result){ if("200"!=result.respCode){ $alert("异常信息："+result.respMsg); if("200"!=result.code){ $alert("异常信息："+result.message); }else{ $notify("执行成功"); query(); data.remove(); } });</ClientEvent> <Property name="caption">删除</Property> @@ -273,7 +273,7 @@ </UpdateAction> <AjaxAction id="ajaxDelData"> <Property name="confirmMessage">确定要删除数据么？</Property> <Property name="service">workOrderPR#delConf</Property> <Property name="service">workOrderPR#deleteConf</Property> </AjaxAction> </View> </ViewConfig> fzzy-igdss-web/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@ # 开发环境配置 server: port: 9002 port: 18081 servlet: context-path: encoding: @@ -69,7 +69,18 @@ config: multi-statement-allow: true # Redis相关配置 redis: database: 0 host: 127.0.0.1 port: 6379 password: timeout: 1000 pool: max-active: 200 max-wait: -1 max-idle: 10 min-idle: 0 #JPA配置 jpa: fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
