lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftSubController.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; @@ -34,6 +35,7 @@ /** * 班次表(次表)-分页查询 * * @param shiftId * @param pageNo * @param pageSize @@ -52,25 +54,27 @@ /** * 班次表(次表)-新增 * @param jsonbject * * @param mdcShiftSub * @return */ @AutoLog(value = "班次表(次表)-新增") @ApiOperation(value = "班次表(次表)-新增", notes = "班次表(次表)-新增") @PostMapping("/addShiftSub") public Result<?> addShiftSub(@RequestBody JSONObject jsonbject) { public Result<?> addShiftSub(@RequestBody MdcShiftSub mdcShiftSub) { //处理是否存在空值 if (jsonbject.getDate("sleepStartDate") != null || jsonbject.getDate("sleepEndDate") != null ) { if (jsonbject.getDate("sleepEndDate") == null || jsonbject.getDate("sleepStartDate") == null) { if (StringUtils.isNotEmpty(mdcShiftSub.getSleepStartDate()) || StringUtils.isNotEmpty(mdcShiftSub.getSleepEndDate())) { if (StringUtils.isEmpty(mdcShiftSub.getSleepEndDate()) || StringUtils.isEmpty(mdcShiftSub.getSleepStartDate())) { return Result.error("新增失败，休息时间选择不对"); } } MdcShiftSub result = mdcShiftSubService.addMdcShiftSub(jsonbject); MdcShiftSub result = mdcShiftSubService.addMdcShiftSub(mdcShiftSub); return Result.OK(result); } /** * 班次表(次表)-修改 * * @param mdcShiftSub * @return */ @@ -84,6 +88,7 @@ /** * 班次表(次表)-根据id修改子表状态 * * @param jsonObject * @return */ @@ -97,6 +102,7 @@ /** * 班次表(次表)-根据id删除 * * @param id * @return */ @@ -109,6 +115,7 @@ /** * 班次表(次表)-根据id删除 * * @param shiftId * @return */ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcShiftSub.java
@@ -50,24 +50,32 @@ /** * 开始时间 */ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss") @DateTimeFormat(pattern="HH:mm:ss") @ApiModelProperty("开始时间") private String startDate; /** * 结束时间 */ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss") @DateTimeFormat(pattern="HH:mm:ss") @ApiModelProperty("结束时间") private String endDate; /** * 开始休息时间 */ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss") @DateTimeFormat(pattern="HH:mm:ss") @ApiModelProperty("开始休息时间") private String sleepStartDate; /** * 结束休息时间 */ @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss") @DateTimeFormat(pattern="HH:mm:ss") @ApiModelProperty("结束休息时间") private String sleepEndDate;
@@ -36,10 +36,10 @@ /** * 新增 * @param jsonbject * @param mdcShiftSub * @return */ MdcShiftSub addMdcShiftSub(JSONObject jsonbject); MdcShiftSub addMdcShiftSub(MdcShiftSub mdcShiftSub); /** * 修改 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftServiceImpl.java
@@ -50,6 +50,7 @@ if (StringUtils.isEmpty(mdcShift.getShiftStatus())) { mdcShift.setShiftStatus("1"); } mdcShift.setDefaultShift("false"); List<MdcShift> mdcShifts = listMdcName(mdcShift); //查询有重复数据返回false if (null != mdcShifts && !mdcShifts.isEmpty()) { lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcShiftSubServiceImpl.java
@@ -14,6 +14,7 @@ import org.jeecg.modules.mdc.entity.MdcShiftSub; import org.jeecg.modules.mdc.mapper.MdcShiftSubMapper; import org.jeecg.modules.mdc.service.IMdcShiftSubService; import org.jeecg.modules.mdc.util.DateUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -50,21 +51,7 @@ } @Override public MdcShiftSub addMdcShiftSub(JSONObject jsonbject) { MdcShiftSub mdcShiftSub = jsonbject.toJavaObject(MdcShiftSub.class); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss"); String startDate = simpleDateFormat.format(jsonbject.getDate("startDate")); mdcShiftSub.setStartDate(startDate); String endDate = simpleDateFormat.format(jsonbject.getDate("endDate")); mdcShiftSub.setEndDate(endDate); if (jsonbject.getDate("sleepStartDate") != null) { String sleepStartDate = simpleDateFormat.format(jsonbject.getDate("sleepStartDate")); mdcShiftSub.setSleepStartDate(sleepStartDate); } if (jsonbject.getDate("sleepEndDate") != null) { String sleepEndDate = simpleDateFormat.format(jsonbject.getDate("sleepEndDate")); mdcShiftSub.setSleepEndDate(sleepEndDate); } public MdcShiftSub addMdcShiftSub(MdcShiftSub mdcShiftSub) { this.save(mdcShiftSub); return mdcShiftSub; }
