Skip to content

A
amos-boot-biz
Commit 8c325f6a authored by tangwei's avatar tangwei
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 335a5949 73fb7e6a
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 24 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersExcelDto.java
View file @ 8c325f6a
...@@ -83,39 +83,42 @@ public class FirefightersExcelDto extends BaseDto { ...@@ -83,39 +83,42 @@ public class FirefightersExcelDto extends BaseDto {
@ApiModelProperty(value = "婚姻状况") @ApiModelProperty(value = "婚姻状况")
private String maritalStatus; private String maritalStatus;
@ExcelIgnore
@ApiModelProperty(value = "籍贯/户口所在地")
private String nativePlace;
@ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
@ExcelProperty(value = "户籍所在地", index = 10) @ExcelProperty(value = "户籍所在地", index = 10)
@ApiModelProperty(value = "籍贯/户口所在地的值") @ApiModelProperty(value = "籍贯/户口所在地的值")
private String nativePlaceValue; private String nativePlaceValue;
@ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容 // BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段 2. 地区选择联动 只有新增时带联动 编辑时不带联动 3. 导出模板及导入同步修改
@ExcelProperty(value = "政治面貌", index = 11) @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 11)
@ApiModelProperty(value = "籍贯/户口所在地详细地址")
private String nativePlaceVal;
@ExplicitConstraint(indexNum = 12, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
@ExcelProperty(value = "政治面貌", index = 12)
@ApiModelProperty(value = "政治面貌代码") @ApiModelProperty(value = "政治面貌代码")
private String politicalOutlook; private String politicalOutlook;
@ExplicitConstraint(indexNum = 12, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm @ExplicitConstraint(indexNum = 13, sourceClass = RoleNameExplicitConstraint.class,method="getCitys") //动态下拉内容// BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
@ExcelProperty(value = "现居住地", index = 12) @ExcelProperty(value = "现居住地", index = 13)
@ApiModelProperty(value = "现居住地") @ApiModelProperty(value = "现居住地")
private String residence; private String residence;
// BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段 2. 地区选择联动 只有新增时带联动 编辑时不带联动 3. 导出模板及导入同步修改
@ExcelProperty(value = "现居住地详细地址", index = 14)
@ApiModelProperty(value = "现居住地详细地址")
private String residenceDetailVal;
@ExcelIgnore @ExcelProperty(value = "机场住宿情况", index = 15)
@ApiModelProperty(value = "现居住地详情")
private String residenceDetails;
@ExcelProperty(value = "机场住宿情况", index = 13)
@ApiModelProperty(value = "机场住宿情况") @ApiModelProperty(value = "机场住宿情况")
private String airportAccommodation; private String airportAccommodation;
@ExcelProperty(value = "联系电话", index = 14) @ExcelProperty(value = "联系电话", index = 16)
@ApiModelProperty(value = "手机") @ApiModelProperty(value = "手机")
private String mobilePhone; private String mobilePhone;
@ExplicitConstraint(type = "RYZT", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYZT", indexNum = 17, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "人员状态", index = 15) @ExcelProperty(value = "人员状态", index = 17)
@ApiModelProperty(value = "人员状态，在职/离职") @ApiModelProperty(value = "人员状态，在职/离职")
private String state; private String state;
...@@ -123,21 +126,21 @@ public class FirefightersExcelDto extends BaseDto { ...@@ -123,21 +126,21 @@ public class FirefightersExcelDto extends BaseDto {
@ApiModelProperty(value = "人员状态，在职/离职字典code") @ApiModelProperty(value = "人员状态，在职/离职字典code")
private String stateCode; private String stateCode;
@ExplicitConstraint(type = "GWMC", indexNum = 16, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "GWMC", indexNum = 18, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "岗位名称", index = 16) @ExcelProperty(value = "岗位名称", index = 18)
@ApiModelProperty(value = "岗位名称") @ApiModelProperty(value = "岗位名称")
private String jobTitle; private String jobTitle;
@ExcelProperty(value = "紧急联系人姓名", index = 17) @ExcelProperty(value = "紧急联系人姓名", index = 19)
@ApiModelProperty(value = "紧急联系人姓名") @ApiModelProperty(value = "紧急联系人姓名")
private String emergencyContact; private String emergencyContact;
@ExplicitConstraint(type = "RJGX", indexNum = 18, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RJGX", indexNum = 20, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "与紧急联系人关系", index = 18) @ExcelProperty(value = "与紧急联系人关系", index = 20)
@ApiModelProperty(value = "紧急联系人与本人所属关系") @ApiModelProperty(value = "紧急联系人与本人所属关系")
private String relationship; private String relationship;
@ExcelProperty(value = "紧急联系人电话", index = 19) @ExcelProperty(value = "紧急联系人电话", index = 21)
@ApiModelProperty(value = "紧急联系人电话") @ApiModelProperty(value = "紧急联系人电话")
private String emergencyContactPhone; private String emergencyContactPhone;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Firefighters.java
View file @ 8c325f6a
...@@ -122,4 +122,11 @@ public class Firefighters extends BaseEntity { ...@@ -122,4 +122,11 @@ public class Firefighters extends BaseEntity {
@ApiModelProperty(value = "籍贯/户口所在地的值") @ApiModelProperty(value = "籍贯/户口所在地的值")
private String nativePlaceValue; private String nativePlaceValue;
// BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段 2. 地区选择联动 只有新增时带联动 编辑时不带联动 3. 导出模板及导入同步修改
@ApiModelProperty(value = "户籍所在地详细地址")
private String nativePlaceVal;
@ApiModelProperty(value = "现居住地详细地址")
private String residenceDetailVal;
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java
View file @ 8c325f6a
...@@ -95,9 +95,9 @@ public class GroupController extends AbstractBaseController{ ...@@ -95,9 +95,9 @@ public class GroupController extends AbstractBaseController{
for (DepartmentBo d : departmentBos) { for (DepartmentBo d : departmentBos) {
LinkedHashMap<String, Object> dept = new LinkedHashMap<>(); LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
dept.put("id", d.getSequenceNbr()); dept.put("id", String.valueOf(d.getSequenceNbr()));
dept.put("key", d.getSequenceNbr()); dept.put("key", String.valueOf(d.getSequenceNbr()));
dept.put("value", d.getSequenceNbr()); dept.put("value", String.valueOf(d.getSequenceNbr()));
dept.put("state", "open"); dept.put("state", "open");
dept.put("type", "department"); dept.put("type", "department");
dept.put("orgCode", loginOrgCode+"-"+d.getSequenceNbr()); dept.put("orgCode", loginOrgCode+"-"+d.getSequenceNbr());
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 8c325f6a
...@@ -312,4 +312,14 @@ ...@@ -312,4 +312,14 @@
'调派任务状态(执行中：executing，已完成：finished)'; '调派任务状态(执行中：executing，已完成：finished)';
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="kongfm" id="2021-09-13-kongfm-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_firefighters"/>
</preConditions>
<comment>BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段 2. 地区选择联动 只有新增时带联动 编辑时不带联动 3. 导出模板及导入同步修改</comment>
<sql>
ALTER TABLE `cb_firefighters` add native_place_val varchar(255) COMMENT '户籍所在地详细地址';
ALTER TABLE `cb_firefighters` add residence_detail_val varchar(255) COMMENT '现居住地详细地址';
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment