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

.gitignore

@@ -4,4 +4,5 @@ target/
 .classpath
 .project
 /org.eclipse
-.settings
+.settings
\ No newline at end of file
+log/

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyCarExcelDto.java

@@ -62,9 +62,4 @@ public class DutyCarExcelDto implements Serializable {
     @ExcelProperty(value = "车辆名称（车牌）", index = 4)
     @ApiModelProperty(value = "车辆名称")
     private String carName;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "值班信息")
-    private List<DutyPersonShiftDto> dutyShift = new ArrayList<>();
-
-}
+    }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExcelUtil.java

@@ -9,18 +9,9 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.common.api.enums.TitleEnum;
-import org.apache.poi.hssf.usermodel.DVConstraint;
-import org.apache.poi.hssf.usermodel.HSSFDataValidation;
-import org.apache.poi.ss.formula.functions.T;
+import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.excel.EasyExcel;
@@ -93,21 +84,9 @@ public class ExcelUtil {
 
         HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();
         try {
-            //下拉列表集合
-            Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
+            // 组装表头
             List<List<String>> dutyCarTitleList = new ArrayList<>();
-            //循环获取对应列得下拉列表信息
             Field[] declaredFields = model.getDeclaredFields();
-            if (flag) {
-                for (int i = 0; i < declaredFields.length; i++) {
-                    Field field = declaredFields[i];
-                    //解析注解信息
-                    ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class);
-                    resolveExplicitConstraint(explicitListConstraintMap, explicitConstraint, dataDictionaryMapper);
-
-                }
-            }
-            // 组装表头
             for (int i = 0; i < declaredFields.length; i++) {
                 Field field = declaredFields[i];
                 ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class);
@@ -120,18 +99,35 @@ public class ExcelUtil {
             int size = dutyCarTitleList.size();
             if (dayByMonth != null) {
                 for (int i = 0; i < dayByMonth.size(); i++) {
-                    explicitListConstraintMap.put(size + i, dutyNameList);
                     ArrayList<String> dutyDay = new ArrayList<>();
                     dutyDay.add(dayByMonth.get(i));
                     dutyCarTitleList.add(dutyDay);
                 }
             }
+            //下拉列表集合
+            Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
+            if (flag) {
+                // 组装下拉列表
+                for (int i = 0; i < declaredFields.length; i++) {
+                    Field field = declaredFields[i];
+                    //解析注解信息
+                    ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class);
+                    resolveExplicitConstraint(explicitListConstraintMap, explicitConstraint, dataDictionaryMapper);
+                }
+                if (dayByMonth != null) {
+                    for (int i = 0; i < dayByMonth.size(); i++) {
+                        explicitListConstraintMap.put(size + i, dutyNameList);
+                    }
+                }
+            }
 
-            EasyExcel.write(getOutputStream(fileName, response, ExcelTypeEnum.XLSX)).head(dutyCarTitleList).excelType(ExcelTypeEnum.XLSX)
+
+            ExcelWriterSheetBuilder excelWriterSheetBuilder = EasyExcel.write(getOutputStream(fileName, response,
+                    ExcelTypeEnum.XLSX)).head(dutyCarTitleList).excelType(ExcelTypeEnum.XLSX)
                     .sheet(sheetName).registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
                     .registerWriteHandler(new TemplateCellWriteHandler())
-                    .registerWriteHandler(horizontalCellStyleStrategy)
-                    .doWrite(data);
+                    .registerWriteHandler(horizontalCellStyleStrategy);
+            excelWriterSheetBuilder.doWrite(data);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("系统异常！");

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

@@ -12,8 +12,10 @@ import java.util.*;
  */
 public class DateUtils {
 
-    private static final SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy/M/d");
+    private static final SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy-MM-dd");
+    public static final String DATE_PATTERN = "yyyy-MM-dd";
     private static final Calendar calendar = Calendar.getInstance();
+    public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
 
     /**
      * 获取某月的日期List
@@ -78,4 +80,14 @@ public class DateUtils {
         return 0;
     }
 
+    public static Date getDate(String dateStr) {
+        try {
+            Date date = shortSdf.parse(dateStr);
+            return date;
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }
\ No newline at end of file