交接班pdf下載

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/PdfUtils.java

@@ -37,16 +37,51 @@ public class PdfUtils {
      * @param size 高度
      * @return
      */
-    public static PdfPCell createCell(String value, Font font, int align, int colspan, int row, int size){
+    public static PdfPCell createCell(Object value, Font font, int align, int colspan, int row, int size){
+        String cellValue;
+        if (value == null) {
+            cellValue = "";
+        } else {
+            cellValue = value.toString();
+        }
+        PdfPCell cell = new PdfPCell();
+        cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+        cell.setHorizontalAlignment(align);
+        cell.setColspan(colspan);
+        cell.setPhrase(new Phrase(cellValue,font));
+        cell.setFixedHeight(size);
+        if (row != 1) {
+            cell.setRowspan(row);
+        }
+        return cell;
+    }
+
+    public static PdfPCell createCell(Object value, Font font, int align, int colspan, int row, int size,boolean flag){
+        String cellValue;
+        if (value == null) {
+            cellValue = "";
+        } else {
+            cellValue = value.toString();
+        }
         PdfPCell cell = new PdfPCell();
         cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
         cell.setHorizontalAlignment(align);
         cell.setColspan(colspan);
-        cell.setPhrase(new Phrase(value,font));
+        cell.setPhrase(new Phrase(cellValue,font));
         cell.setFixedHeight(size);
         if (row != 1) {
             cell.setRowspan(row);
         }
+        if (flag) {
+            cell.setBorderWidthLeft(0);
+            cell.setBorderWidthTop(0);
+            cell.setBorderWidthBottom(0);
+        } else {
+            cell.setBorderWidthLeft(0);
+            cell.setBorderWidthRight(0);
+            cell.setBorderWidthTop(0);
+            cell.setBorderWidthBottom(0);
+        }
         return cell;
     }
     public static PdfPCell createCell(Image image, int align, int colspan){

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ShiftChangeDutyDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("接警情况详情")
+public class ShiftChangeDutyDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "重大警情")
+    private String majorAlertCount="0";
+
+    @ApiModelProperty(value = "已结案")
+    private String finishedCount="0";
+
+    @ApiModelProperty(value = "接警")
+    private String calledCount="0";
+
+    @ApiModelProperty(value = "未结案")
+    private String unFinishedCount="0";
+
+    @ApiModelProperty(value = "接警情况列表")
+    private List<String> alertInfoList;
+
+    @ApiModelProperty(value = "备注")
+    private String alarmRemark;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ShiftChangePowerDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("力量出动详情")
+public class ShiftChangePowerDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "未归队车辆数")
+    private String no_return_car_count="0";
+
+    @ApiModelProperty(value = "调派任务数")
+    private String transfer_count="0";
+
+    @ApiModelProperty(value = "调派车辆数")
+    private String car_count="0";
+
+    @ApiModelProperty(value = "已完成任务数")
+    private String end_count="0";
+
+    @ApiModelProperty(value = "力量出动详情")
+    private List<String> transferContent;
+
+    @ApiModelProperty(value = "备注")
+    private String powerRemark;
+}