From 5f5f07db32be63e6112ddff7722c1ada10472da5 Mon Sep 17 00:00:00 2001 From: Mr.Shi <1878285526@qq.com> Date: 星期一, 14 八月 2023 18:43:41 +0800 Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes --- server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java index 7b1be66..8844310 100644 --- a/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java +++ b/server/src/main/java/doumeemes/dao/business/model/WorkorderRecord.java @@ -129,11 +129,11 @@ @ApiModelProperty(value = "妫�楠屽悎鏍兼暟閲�", example = "1") @ExcelColumn(name="妫�楠屽悎鏍兼暟閲�") - private Integer qualifiedNum; + private BigDecimal qualifiedNum; @ApiModelProperty(value = "妫�楠屼笉鍚堟牸鏁伴噺", example = "1") @ExcelColumn(name="妫�楠屼笉鍚堟牸鏁伴噺") - private Integer unqualifiedNum; + private BigDecimal unqualifiedNum; @ApiModelProperty(value = "妫�楠屾棩鏈�") @ExcelColumn(name="妫�楠屾棩鏈�") @@ -151,22 +151,36 @@ @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜闆嗗悎锛圼1],[2],...褰㈠紡瀛樺偍锛屼紭鍖栨煡璇�)" ) @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜闆嗗悎锛圼1],[2],...褰㈠紡瀛樺偍锛屼紭鍖栨煡璇�)") private String proUserids; - @ApiModelProperty(value = "宸ュ崟鐘舵��" ) @TableField(exist = false) private Integer workorderStatus; - - @ApiModelProperty(value = "鐗╂枡璐ㄩ噺灞炴��0鍚堟牸 1涓嶈壇 2鎶ュ簾锛堝彧鏈塼ype=1鎵嶆湁鍊硷級" ) private Integer materialDonetype; @ApiModelProperty(value = "鐗╂枡宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級" ) private Integer materialProcedureId; - @ApiModelProperty(value = "鍏宠仈绁ㄦ嵁缂栫爜锛堟姇鏂欐椂锛�" ) private Integer relobjId; @ApiModelProperty(value = "鍏宠仈绁ㄦ嵁绫诲瀷 0宸ュ崟 1绡瓙鏇存崲鍗曡褰�" ) private Integer relobjType; - //MATERIAL_DONETYPE,MATERIAL_PROCEDURE_ID,RELOBJ_ID銆丷ELOBJ_TYPE + @ApiModelProperty(value = "鎶ュ伐鏃堕暱锛堢锛�" ) + private Integer duration; + @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝垎)" ) + private BigDecimal salaryPrice; + + @ApiModelProperty(value = "鏍囧噯鏁伴噺" ) + private BigDecimal salaryNum; + + @ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�" ) + private Integer salaryTimes; + + @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�" ) + private Integer salaryUnqualified; + + @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂" ) + private Integer salaryType; + + @ApiModelProperty(value = "宸ヨ祫缁撴灉锛堝垎锛�" ) + private BigDecimal salary; } -- Gitblit v1.9.3