From a90836ffe0b46f2141b8ae65d327f66e9ff6e5fa Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Mon, 22 Dec 2025 16:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E5=A1=AB=E5=86=99=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E6=A0=87=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/BusinessDatabase.java | 2 +- .../BenchmarkingReportController.java | 8 ++++++- .../ResponsiblePersonController.java | 23 +++++++++++++++---- .../controller/form/FilledPersonForm.java | 19 +++++++++++++++ .../form/ResponsiblePersonForm.java | 2 +- .../form/UpdateFilledPersonForm.java | 21 +++++++++++++++++ .../pojo/BenchmarkingReport.java | 3 --- .../pojo/ResponsiblePerson.java | 1 + .../service/ResponsiblePersonService.java | 8 +++---- .../impl/ResponsiblePersonServiceImpl.java | 20 ++++++++++++---- src/main/resources/sql.sql | 1 + 11 files changed, 88 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/xdap/self_development/controller/form/FilledPersonForm.java create mode 100644 src/main/java/com/xdap/self_development/controller/form/UpdateFilledPersonForm.java diff --git a/src/main/java/com/xdap/self_development/config/BusinessDatabase.java b/src/main/java/com/xdap/self_development/config/BusinessDatabase.java index b1693f8..2d2bc16 100644 --- a/src/main/java/com/xdap/self_development/config/BusinessDatabase.java +++ b/src/main/java/com/xdap/self_development/config/BusinessDatabase.java @@ -24,6 +24,6 @@ public class BusinessDatabase { @Bean public MpaasQuery getTCDatabase() { - return queryFactory.buildFromDatasource("yc_lrs_test_relsult"); + return queryFactory.buildFromDatasource(DatasourceConstant.XDAP_MYSQL_PREFIX + tenantId); } } diff --git a/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java b/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java index 9bfb8fd..53940d6 100644 --- a/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java +++ b/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java @@ -51,8 +51,14 @@ public class BenchmarkingReportController { // 发起审批 @PostMapping("/startReportApproval") public Response startReportApproval( - @Valid @RequestBody ApprovalPersonForm form + @Valid @RequestBody ApprovalPersonForm form, + BindingResult bindingResult ) { + if (bindingResult.hasErrors()) { + bindingResult.getFieldErrors().forEach(error -> { + throw new CommonException(error.getDefaultMessage()); + }); + } benchmarkingReportService.startReportApproval(form); return Response.ok().setMessage("保存成功"); } diff --git a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java index f198d08..beb0ba0 100644 --- a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java +++ b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java @@ -5,10 +5,7 @@ import com.definesys.mpaas.query.db.PageQueryResult; import com.xdap.api.moudle.department.pojo.entity.XdapDepartments; import com.xdap.api.moudle.user.pojo.XdapUsers; import com.xdap.runtime.service.RuntimeDatasourceService; -import com.xdap.self_development.controller.form.DepartmentUserForm; -import com.xdap.self_development.controller.form.DeptResponsiblePageForm; -import com.xdap.self_development.controller.form.ResponsiblePersonForm; -import com.xdap.self_development.controller.form.UpdateResponsiblePersonForm; +import com.xdap.self_development.controller.form.*; import com.xdap.self_development.exception.CommonException; import com.xdap.self_development.pojo.ResponsiblePerson; import com.xdap.self_development.pojo.view.DepartmentUserView; @@ -134,7 +131,7 @@ public class ResponsiblePersonController { // 保存部门填写人 @PostMapping("/saveFilledPerson") public Response saveFilledPerson( - @Valid @RequestBody ResponsiblePersonForm form, + @Valid @RequestBody FilledPersonForm form, BindingResult bindingResult ) { if (bindingResult.hasErrors()) { @@ -162,6 +159,22 @@ public class ResponsiblePersonController { return Response.ok().setMessage("添加成功"); } + // 修改部门填写人 + @PostMapping("/updateFilledPerson") + public Response updateFilledPerson( + @Valid @RequestBody UpdateFilledPersonForm form, + BindingResult bindingResult + ) { + if (bindingResult.hasErrors()) { + bindingResult.getFieldErrors().forEach(error -> { + throw new CommonException(error.getDefaultMessage()); + }); + } + + responsiblePersonService.updateFilledPerson(form); + return Response.ok().setMessage("添加成功"); + } + // 删除部门责任人 @GetMapping("/deleteResponsiblePerson") public Response deleteResponsiblePerson( diff --git a/src/main/java/com/xdap/self_development/controller/form/FilledPersonForm.java b/src/main/java/com/xdap/self_development/controller/form/FilledPersonForm.java new file mode 100644 index 0000000..6882656 --- /dev/null +++ b/src/main/java/com/xdap/self_development/controller/form/FilledPersonForm.java @@ -0,0 +1,19 @@ +package com.xdap.self_development.controller.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class FilledPersonForm { + @NotBlank(message = "部门不能为空") + private String departmentId; + @NotBlank(message = "用户不能为空") + private String userId; + @NotBlank(message = "部门名不能为空") + private String department; + @NotBlank(message = "子系统不能为空") + private String subsystem; + @NotBlank(message = "零部件名不能为空") + private String partsName; +} diff --git a/src/main/java/com/xdap/self_development/controller/form/ResponsiblePersonForm.java b/src/main/java/com/xdap/self_development/controller/form/ResponsiblePersonForm.java index f8b47ee..4440f50 100644 --- a/src/main/java/com/xdap/self_development/controller/form/ResponsiblePersonForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/ResponsiblePersonForm.java @@ -12,6 +12,6 @@ public class ResponsiblePersonForm { private String userId; @NotBlank(message = "部门名不能为空") private String department; - @NotBlank(message = "子部门不能为空") + @NotBlank(message = "子系统不能为空") private String subsystem; } diff --git a/src/main/java/com/xdap/self_development/controller/form/UpdateFilledPersonForm.java b/src/main/java/com/xdap/self_development/controller/form/UpdateFilledPersonForm.java new file mode 100644 index 0000000..51d5760 --- /dev/null +++ b/src/main/java/com/xdap/self_development/controller/form/UpdateFilledPersonForm.java @@ -0,0 +1,21 @@ +package com.xdap.self_development.controller.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class UpdateFilledPersonForm { + @NotBlank + private String rowId; + @NotBlank(message = "部门不能为空") + private String departmentId; + @NotBlank(message = "用户不能为空") + private String userId; + @NotBlank(message = "部门名不能为空") + private String department; + @NotBlank(message = "子系统不能为空") + private String subsystem; + @NotBlank(message = "零部件名不能为空") + private String partsName; +} diff --git a/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java b/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java index 24aac28..7ce44b8 100644 --- a/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java +++ b/src/main/java/com/xdap/self_development/pojo/BenchmarkingReport.java @@ -35,9 +35,6 @@ public class BenchmarkingReport extends MpaasBasePojo { private String projectName; private String projectNumber; - private String subsystem; - private String partsName; - private String createBy; private Integer isDelete; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java b/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java index 041682d..98796ff 100644 --- a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java +++ b/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java @@ -19,6 +19,7 @@ public class ResponsiblePerson extends MpaasBasePojo { private String userId; private String department; private String subsystem; + private String partsName; private Integer personLevel; @Column(type = ColumnType.CALCULATE) diff --git a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java index 0945227..65e91d0 100644 --- a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java +++ b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java @@ -2,9 +2,7 @@ package com.xdap.self_development.service; import com.definesys.mpaas.query.db.PageQueryResult; import com.xdap.api.moudle.user.pojo.XdapUsers; -import com.xdap.self_development.controller.form.DeptResponsiblePageForm; -import com.xdap.self_development.controller.form.ResponsiblePersonForm; -import com.xdap.self_development.controller.form.UpdateResponsiblePersonForm; +import com.xdap.self_development.controller.form.*; import com.xdap.self_development.pojo.ResponsiblePerson; import javax.validation.Valid; @@ -15,10 +13,12 @@ import java.util.Set; public interface ResponsiblePersonService { void saveResponsiblePerson(@Valid ResponsiblePersonForm form); - void saveFilledPerson(@Valid ResponsiblePersonForm form); + void saveFilledPerson(@Valid FilledPersonForm form); void updateResponsiblePerson(@Valid UpdateResponsiblePersonForm form); + void updateFilledPerson(@Valid UpdateFilledPersonForm form); + void deleteResponsiblePerson(@NotBlank String rowId); PageQueryResult getDeptResponsible(@Valid DeptResponsiblePageForm form); diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java index 95705f2..8873007 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java @@ -4,13 +4,10 @@ import com.definesys.mpaas.query.db.PageQueryResult; import com.xdap.api.moudle.user.pojo.XdapUsers; import com.xdap.runtime.service.RuntimeDatasourceService; import com.xdap.self_development.config.BusinessDatabase; -import com.xdap.self_development.controller.form.DeptResponsiblePageForm; -import com.xdap.self_development.controller.form.ResponsiblePersonForm; -import com.xdap.self_development.controller.form.UpdateResponsiblePersonForm; +import com.xdap.self_development.controller.form.*; import com.xdap.self_development.exception.CommonException; import com.xdap.self_development.pojo.Parameter; import com.xdap.self_development.pojo.ResponsiblePerson; -import com.xdap.self_development.pojo.Template; import com.xdap.self_development.service.ResponsiblePersonService; import com.xdap.self_development.service.XdapDeptUsersService; import org.apache.commons.lang3.ObjectUtils; @@ -53,7 +50,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { } @Override - public void saveFilledPerson(ResponsiblePersonForm form) { + public void saveFilledPerson(FilledPersonForm form) { List responsiblePeople = bd.getBusinessDatabase() .eq("userId", form.getUserId()) .eq("personLevel", 2) @@ -68,6 +65,7 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { responsiblePerson.setDepartmentId(form.getDepartmentId()); responsiblePerson.setUserId(form.getUserId()); responsiblePerson.setSubsystem(form.getSubsystem()); + responsiblePerson.setPartsName(form.getPartsName()); responsiblePerson.setPersonLevel(2); bd.getBusinessDatabase().doInsert(responsiblePerson); } @@ -83,6 +81,18 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { .doUpdate(ResponsiblePerson.class); } + @Override + public void updateFilledPerson(UpdateFilledPersonForm form) { + bd.getBusinessDatabase() + .rowid("id", form.getRowId()) + .update("department_id", form.getDepartmentId()) + .update("user_id", form.getUserId()) + .update("department", form.getDepartment()) + .update("subsystem", form.getSubsystem()) + .update("parts_name", form.getPartsName()) + .doUpdate(ResponsiblePerson.class); + } + @Override public void deleteResponsiblePerson(String rowId) { bd.getBusinessDatabase() diff --git a/src/main/resources/sql.sql b/src/main/resources/sql.sql index 935e789..d9691e8 100644 --- a/src/main/resources/sql.sql +++ b/src/main/resources/sql.sql @@ -163,6 +163,7 @@ CREATE TABLE `yfsjglpt_model_responsible_person` `user_id` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '责任人id', `department` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '部门名', `subsystem` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子系统', + `parts_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '零部件名称', `person_level` int(11) NOT NULL DEFAULT '1' COMMENT '1：责任人；2：填写人', PRIMARY KEY (`id`) ) ENGINE = InnoDB