排班第三版接口增加

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/entity/ImsDutyMainEntity.java

@@ -37,11 +37,13 @@ public class ImsDutyMainEntity extends TenantEntity {
 	@ApiModelProperty(value = "值班组id")
 	private Long dutyGroupId;
 
-
+	@TableField(exist = false)
+	@ApiModelProperty(value = "值班组名称")
+	private String dutyGroupName;
 	/**
 	 * 值班人IDS,   ID之间用^隔开
 	 */
-	@ApiModelProperty(value = "值班人IDS,   ID之间用^隔开")
+	@ApiModelProperty(value = "值班人IDS,ID之间用^隔开")
 	private String dutyPersonIds;
 	/**
 	 * 值班日期
@@ -72,4 +74,7 @@ public class ImsDutyMainEntity extends TenantEntity {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 
+	@TableField(exist = false)
+	private Long manageId;//值班长id
+
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/duty/vo/ImsSchedulingNewVo.java

@@ -0,0 +1,42 @@
+package com.hnac.hzims.operational.duty.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ImsSchedulingNewVo implements Serializable {
+    @ApiModelProperty(value = "班组ID 通过^隔开",required = true)
+    private String groupIds;
+
+//    @ApiModelProperty(value = "班组名称 通过^隔开",required = true)
+//    private String groupNames;
+
+    @ApiModelProperty(value = "班次ID 通过^隔开",required = true)
+    private String classIds;
+
+    @ApiModelProperty(value = "班次名称 通过^隔开",required = true)
+    private String classNames;
+
+    @ApiModelProperty(value = "开始时间",required = true)
+    private String startDate;
+    @ApiModelProperty(value = "结束时间",required = true)
+    private String endDate;
+
+    private Long deptId;//机构id
+
+    @ApiModelProperty("人员类型: 1、班组  2 、人员")
+    private Integer personType;
+
+    //人员组
+    List<Map<String,String>> personIds; //人员用  managerId 值长id  personIds 人员ids 多个^隔开(不包含值长id)
+
+    @ApiModelProperty("班次类型ID")
+    @JsonSerialize(nullsUsing = NullSerializer.class)
+    private Long dutyClassTypeId;
+}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyMainController.java

@@ -11,10 +11,7 @@ import com.hnac.hzims.operational.duty.entity.ImsDutyMainReportExcel;
 import com.hnac.hzims.operational.duty.service.IImsDutyMainService;
 import com.hnac.hzims.operational.duty.utils.ExcelMergeHandler;
 import com.hnac.hzims.operational.duty.utils.ExcelTool;
-import com.hnac.hzims.operational.duty.vo.ChangeDutyMainVo;
+import com.hnac.hzims.operational.duty.vo.*;
-import com.hnac.hzims.operational.duty.vo.ExchangeGroupLeader;
-import com.hnac.hzims.operational.duty.vo.HomePageDutyMainInfoVo;
-import com.hnac.hzims.operational.duty.vo.ImsSchedulingVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -122,37 +119,37 @@ public class ImsDutyMainController extends BladeController {
         return imsDutyMainService.getSchedulingV2(imsSchedulingVo);
     }
 
-    /**
+    @PostMapping("/schedulingNew")
-     * 导入排班
-     */
-    @PostMapping("/importScheduling")
     @ApiOperationSupport(order = 8)
-    @ApiOperation(value = "导入排班管理(适用一天一班的情况)", notes = "")
+    @ApiOperation(value = "排班管理", notes = "")
-    public R importScheduling(@RequestParam("file")MultipartFile file,
+    public R schedulingNew(@Valid @RequestBody ImsSchedulingNewVo vo) {
-                              @RequestParam("yearMonth") String yearMonth,////yearMonth格式 yyyy-MM
+        if (null == vo.getDeptId()) {
-                              @RequestParam("deptId") Long deptId
+            return R.fail("请选择机构");
-                              ) {
-        if(StringUtils.isBlank(yearMonth)){
-            return R.fail("请选择年月");
         }
-        if(deptId == null){
+        if (null == AuthUtil.getTenantId()) {
-            return R.fail("请选择部门");
+            return R.fail("请登录");
         }
-        return imsDutyMainService.importScheduling(file,yearMonth,deptId);
+        return imsDutyMainService.getSchedulingV3(vo);
     }
 
-//	/**
+    /**
-//	 * 排班管理
+     * 导入排班
-//	 */
+     */
-//	@PostMapping("/scheduling")
+//    @PostMapping("/importScheduling")
-//	@ApiOperationSupport(order = 8)
+//    @ApiOperationSupport(order = 8)
-//	@ApiOperation(value = "排班管理", notes = "")
+//    @ApiOperation(value = "导入排班管理(适用一天一班的情况)", notes = "")
-//	public R schedulingV2(@Valid @RequestBody ImsSchedulingVo imsSchedulingVo) {
+//    public R importScheduling(@RequestParam("file")MultipartFile file,
-//		if (null == imsSchedulingVo.getCreateDept()) {
+//                              @RequestParam("yearMonth") String yearMonth,////yearMonth格式 yyyy-MM
-//			imsSchedulingVo.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+//                              @RequestParam("deptId") Long deptId
-//		}
+//                              ) {
-//		return imsDutyMainService.getScheduling(imsSchedulingVo);
+//        if(StringUtils.isBlank(yearMonth)){
-//	}
+//            return R.fail("请选择年月");
+//        }
+//        if(deptId == null){
+//            return R.fail("请选择部门");
+//        }
+//        return imsDutyMainService.importScheduling(file,yearMonth,deptId);
+//    }
 
     /**
      * 查询排班

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/IImsDutyMainService.java

@@ -62,6 +62,8 @@ public interface IImsDutyMainService extends BaseService<ImsDutyMainEntity> {
 
 	R getSchedulingV2(ImsSchedulingVo imsSchedulingVo);
 
+	R getSchedulingV3(ImsSchedulingNewVo vo);
+
 	R importScheduling(MultipartFile file,String yearMonth,Long deptId);
 
 	R getSchedulingList(int year, int month, Long deptId);