src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml
@@ -9,6 +9,17 @@ <select id="selectNursingCheckInPage" resultMap="nursingCheckInResultMap"> select * from jczz_nursing_check_in <where> <if test="nursingCheckIn.id != null ">and id = #{nursingCheckIn.id}</if> <if test="nursingCheckIn.createUser != null ">and create_user = #{nursingCheckIn.createUser}</if> <if test="nursingCheckIn.location != null and nursingCheckIn.location != ''">and location = #{nursingCheckIn.location}</if> <if test="nursingCheckIn.name != null and nursingCheckIn.name != ''">and name like concat('%',#{nursingCheckIn.name},'%')</if> <if test="nursingCheckIn.phone != null and nursingCheckIn.phone != ''">and phone like concat('%',#{nursingCheckIn.phone},'%')</if> <if test="nursingCheckIn.gradeAndClass != null and nursingCheckIn.gradeAndClass != ''">and grade_and_class = #{nursingCheckIn.gradeAndClass}</if> <if test="nursingCheckIn.images != null and nursingCheckIn.images != ''">and images = #{nursingCheckIn.images}</if> <if test="nursingCheckIn.placeId != null ">and place_id = #{nursingCheckIn.placeId}</if> <if test="nursingCheckIn.type != null and nursingCheckIn.type != ''">and type = #{nursingCheckIn.type}</if> </where> </select>
@@ -23,10 +23,14 @@ import lombok.AllArgsConstructor; import javax.validation.Valid; import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.log.logger.BladeLogger; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.Func; import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity; import org.springblade.modules.task.service.ITaskSchoolEvenService; import org.springblade.modules.task.vo.TaskSchoolEvenVO; import org.springblade.modules.task.wrapper.TaskSchoolEvenWrapper; @@ -47,6 +51,7 @@ @Api(value = "校园事件", tags = "校园事件接口") public class TaskSchoolEvenController extends BladeController { private final BladeLogger bladeLogger; private final ITaskSchoolEvenService taskSchoolEvenService; /** @@ -121,5 +126,17 @@ return R.status(taskSchoolEvenService.removeBatchByIds(Func.toLongList(ids))); } /** * 校园事件 审核 */ @PostMapping("/auditing") @ApiOperationSupport(order = 5) @ApiLog("校园事件 审核") @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply") public R updateSchoolEven(@Valid @RequestBody TaskSchoolEvenVO taskSchoolEvenVO) { bladeLogger.info("校园事件 审核", JsonUtil.toJson(taskSchoolEvenVO)); return R.status(taskSchoolEvenService.updateSchoolEven(taskSchoolEvenVO)); } } src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
@@ -56,8 +56,8 @@ /** 描述 */ @ApiModelProperty(value = "描述", example = "") @TableField("describe") private String describe; @TableField("remark") private String remark; /** 隐患类型 */ @ApiModelProperty(value = "隐患类型", example = "") src/main/java/org/springblade/modules/task/mapper/TaskSchoolEvenMapper.xml
@@ -15,7 +15,7 @@ <result property="id" column="id" /> <result property="createUser" column="create_user" /> <result property="images" column="images" /> <result property="describe" column="describe" /> <result property="remark" column="remark" /> <result property="hiddenDangerType" column="hidden_danger_type" /> <result property="type" column="type" /> <result property="isProblem" column="is_problem" /> @@ -36,7 +36,7 @@ id, create_user, images, describe, remark, hidden_danger_type, type, is_problem, @@ -66,7 +66,7 @@ <!-- <if test="id != null "> and id = #{id}</if>--> <!-- <if test="createUser != null "> and create_user = #{createUser}</if>--> <!-- <if test="images != null and images != ''"> and images = #{images}</if>--> <!-- <if test="describe != null and describe != ''"> and describe = #{describe}</if>--> <!-- <if test="remark != null and remark != ''"> and remark = #{remark}</if>--> <!-- <if test="hiddenDangerType != null and hiddenDangerType != ''"> and hidden_danger_type = #{hiddenDangerType}</if>--> <!-- <if test="type != null and type != ''"> and type = #{type}</if>--> <!-- <if test="isProblem != null and isProblem != ''"> and is_problem = #{isProblem}</if>--> src/main/java/org/springblade/modules/task/service/ITaskSchoolEvenService.java
@@ -40,5 +40,10 @@ */ IPage<TaskSchoolEvenVO> selectTaskSchoolEvenPage(IPage<TaskSchoolEvenVO> page, TaskSchoolEvenVO taskSchoolEven); /** * 校园事件审核 * @param taskSchoolEvenVO * @return */ boolean updateSchoolEven(TaskSchoolEvenVO taskSchoolEvenVO); } src/main/java/org/springblade/modules/task/service/impl/TaskSchoolEvenServiceImpl.java
@@ -17,13 +17,21 @@ package org.springblade.modules.task.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.modules.task.entity.TaskEntity; import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity; import org.springblade.modules.task.service.ITaskSchoolEvenService; import org.springblade.modules.task.service.ITaskService; import org.springblade.modules.task.vo.TaskSchoolEvenVO; import org.springblade.modules.task.entity.TaskSchoolEvenEntity; import org.springblade.modules.task.mapper.TaskSchoolEvenMapper; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import javax.annotation.Resource; import java.util.Date; /** * 校园事件 服务实现类 @@ -34,10 +42,20 @@ @Service public class TaskSchoolEvenServiceImpl extends ServiceImpl<TaskSchoolEvenMapper, TaskSchoolEvenEntity> implements ITaskSchoolEvenService { @Resource @Lazy private ITaskService taskService; @Override public IPage<TaskSchoolEvenVO> selectTaskSchoolEvenPage(IPage<TaskSchoolEvenVO> page, TaskSchoolEvenVO taskSchoolEven) { return page.setRecords(baseMapper.selectTaskSchoolEvenPage(page, taskSchoolEven)); } @Override public boolean updateSchoolEven(TaskSchoolEvenVO taskSchoolEvenVO) { taskSchoolEvenVO.setConfirmTime(new Date()); taskSchoolEvenVO.setConfirmUserId(AuthUtil.getUserId()); return updateById(taskSchoolEvenVO); } }
