BUG 2806 获取月份第一天和最后一天 2021-09-09 by kongfm

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -85,16 +85,43 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	}
 
 	private void fillDutyShiftData(String beginDate, String endDate, Map<String, Object> m) throws ParseException {
+		// 获取值班的实例id
 		String instanceId = m.get("instanceId").toString();
+		// 根据appkey 获取未删除的值班班次
 		List<DutyShift> dutyShifts = dutyShiftService.list(new LambdaQueryWrapper<DutyShift>()
 				.eq(BaseEntity::getIsDelete, false).eq(DutyShift::getAppKey, RequestContext.getAppKey()));
+		// 根据id 保存成key -value
 		Map<Long, DutyShift> keyNameMap = dutyShifts.stream()
 				.collect(Collectors.toMap(BaseEntity::getSequenceNbr, Function.identity()));
+		// 根据时间 查询值班关系表
+
+		// BUG 2806 获取月份第一天和最后一天  2021-09-09 by kongfm
+			if(beginDate != null ) {
+			Calendar c = Calendar.getInstance();
+			c.setTime(DateUtils.longStr2Date(beginDate));
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.set(Calendar.HOUR_OF_DAY,0);
+			c.set(Calendar.MINUTE,0);
+			c.set(Calendar.SECOND,0);
+			beginDate = DateUtils.date2LongStr(c.getTime());
+		}
+		if(endDate != null ) {
+			Calendar c = Calendar.getInstance();
+			c.setTime(DateUtils.longStr2Date(beginDate));
+			c.add(Calendar.MONTH, 1);
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.add(Calendar.DATE, -1);
+			c.set(Calendar.HOUR_OF_DAY,23);
+			c.set(Calendar.MINUTE,59);
+			c.set(Calendar.SECOND,59);
+			endDate = DateUtils.date2LongStr(c.getTime());
+		}
 		List<DutyPersonShiftDto> personShiftList = dutyPersonShiftService
 				.list(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId)
 						.ge(beginDate != null, DutyPersonShift::getDutyDate, beginDate)
 						.le(endDate != null, DutyPersonShift::getDutyDate, endDate))
 				.stream().map(e -> {
+					// 值班关系查询到以后 重新封装
 					DutyPersonShiftDto dto = new DutyPersonShiftDto();
 					Bean.copyExistPropertis(e, dto);
 					// 没值班信息，默认休
@@ -152,6 +179,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	public List<Map<String, Object>> list(Long teamId, String beginDate, String endDate) throws ParseException {
 		// 1.已column为准 进行返回
 		String groupCode = this.getGroupCode();
+		// 动态表单查询所有值班信息
 		List<Map<String, Object>> list = dynamicFormInstanceService.listAll(groupCode);
 		
 		// 2.组织值班数据
@@ -299,6 +327,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 
 	@Override
 	public Boolean deleteDutyData(Long instanceId) {
+		// 一个人共用一个 instanceId
+
+
 		dynamicFormInstanceService.remove(
 				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
 		dutyPersonShiftService