Skip to content

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

新增字段

parent 4c684788
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 16 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertForm.java
View file @ 8ba43571
...@@ -42,7 +42,8 @@ public class AlertForm extends BaseEntity { ...@@ -42,7 +42,8 @@ public class AlertForm extends BaseEntity {
@ApiModelProperty(value = "是否一行显示") @ApiModelProperty(value = "是否一行显示")
private Boolean block; private Boolean block;
@ApiModelProperty(value = "是否隱藏")
private Boolean hide;
//新加排序字段 //新加排序字段
@ApiModelProperty(value = "排序字段") @ApiModelProperty(value = "排序字段")
private int sortNum; private int sortNum;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormValue.java
View file @ 8ba43571
...@@ -47,6 +47,12 @@ public class AlertFormValue extends BaseEntity { ...@@ -47,6 +47,12 @@ public class AlertFormValue extends BaseEntity {
@ApiModelProperty(value = "是否一行显示") @ApiModelProperty(value = "是否一行显示")
private Boolean block; private Boolean block;
@ApiModelProperty(value = "是否隱藏")
private Boolean hide;
public AlertFormValue() { public AlertFormValue() {
super(); super();
} }
...@@ -66,12 +72,13 @@ public class AlertFormValue extends BaseEntity { ...@@ -66,12 +72,13 @@ public class AlertFormValue extends BaseEntity {
this.alertTypeCode = alertTypeCode; this.alertTypeCode = alertTypeCode;
} }
public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block, String alertTypeCode, public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block,boolean hide, String alertTypeCode,
String fieldValue, String fieldValueCode) { String fieldValue, String fieldValueCode) {
this.alertFormId = alertFormId; this.alertFormId = alertFormId;
this.fieldName = fieldName; this.fieldName = fieldName;
this.fieldCode = fieldCode; this.fieldCode = fieldCode;
this.block = block; this.block = block;
this.hide=hide;
this.alertTypeCode = alertTypeCode; this.alertTypeCode = alertTypeCode;
this.fieldValue = fieldValue; this.fieldValue = fieldValue;
this.fieldValueCode = fieldValueCode; this.fieldValueCode = fieldValueCode;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/ExcelEnums.java
View file @ 8ba43571
...@@ -17,7 +17,7 @@ public enum ExcelEnums { ...@@ -17,7 +17,7 @@ public enum ExcelEnums {
WXXFZ("微型消防站", "微型消防站", "com.yeejoin.amos.boot.module.common.api.dto.FireStationDto","WXXFZ"),//("WXXFZ","微型消防站") WXXFZ("微型消防站", "微型消防站", "com.yeejoin.amos.boot.module.common.api.dto.FireStationDto","WXXFZ"),//("WXXFZ","微型消防站")
XFRY ("消防人员", "消防人员", "com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto","XFRY"),//("XFRY","消防人员") XFRY ("消防人员", "消防人员", "com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto","XFRY"),//("XFRY","消防人员")
WBRY ("维保人员", "维保人员", "com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto","WBRY"),//("WBRY",维保人员) WBRY ("维保人员", "维保人员", "com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto","WBRY"),//("WBRY",维保人员)
KEYSITE ("重点部位", "重点部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":重點部位} KEYSITE ("重点部位", "重点部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":}
CLZQ ("车辆执勤", "车辆执勤", "com.yeejoin.amos.boot.module.common.api.dto.DutyCarExcelDto","CLZQ"),//("CLZQ","车辆执勤") CLZQ ("车辆执勤", "车辆执勤", "com.yeejoin.amos.boot.module.common.api.dto.DutyCarExcelDto","CLZQ"),//("CLZQ","车辆执勤")
JCDWRY ("机场单位人员", "机场单位人员", "com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto","JCDWRY"),//("JCDW","机场单位") JCDWRY ("机场单位人员", "机场单位人员", "com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto","JCDWRY"),//("JCDW","机场单位")
LDDW ("联动单位", "联动单位", "com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto","LDDW"),//("JCDW","机场单位") LDDW ("联动单位", "联动单位", "com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto","LDDW"),//("JCDW","机场单位")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/FormValue.java
View file @ 8ba43571
...@@ -30,7 +30,8 @@ public class FormValue implements Serializable{ ...@@ -30,7 +30,8 @@ public class FormValue implements Serializable{
private String value; private String value;
@ApiModelProperty(value = "是否一行显示") @ApiModelProperty(value = "是否一行显示")
private boolean block; private boolean block;
public FormValue() { public FormValue() {
} }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertFormValue.java
View file @ 8ba43571
...@@ -46,6 +46,8 @@ public class AlertFormValue extends BaseEntity { ...@@ -46,6 +46,8 @@ public class AlertFormValue extends BaseEntity {
@ApiModelProperty(value = "是否一行显示") @ApiModelProperty(value = "是否一行显示")
private Boolean block; private Boolean block;
@ApiModelProperty(value = "是否影藏")
private Boolean hide;
public AlertFormValue() { public AlertFormValue() {
super(); super();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormServiceImpl.java
View file @ 8ba43571
...@@ -50,7 +50,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto, AlertForm, A ...@@ -50,7 +50,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto, AlertForm, A
AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(), AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(),
alertFrom.getFieldType(), null, alertFrom.getUrl()); alertFrom.getFieldType(), null, alertFrom.getUrl());
AlertFormValue alertFormValu = new AlertFormValue(alertFrom.getSequenceNbr(), alertFrom.getFieldName(), AlertFormValue alertFormValu = new AlertFormValue(alertFrom.getSequenceNbr(), alertFrom.getFieldName(),
alertFrom.getFieldCode(), alertFrom.getBlock(), alertFrom.getAlertTypeCode(), null, null); alertFrom.getFieldCode(), alertFrom.getBlock(), alertFrom.getHide(), alertFrom.getAlertTypeCode(), null, null);
if (alertFrom.getFieldType().equals("datetime")) { if (alertFrom.getFieldType().equals("datetime")) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
...@@ -71,7 +71,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto, AlertForm, A ...@@ -71,7 +71,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFormDto, AlertForm, A
AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(), AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(),
alertFrom.getFieldType(), new Items(list), alertFrom.getUrl()); alertFrom.getFieldType(), new Items(list), alertFrom.getUrl());
AlertFormValue alertFormValu = new AlertFormValue(alertFrom.getSequenceNbr(), alertFrom.getFieldName(), AlertFormValue alertFormValu = new AlertFormValue(alertFrom.getSequenceNbr(), alertFrom.getFieldName(),
alertFrom.getFieldCode(), alertFrom.getBlock(), alertFrom.getAlertTypeCode(), null, null); alertFrom.getFieldCode(), alertFrom.getBlock(),alertFrom.getHide(), alertFrom.getAlertTypeCode(), null, null);
if (alertFrom.getFieldType().equals("radio")) { if (alertFrom.getFieldType().equals("radio")) {
vo.setDefaultValue(list.get(0).getValue()); vo.setDefaultValue(list.get(0).getValue());
alertFormValu.setFieldValue(list.get(0).getLabel()); alertFormValu.setFieldValue(list.get(0).getLabel());
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 8ba43571
...@@ -545,28 +545,43 @@ ...@@ -545,28 +545,43 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tw" id="2021-09-17-002"> <changeSet author="tw" id="2021-09-17-002">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="jc_alert_form" columnName="hide"/>
</not>
</preConditions>
<comment>jc_alert_form add column</comment>
<sql>
alter table `jc_alert_form` add column `hide` bit(1) NULL DEFAULT b'0' COMMENT '隐藏';
</sql>
</changeSet>
<changeSet author="tw" id="2021-09-17-003">
<preConditions onFail="MARK_RAN">
<tableExists tableName="jc_alert_form" /> <tableExists tableName="jc_alert_form" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_alert_form"/> <primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_alert_form"/>
</preConditions> </preConditions>
<comment>add data cb_data_dictionary</comment> <comment>add data cb_data_dictionary</comment>
<sql> <sql>
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (131, '229', NULL, '重点部位', 'keySiteExcle', 'selectDelay', NULL, NULL, NULL, b'0', b'0', 0, 'data-dictionary/gwmcDataDictionary/FJJW'); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (131, '229', NULL, '重点部位', 'keySiteExcle', 'select', NULL, NULL, NULL, b'0', b'0', 0, '', b'0');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (132, '229', NULL, '楼层经度', 'floorLongitude', 'input', NULL, NULL, NULL, b'0', b'0', 2, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (132, '229', NULL, '楼层经度', 'floorLongitude', 'input', NULL, NULL, NULL, b'0', b'0', 2, NULL, b'1');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (133, '229', NULL, '楼层纬度', 'floorLatitude', 'input', NULL, NULL, NULL, b'0', b'0', 3, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (133, '229', NULL, '楼层纬度', 'floorLatitude', 'input', NULL, NULL, NULL, b'0', b'0', 3, NULL, b'1');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (134, '1214', 'HZXZ', '患者现状', 'patientStatus', 'CheckBoxSelect', NULL, NULL, NULL, b'0', b'1', 1, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (134, '1214', 'HZXZ', '患者现状', 'patientStatus', 'CheckBoxSelect', NULL, NULL, NULL, b'0', b'1', 1, NULL, b'0');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (135, '1214', 'XB', '性别', 'gender', 'select', NULL, NULL, NULL, b'0', b'0', 2, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (135, '1214', 'XB', '性别', 'gender', 'select', NULL, NULL, NULL, b'0', b'0', 2, NULL, b'0');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (136, '1214', 'NLD', '年龄段(岁)', 'ageGroup', 'select', NULL, NULL, NULL, b'0', b'0', 3, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (136, '1214', 'NLD', '年龄段(岁)', 'ageGroup', 'select', NULL, NULL, NULL, b'0', b'0', 3, NULL, b'0');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (137, '1214', NULL, '患者现状说明', 'presentSituation', 'textarea', NULL, NULL, NULL, b'0', b'1', 4, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (137, '1214', NULL, '患者现状说明', 'presentSituation', 'textarea', NULL, NULL, NULL, b'0', b'1', 4, NULL, b'0');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (138, '1214', NULL, '情况说明', 'situation', 'textarea', NULL, NULL, NULL, b'0', b'1', 5, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (138, '1214', NULL, '情况说明', 'situation', 'textarea', NULL, NULL, NULL, b'0', b'1', 5, NULL, b'0');
INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`) VALUES (139, '1214', NULL, '备注', 'remarks', 'textarea', NULL, NULL, NULL, b'0', b'1', 6, NULL); INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (139, '1214', NULL, '备注', 'remarks', 'textarea', NULL, NULL, NULL, b'0', b'1', 6, NULL, b'0');
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tw" id="2021-09-17-003"> <changeSet author="tw" id="2021-09-17-004">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<tableExists tableName="jc_alert_form_type" /> <tableExists tableName="jc_alert_form_type" />
......
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