值班导入导出

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

@@ -40,7 +40,7 @@ public class DutyPersonExcelDto implements Serializable {
     @ApiModelProperty(value = "部门id")
     private String deptId;
 
-    @ExcelIgnore
+    @ExcelProperty(value = "单位/部门", index = 3)
     @ApiModelProperty(value = "部门名称")
     private String deptName;
 
@@ -48,8 +48,8 @@ public class DutyPersonExcelDto implements Serializable {
     @ApiModelProperty(value = "岗位id")
     private String postType;
 
-    @ExplicitConstraint(type = "DUTY_POST_TYPE", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位", index = 3)
+    @ExplicitConstraint(type = "DUTY_POST_TYPE", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位", index = 4)
     @ApiModelProperty(value = "岗位名称")
     private String postTypeName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -238,7 +238,6 @@ public class ExcelController extends BaseController {
             Cell cell = row.getCell(1);
             if (cell != null) {
                 dutyPersonDto.setUserId(cell.toString());
-            }
                 cell = row.getCell(2);
                 if (cell != null) {
                     dutyPersonDto.setUserName(cell.toString());
@@ -246,12 +245,18 @@ public class ExcelController extends BaseController {
                 cell = row.getCell(3);
                 if (cell != null) {
                     String[] split = cell.toString().split("@");
+                    dutyPersonDto.setDeptName(split[0]);
+                    dutyPersonDto.setDeptId(split[1]);
+                }
+                cell = row.getCell(4);
+                if (cell != null) {
+                    String[] split = cell.toString().split("@");
                     dutyPersonDto.setPostTypeName(split[0]);
                     dutyPersonDto.setPostType(split[1]);
                 }
                 List<DutyPersonShiftDto> dutyShift = new ArrayList<>();
                 for (int j = 0; j < dayByMonth.size(); j++) {
-                cell = row.getCell(4 + j);
+                    cell = row.getCell(5 + j);
                     String dutyType = cell == null ? "" : cell.toString();
                     if (!StringUtils.isEmpty(dutyType)) {
                         DutyPersonShiftDto dutyPersonShiftDto = new DutyPersonShiftDto();
@@ -265,6 +270,7 @@ public class ExcelController extends BaseController {
                 dataList.add(dutyPersonDtoMap);
             }
         }
+    }
 
     private void initDutyCarData(XSSFSheet sheet, List<Map<String, Object>> dataList, List<Date> dayByMonth) {
         //遍历行，i = 1，从第二行开始，第一行是表头跳过。
@@ -283,21 +289,21 @@ public class ExcelController extends BaseController {
             }
             cell = row.getCell(2);
             if (cell != null) {
-                String[] split = cell.toString().split("@");
-                dutyCarDto.setUserName(split[0]);
-                dutyCarDto.setUserId(split[1]);
-            }
+                String[] userName = cell.toString().split("@");
+                dutyCarDto.setUserName(userName[0]);
+                dutyCarDto.setUserId(userName[1]);
+
                 cell = row.getCell(3);
                 if (cell != null) {
-                String[] split = cell.toString().split("@");
-                dutyCarDto.setPostTypeName(split[0]);
-                dutyCarDto.setPostType(split[1]);
+                    String[] postType = cell.toString().split("@");
+                    dutyCarDto.setPostTypeName(postType[0]);
+                    dutyCarDto.setPostType(postType[1]);
                 }
                 cell = row.getCell(4);
                 if (cell != null) {
-                String[] split = cell.toString().split("@");
-                dutyCarDto.setCarName(split[0]);
-                dutyCarDto.setCarId(split[1]);
+                    String[] carName = cell.toString().split("@");
+                    dutyCarDto.setCarName(carName[0]);
+                    dutyCarDto.setCarId(carName[1]);
                 }
                 List<DutyPersonShiftDto> dutyShift = dutyCarDto.getDutyShift();
                 for (int j = 0; j < dayByMonth.size(); j++) {
@@ -314,6 +320,7 @@ public class ExcelController extends BaseController {
                 dataList.add(dutyCarDtoMap);
             }
         }
+    }
 
     private void excelImportFirefighters(MultipartFile multipartFile) throws Exception {
         List<FirefightersExcelDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
@@ -593,6 +600,7 @@ public class ExcelController extends BaseController {
                             list.add(row.getAndIncrement());
                             list.add(o.getSequenceNbr().toString());
                             list.add(o.getBizOrgName());
+                            list.add(item.getBizOrgName() + "@" + item.getSequenceNbr());
                             data.add(list);
                         });
                     }
@@ -665,6 +673,7 @@ public class ExcelController extends BaseController {
                 list.add(row.getAndIncrement());
                 list.add(o.getUserId());
                 list.add(o.getUserName());
+                list.add(o.getDeptName());
                 list.add(o.getPostTypeName());
 
                 List<DutyPersonShiftDto> dutyShift = o.getDutyShift();