feat(): 添加消防队所属机构字段

web-app/src/main/java/com/zcloud/zcGbsServicer/command/convertor/FireBrigadeCoConvertor.java

@@ -3,13 +3,16 @@ package com.zcloud.zcGbsServicer.command.convertor;
 import com.zcloud.zcGbsServicer.dto.clientobject.FireBrigadeCO;
 import com.zcloud.zcGbsServicer.persistence.dataobject.FireBrigadeDO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 import java.util.List;
 
 @Mapper(componentModel = "spring")
 public interface FireBrigadeCoConvertor {
 
+    @Mapping(source = "orgName", target = "org")
     List<FireBrigadeCO> converDOsToCOs(List<FireBrigadeDO> fireBrigadeDOs);
 
+    @Mapping(source = "orgName", target = "org")
     FireBrigadeCO converDOToCO(FireBrigadeDO fireBrigadeDO);
 }

web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeAddCmd.java

@@ -1,6 +1,7 @@
 package com.zcloud.zcGbsServicer.dto;
 
 import com.alibaba.cola.dto.Command;
+import com.fasterxml.jackson.annotation.JsonAlias;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -18,6 +19,10 @@ public class FireBrigadeAddCmd extends Command {
     @ApiModelProperty("负责人部门")
     private String leaderDept;
 
+    @ApiModelProperty("所属机构")
+    @JsonAlias("orgName")
+    private String org;
+
     @ApiModelProperty("负责人用户ID")
     private Long leaderUserId;
 

web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeCO.java

@@ -19,6 +19,8 @@ public class FireBrigadeCO extends ClientObject {
     @JsonProperty("leaderDept")
     private String leaderDeptName;
 
+    private String org;
+
     private Long leaderUserId;
 
     @JsonProperty("leader")

web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeDO.java

@@ -19,6 +19,7 @@ public class FireBrigadeDO extends BaseDO {
     private String leaderName;
     private String leaderPhone;
     private String leaderDeptName;
+    private String orgName;
     private String address;
     private String dutyPhone;
     private LocalDate establishDate;

web-infrastructure/src/main/resources/fireAlarm.sql

@@ -141,6 +141,7 @@ CREATE TABLE `fire_brigade` (
   `leader_name` varchar(64) DEFAULT NULL COMMENT '负责人姓名',
   `leader_phone` varchar(32) DEFAULT NULL COMMENT '负责人电话',
   `leader_dept_name` varchar(128) DEFAULT NULL COMMENT '负责人部门名称',
+  `org_name` varchar(128) DEFAULT NULL COMMENT '所属机构',
   `address` varchar(255) DEFAULT NULL COMMENT '地址',
   `duty_phone` varchar(32) DEFAULT NULL COMMENT '应急值班电话',
   `establish_date` date DEFAULT NULL COMMENT '成立日期',