From 68bb6e383fdb33218f7ac6c37499f8112c1ea9f5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期三, 31 十二月 2025 15:48:52 +0800
Subject: [PATCH] 调整工单页面提交
---
fzzy-igdss-core/src/main/java/com/fzzy/work/domain/WorkOrder.java | 29 ++++----------
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml | 1
fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg | 0
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 12 +++++-
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java | 8 +++
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 1
fzzy-igdss-web/src/main/resources/application-dev.yml | 15 ++++++-
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java | 6 ++
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderConf.view.xml | 38 +++++++++---------
9 files changed, 65 insertions(+), 45 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
index 6c6dca2..1466ba1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
+++ b/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;
+
+
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
index 6352058..486c811 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
+++ b/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;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index a25b518..1174e36 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/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);
+ }
+ }
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/domain/WorkOrder.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/domain/WorkOrder.java
index 4d1c5ac..da6cc2e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/domain/WorkOrder.java
+++ b/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;
+
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
index ae66b78..8aae88e 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
+++ b/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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index 0e848f0..863267b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderConf.view.xml
index 6bda731..dae8778 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderConf.view.xml
+++ b/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>
diff --git a/fzzy-igdss-web/src/main/resources/application-dev.yml b/fzzy-igdss-web/src/main/resources/application-dev.yml
index 6325150..73a03a8 100644
--- a/fzzy-igdss-web/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg b/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
index b642daf..cbff6a1 100644
--- a/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
+++ b/fzzy-igdss-web/src/main/resources/static/img/img-fail.jpg
Binary files differ
--
Gitblit v1.9.3