diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java index 0787751..1744a7b 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java @@ -7,6 +7,7 @@ import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.poi.ExcelUtil; @@ -15,7 +16,6 @@ import com.xinelu.manage.dto.nursestationitem.NurseStationItemDTO; import com.xinelu.manage.dto.nursestationitem.NurseStationItemImportDTO; import com.xinelu.manage.service.nursestationitem.INurseStationItemService; import com.xinelu.manage.vo.nursestationitem.NurseStationItemVO; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java index f5d4332..11e38e6 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java @@ -68,7 +68,6 @@ public class PoserInfo extends BaseDomain implements Serializable { */ @ApiModelProperty(value = "海报简介") @Excel(name = "海报简介") - @NotBlank(message = "海报简介不能为空", groups = {Insert.class, Update.class}) private String posterIntroduce; /** diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml index c22ca2c..e2f5426 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml @@ -189,11 +189,9 @@ nst.appointment_time_interval, nst.nurse_classify_name, nst.shelf_status, - ns.nurse_station_name, - nt.nurse_type_name + ns.nurse_station_name from nurse_station_item nst LEFT JOIN nurse_station ns on ns.id = nst.nurse_station_id - LEFT JOIN nurse_type nt on nt.id = nst.nurse_type_id where nst.id = #{id} diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml index 53f0a6f..c69c3cd 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml @@ -288,9 +288,7 @@ poser_code = #{poserCode}, - poster_introduce = - #{posterIntroduce}, - + poster_introduce = #{posterIntroduce}, poster_picture_url = #{posterPictureUrl},