diff --git a/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java b/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java index 26938a4b..6c038a60 100644 --- a/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java +++ b/src/main/java/net/mingsoft/cms/action/DutyStandbyAction.java @@ -76,6 +76,7 @@ public class DutyStandbyAction extends BaseFileAction { @ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"), @ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"), @ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"), + @ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"), @ApiImplicitParam(name = "policeDuty", value = "民警值班员", required =false,paramType="query"), @ApiImplicitParam(name = "auxiliaryPoliceDuty", value = "辅警值班员", required =false,paramType="query"), @ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"), diff --git a/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java b/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java index 99bbc2d9..af5305c0 100644 --- a/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/DutyStandbyAction.java @@ -69,6 +69,7 @@ public class DutyStandbyAction extends BaseAction { @ApiImplicitParam(name = "id", value = "id", required =false,paramType="query"), @ApiImplicitParam(name = "dutyDate", value = "值班日期", required =false,paramType="query"), @ApiImplicitParam(name = "monitor", value = "带班长", required =false,paramType="query"), + @ApiImplicitParam(name = "deputyMonitor", value = "副带班长", required =false,paramType="query"), @ApiImplicitParam(name = "policeDuty", value = "民警值班员", required =false,paramType="query"), @ApiImplicitParam(name = "auxiliaryPoliceDuty", value = "辅警值班员", required =false,paramType="query"), @ApiImplicitParam(name = "blDutyPerson", value = "北岭值班人员", required =false,paramType="query"), diff --git a/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java b/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java index 2191c4df..8627273d 100644 --- a/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/DutyStandbyEntity.java @@ -51,6 +51,12 @@ public class DutyStandbyEntity extends BaseEntity { @ExcelProperty("带班长") private String monitor; + /** + * 副带班长 + */ + @ExcelProperty("副带班长") + private String deputyMonitor; + /** * 民警值班员 */ @@ -144,4 +150,12 @@ public class DutyStandbyEntity extends BaseEntity { public void setContentId(String contentId) { this.contentId = contentId; } + + public String getDeputyMonitor() { + return deputyMonitor; + } + + public void setDeputyMonitor(String deputyMonitor) { + this.deputyMonitor = deputyMonitor; + } } diff --git a/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java b/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java index d5ef02b4..bd6822bf 100644 --- a/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java +++ b/src/main/java/net/mingsoft/cms/excel/DutyStandbyExcel.java @@ -50,6 +50,12 @@ public class DutyStandbyExcel implements Serializable { @ExcelProperty("带班长") private String monitor; + /** + * 副带班长 + */ + @ExcelProperty("副带班长") + private String deputyMonitor; + /** * 民警值班员 */ @@ -108,4 +114,12 @@ public class DutyStandbyExcel implements Serializable { public void setBlDutyPerson(String blDutyPerson) { this.blDutyPerson = blDutyPerson; } + + public String getDeputyMonitor() { + return deputyMonitor; + } + + public void setDeputyMonitor(String deputyMonitor) { + this.deputyMonitor = deputyMonitor; + } } diff --git a/src/main/webapp/template/1/default/index.htm b/src/main/webapp/template/1/default/index.htm index a26bbdbd..2056c48d 100644 --- a/src/main/webapp/template/1/default/index.htm +++ b/src/main/webapp/template/1/default/index.htm @@ -626,16 +626,18 @@
-
带班长
-
民警值班员
-
辅警值班员
-
北岭值班员
+
带班长
+
副班长
+
民警值班员
+
辅警值班员
+
北岭值班员
-
-
-
-
+
+
+
+
+
@@ -975,7 +977,8 @@ const { rows } = res.data.data if (rows.length) { $('.right_top_con_tr_monitor').text(rows[0].monitor) - $('.right_top_con_tr_deputyMonitor').text(rows[0].policeDuty) + $('.right_top_con_tr_deputyMonitor').text(rows[0].deputyMonitor) + $('.right_top_con_tr_policeDuty').text(rows[0].policeDuty) $('.right_top_con_tr_operator').text(rows[0].auxiliaryPoliceDuty) $('.right_top_con_tr_dutyPerson').text(rows[0].blDutyPerson) } @@ -988,6 +991,10 @@ $('.right_top_con_tr_deputyMonitor').text('/') $('.right_top_con_tr_deputyMonitor').css("color", "#999999") } + if ($('.right_top_con_tr_policeDuty').text() == '') { + $('.right_top_con_tr_policeDuty').text('/') + $('.right_top_con_tr_policeDuty').css("color", "#999999") + } if ($('.right_top_con_tr_operator').text() == '') { $('.right_top_con_tr_operator').text('/') $('.right_top_con_tr_operator').css("color", "#999999") diff --git a/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm b/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm index c6bdd094..774937a5 100644 --- a/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm +++ b/src/main/webapp/template/1/default/zhibanbeiqing-detail.htm @@ -50,19 +50,21 @@
日
-
日期
-
带班长
-
民警值班员
-
辅警值班员
-
北岭值班员
+
日期
+
带班长
+
副带班长
+
民警值班员
+
辅警值班员
+
北岭值班员
-
{{item.dutyDate || '/'}}
-
{{item.monitor || '/'}}
-
{{item.policeDuty || '/'}}
-
{{item.auxiliaryPoliceDuty || '/'}}
-
{{item.blDutyPerson || '/'}}
+
{{item.dutyDate || '/'}}
+
{{item.monitor || '/'}}
+
{{item.deputyMonitor || '/'}}
+
{{item.policeDuty || '/'}}
+
{{item.auxiliaryPoliceDuty || '/'}}
+
{{item.blDutyPerson || '/'}}
diff --git a/src/main/webapp/template/1/default/zhibanbeiqing-list.htm b/src/main/webapp/template/1/default/zhibanbeiqing-list.htm index 12148f99..56ea6587 100644 --- a/src/main/webapp/template/1/default/zhibanbeiqing-list.htm +++ b/src/main/webapp/template/1/default/zhibanbeiqing-list.htm @@ -51,16 +51,18 @@
-
带班长
-
民警值班员
-
辅警值班员
-
北岭值班员
+
带班长
+
副带班长
+
民警值班员
+
辅警值班员
+
北岭值班员
-
-
-
-
+
+
+
+
+