From 0a8f152f9f4f785af5e7c303691258245de01413 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 八月 2023 16:38:08 +0800
Subject: [PATCH] 数据库新增字段
---
server/src/main/java/doumeemes/dao/business/model/WorkPlans.java | 3 +
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java | 16 ++++++++
server/src/main/java/doumeemes/dao/business/model/Workorder.java | 25 ++++++++++++
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 6 ++-
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java | 5 ++
server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java | 8 +++
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 16 +++++++-
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 4 ++
server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java | 25 ++++++++++++
9 files changed, 102 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
index 7fec7be..967344f 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
@@ -70,6 +70,9 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ @Excel(name="閿�鍞崟鍙�",orderNum ="9")
+ private String salesorder;
@ApiModelProperty(value = "浜у搧鍚嶇О" )
@TableField(exist = false)
@Excel(name="浜у搧鍚嶇О",orderNum ="2")
diff --git a/server/src/main/java/doumeemes/dao/business/model/Workorder.java b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
index 238a80a..be3da0c 100644
--- a/server/src/main/java/doumeemes/dao/business/model/Workorder.java
+++ b/server/src/main/java/doumeemes/dao/business/model/Workorder.java
@@ -224,4 +224,29 @@
@ApiModelProperty(value = "宸ュ崟璁惧浜哄憳闆嗗悎" )
@TableField(exist = false)
private List<WorkorderUser> workorderUserList;
+
+
+ @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
+ @ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
+ private Integer duration;
+
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)", example = "1")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝垎)")
+ private Integer salary;
+
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
+ @ExcelColumn(name="鏍囧噯鏁伴噺")
+ private Integer salaryNum;
+
+ @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
+ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
+ private String salaryTimes;
+
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ private Integer salaryUnqualified;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ private Integer salaryType;
}
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index 57e4141..3a81b32 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -72,10 +72,12 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
@ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
- @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 3,width =15)
+ @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 17,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
-
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ @Excel(name="閿�鍞崟鍙�",index = 16,width =15)
+ private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java
index feaca2c..bc14ec2 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkPlansExtDTO.java
@@ -64,7 +64,10 @@
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
private Integer num;
-
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ private Date startDate;
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ private String salesorder;
@ApiModelProperty(value = "鎵规鍙�")
private String batch;
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
index fbd6dbc..686a2e3 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderRecordExtDTO.java
@@ -641,5 +641,21 @@
@ApiModelProperty(value = "鏁版嵁鏉冮檺閮ㄩ棬缂栫爜闆嗗悎" ,hidden = true)
private List<Integer> departIds;
+ @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
+ private Integer duration;
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)", example = "1")
+ private Integer salary;
+
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
+ private Integer salaryNum;
+
+ @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
+ private String salaryTimes;
+
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
+ private Integer salaryUnqualified;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ private Integer salaryType;
}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
index 8fdb2d2..b826172 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkPlansExtListVO.java
@@ -69,7 +69,13 @@
@ExcelColumn(name="璁″垝鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
-
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 17,width =15)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ @Excel(name="閿�鍞崟鍙�",index = 16,width =15)
+ private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
@ExcelColumn(name="鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級")
private Integer materialId;
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
index f00e81a..8036ce9 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExtListVO.java
@@ -225,4 +225,29 @@
@ApiModelProperty(value = "瀛楀吀琛ㄥ搴攍ables")
private String smodelLabel;
+
+ @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�", example = "1")
+ @ExcelColumn(name="鎶ュ伐鏃堕暱锛堢锛�")
+ private Integer duration;
+
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)", example = "1")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝垎)")
+ private Integer salary;
+
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
+ @ExcelColumn(name="鏍囧噯鏁伴噺")
+ private Integer salaryNum;
+
+ @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
+ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
+ private String salaryTimes;
+
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ private Integer salaryUnqualified;
+
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ private Integer salaryType;
+
}
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 7200c4b..9ebd258 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -35,6 +35,7 @@
`workPlans`.`IMPORT_ID`,
`workPlans`.`PAUSED`,
`workPlans`.`USER_ID`,
+ `workPlans`.`SALESORDER`,
`workPlans`.`PUBLISH_DATE`
FROM `work_plans` `workPlans`
<where>
@@ -107,6 +108,9 @@
<if test="publishDate != null">
AND `workPlans`.`PUBLISH_DATE` = #{publishDate}
</if>
+ <if test="salesorder != null">
+ AND `workPlans`.`SALESORDER` = #{salesorder}
+ </if>
</where>
</select>
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 346e661..1d8fd97 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -1424,7 +1424,13 @@
MATERIAL_DONETYPE,
MATERIAL_PROCEDURE_ID,
RELOBJ_ID,
- RELOBJ_TYPE
+ RELOBJ_TYPE,
+ `DURATION`,
+ `SALARY`,
+ `SALARY_NUM`,
+ `SALARY_TIMES`,
+ `SALARY_UNQUALIFIED`,
+ `SALARY_TYPE`
)
values <foreach collection="list" separator="," item="item">
(
@@ -1462,7 +1468,13 @@
#{item.materialDonetype},
#{item.materialProcedureId},
#{item.relobjId},
- #{item.relobjType}
+ #{item.relobjType},
+ #{item.duration},
+ #{item.salary},
+ #{item.salaryNum},
+ #{item.salaryTimes},
+ #{item.salaryUnqualified},
+ #{item.salaryType}
)
</foreach>
</insert>
--
Gitblit v1.9.3