From 14530e2e9ec4168f88fb70bd071ef2fa19caebaf Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 12 Feb 2026 17:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=A1=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/pojo/entity/BasicClazz.java | 2 +- .../desk/basic/pojo/entity/BatConfig.java | 2 +- .../desk/basic/pojo/entity/CoatingThickness.java | 2 +- .../desk/basic/pojo/entity/Formula.java | 2 +- .../basic/pojo/entity/LocallyPlatedPart.java | 2 +- .../desk/basic/pojo/entity/MaterialQuota.java | 2 +- .../springblade/desk/basic/pojo/entity/Oem.java | 2 +- .../desk/basic/pojo/entity/PlanAssignSteer.java | 2 +- .../desk/basic/pojo/entity/Plating.java | 2 +- .../desk/basic/pojo/entity/PlatingSmall.java | 2 +- .../desk/basic/pojo/entity/ProcessAbility.java | 2 +- .../desk/basic/pojo/entity/ProdMark.java | 2 +- .../desk/basic/pojo/entity/RelTeamSetUser.java | 2 +- .../desk/basic/pojo/entity/Shifts.java | 2 +- .../desk/basic/pojo/entity/UserRight.java | 2 +- .../desk/basic/pojo/entity/WorkTank.java | 2 +- .../desk/basic/controller/TeamSetController.java | 4 ++-- .../src/main/resources/Excel/QA/班组.xls | Bin 0 -> 7680 bytes 18 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/班组.xls diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java index 3be73f2e..9c513d7e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java @@ -21,7 +21,7 @@ import java.io.Serial; * @since 2026-01-05 */ @Data -@TableName("BA_BASIC_CLAZZ") +@TableName("BS_BASIC_CLAZZ") @Schema(description = "BasicClazz Entity对象") @EqualsAndHashCode(callSuper = true) public class BasicClazz extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java index 3bbec3ae..ce474b24 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2025-12-22 */ @Data -@TableName("BA_BAT_CONFIG") +@TableName("BS_BAT_CONFIG") @Schema(description = "BatConfig Entity对象") @EqualsAndHashCode(callSuper = true) public class BatConfig extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java index 04ee8cf6..3c65478a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -20,7 +20,7 @@ import java.util.List; * @since 2026-01-05 */ @Data -@TableName("BA_COATING_THICKNESS") +@TableName("BS_COATING_THICKNESS") @Schema(description = "CoatingThickness Entity对象") @EqualsAndHashCode(callSuper = true) public class CoatingThickness extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java index cb1277d2..14e404a0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2025-12-16 */ @Data -@TableName("BA_FORMULA") +@TableName("BS_FORMULA") @Schema(description = "Formula Entity对象") @EqualsAndHashCode(callSuper = true) public class Formula extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java index 8b774f58..5e7592b4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2026-01-05 */ @Data -@TableName("BA_LOCALLY_PLATED_PART") +@TableName("BS_LOCALLY_PLATED_PART") @Schema(description = "LocallyPlatedPart Entity对象") @EqualsAndHashCode(callSuper = true) public class LocallyPlatedPart extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java index 884d1395..5b8fc32b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2026-01-05 */ @Data -@TableName("BA_MATERIAL_QUOTA") +@TableName("BS_MATERIAL_QUOTA") @Schema(description = "MaterialQuota Entity对象") @EqualsAndHashCode(callSuper = true) public class MaterialQuota extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 9e508584..78c524a8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -21,7 +21,7 @@ import java.util.List; * @since 2026-01-04 */ @Data -@TableName("BA_OEM") +@TableName("BS_OEM") @Schema(description = "Oem Entity对象") @EqualsAndHashCode(callSuper = true) public class Oem extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java index 4ce6d5d2..ed819a66 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java @@ -20,7 +20,7 @@ import java.time.LocalDateTime; * @since 2026-01-05 */ @Data -@TableName("BA_PLAN_ASSIGN_STEER") +@TableName("BS_PLAN_ASSIGN_STEER") @Schema(description = "PlanAssignSteer Entity对象") @EqualsAndHashCode(callSuper = true) public class PlanAssignSteer extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java index c272180e..cd707782 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; * @since 2026-01-05 */ @Data -@TableName("BA_PLATING") +@TableName("BS_PLATING") @Schema(description = "Plating Entity对象") @EqualsAndHashCode(callSuper = true) public class Plating extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java index d9085399..6997ca11 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; * @since 2026-01-05 */ @Data -@TableName("BA_PLATING_SMALL") +@TableName("BS_PLATING_SMALL") @Schema(description = "PlatingSmall Entity对象") @EqualsAndHashCode(callSuper = true) public class PlatingSmall extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java index d331e851..a4b11bee 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2025-12-22 */ @Data -@TableName("BA_PROCESS_ABILITY") +@TableName("BS_PROCESS_ABILITY") @Schema(description = "ProcessAbility Entity对象") @EqualsAndHashCode(callSuper = true) public class ProcessAbility extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java index f0153ada..7cfa26d1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2025-12-22 */ @Data -@TableName("BA_PROD_MARK") +@TableName("BS_PROD_MARK") @Schema(description = "ProdMark Entity对象") @EqualsAndHashCode(callSuper = true) public class ProdMark extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java index 676e5701..b87087db 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; * @since 2026-01-13 */ @Data -@TableName("BA_REL_TEAM_SET_USER") +@TableName("BS_REL_TEAM_SET_USER") @Schema(description = "RelTeamSetUser Entity对象") @EqualsAndHashCode(callSuper = true) public class RelTeamSetUser extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java index 8f9e00bb..01772c57 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2026-01-05 */ @Data -@TableName("BA_SHIFTS") +@TableName("BS_SHIFTS") @Schema(description = "Shifts Entity对象") @EqualsAndHashCode(callSuper = true) public class Shifts extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/UserRight.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/UserRight.java index ce323d23..0384c53b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/UserRight.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/UserRight.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; * @since 2026-01-26 */ @Data -@TableName("BA_USER_RIGHT") +@TableName("BS_USER_RIGHT") @Schema(description = "UserRight Entity对象") @EqualsAndHashCode(callSuper = true) public class UserRight extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java index 2e279f17..2569428b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java @@ -21,7 +21,7 @@ import java.io.Serial; * @since 2025-12-16 */ @Data -@TableName("BA_WORK_TANK") +@TableName("BS_WORK_TANK") @Schema(description = "WorkTank Entity对象") @EqualsAndHashCode(callSuper = true) public class WorkTank extends BaseEntity { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index 7a08ed42..066aa2ac 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -459,8 +459,8 @@ public class TeamSetController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); + "Excel/QA/班组.xls", + "导入模版-班组.xls"); } /** diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/班组.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/班组.xls new file mode 100644 index 0000000000000000000000000000000000000000..dedb00aa24434a579d93dcf91741fd0122a1600e GIT binary patch literal 7680 zcmeI0eQecN8ONXB?Y-^2aG`~kj)ALp-59imt}RqvI%q*UnZuUQx^_~>%32&@z*5nS zsBnFmA&w<88`)Tv=n`WjCWtZF5}ZkinE1yQjYy1Ue{?3x_(NjV=|nfKpYJ*M*WPyb zmZHpL4d>qPdCv3v&Np>B0Te+9@pnb^p+Ai0Qy}8+^m7Z^r zAk;59twLmq%=J0jt(%@dM$b1}KXLzbE6C=nK)=>N^=Z2L*OE7)LWG!g*%xddzkWCN z_h5zHZcHROXnRQS_gVAC%d-8~+?}re4dflp>KBp4)c&i@f2|W*12lA{fGxo0f%!n@ ztN;r@CAbMJ1UG|4U@`azxCK;!kAf7q6;y-U!0liOxC1N&%RmjN1$AIKSOMz6ouC0U zf+nyMtOCv8V_-E{1GHAHgSLRX!1}DL71{`_Zvu+;`}#RK+5kous*CfA1kAcB7R z>iVGA0%S#alw{0%;&K=N$mM#)#p|6n;)|czyhQfb38gpE=JGx1;%XPqB@XOmSLP2+ z(un_#l0S3gDfC&%HvJr5jrsaDxw`lFE?Y;)kXYK259RBI00a%yXI@<()O znjmj-@|Sgxnjl|k&&L-6$$gLqDk$qQPG|Q! z)6v_V;NFk;*1e%n=|m=G!JC7{+c)g{$Kcz?DY$t1zaBW#5$5p)qs+_BMI9?Te!i0# z{-rNJ(bJ+;tl{W0-8+&QHid@2^>%e8Gb>5G_2~J-$;>KJm+o8FmCQ7gs=U9mtHgqK zHmbE_VCNURp9AqehBw27bhcgOhN{8Q<)y3@&PoxIM)UvrYQyAu04m&jdgP4HE|oQ;M@->VU*?Z0+{vu%Jxj@?s`8*eaQ@x%mg45;0b5S^rtLI{HdXVs3F`V4ob0u)JKg-48 zG<)<-no8Znh35h|dCAXonnJU#E~Blvanue+R4$(V_B&F4B3FeSwhfW__L9_E8yHZ6 za0@w$R6w&%zj*wFI+fTJudrP?^H`3t5fpaQu_cIH-c4tQi-s=by5%A_lrGgqJYguE zlwtJY#!&iMAI|mX!cG_YKH&H`QB5f_fTgDSZW~N52GGK3@k~!7c(BNrzguL{W*B z_9Rq2SqN4CZ-?rgrva+7!(C9l`D}q|+1v)zs?`hC+s}hgwdp9-wFBkiqbSik4`LT4 zr`5J@UbyDV%qTdt7(G!BsquU&YdesS5;&tkvjmrrd*7MmpN zqca+JjVHv80z&#JBDLc=pt`;XWCPh)wv>%Ee&>MR;9dpl%Wnb0ZzDjqmd$1BQ6O9E zpzXXCWwLFISFZ!~PH&KU-Z^-U?~!Y0o!%Y8K$TYw?c^9$XRlKTb&Fo7DzB-U53~Mw z*7wSw*D`lQ^G%*VA)h;!L)q1+{81sK&ybccD=Y)j*(ZkiF+imDJ_00HT5Ha|_-`k3 zcL=W@z^fm^qc=hKkaK`L)F59J^7U17u!&noGw}*ukL$U*=)Itx*X2eoAbPi-Y2iPs CY*T#z literal 0 HcmV?d00001