src/main/java/com/whyc/controller/ProductLockLogController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ProductLockLogService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/ProductLockLogController.java
@@ -3,6 +3,7 @@ import com.whyc.dto.Response; import com.whyc.pojo.ProductLockLog; import com.whyc.service.ProductLockLogService; import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.text.ParseException; import java.util.Date; import java.util.List; @Api(tags = "产品锁定日志") @@ -28,4 +31,18 @@ return new Response().set(1,lockLogList); } @ApiOperation("查询列表-查询用户的解锁操作") @GetMapping("getUnlockByOwner") public Response getUnlockByOwner( @RequestParam String createTime, @RequestParam String createTime1,@RequestParam int pageCurr,@RequestParam int pageSize ){ Date testTime1= null; Date testTime2= null; try { testTime1 = ActionUtil.sdfwithALL.parse(createTime); testTime2 = ActionUtil.sdfwithALL.parse(createTime1); } catch (ParseException e) { e.printStackTrace(); } return service.getUnlockByOwner(testTime1,testTime2,pageCurr,pageSize); } } src/main/java/com/whyc/service/ProductLockLogService.java
@@ -2,11 +2,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.ProductLockLogMapper; import com.whyc.pojo.ProductLockLog; import com.whyc.util.ActionUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; @Service @@ -28,4 +33,18 @@ query.eq("parent_code",parentCode).eq("custom_code",customCode).orderByDesc("id"); return mapper.selectList(query); } //查询列表-查询用户的解锁操作 public Response getUnlockByOwner(Date testTime1, Date testTime2, int pageCurr, int pageSize) { PageHelper.startPage(pageCurr,pageSize); String uName= ActionUtil.getUser().getName(); QueryWrapper wrapper=new QueryWrapper(); wrapper.eq("owner",uName); wrapper.eq("lock_flag",1); wrapper.le("create_time",testTime2); wrapper.ge("create_time",testTime1); wrapper.orderByDesc("create_time"); List list=mapper.selectList(wrapper); PageInfo pageInfo=new PageInfo(list); return new Response().setII(1,list!=null,pageInfo,"查询用户的解锁操作"); } }