diff --git a/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java b/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java index e1385f3..4067899 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java @@ -10,6 +10,7 @@ import com.gaotao.modules.oss.vo.FileAssociateData; import com.gaotao.modules.purchaseorder.entity.AuthorizationHist; import com.gaotao.modules.purchaseorder.entity.PRDetail; import com.gaotao.modules.purchaseorder.entity.TblBaseData; +import com.gaotao.modules.purchaseorder.entity.vo.AuthorizationHistVo; import com.gaotao.modules.purchaseorder.query.PRDetailQuery; import com.gaotao.modules.purchaseorder.query.PRHeaderQuery; import com.gaotao.modules.purchaseorder.query.TblBaseDataQuery; @@ -196,6 +197,18 @@ public class PRHeaderController { return R.ok().put("rows", resultList); } + /** + * @author: sxm + * @description: 获取所有所有的审批步骤 信息 + * @param [authorizationHist] + * @return: com.gaotao.common.utils.R + * @date: 2022/7/15 17:04 + */ + @PostMapping("getAuthorizationHists") + public R getAuthorizationHists(@RequestBody AuthorizationHistVo authorizationHist) { + PageUtils resultList = authorizationHistService.getAuthorizationHists(authorizationHist); + return R.ok().put("data", resultList); + } /** * @param [authorizationHist] * @author: sxm @@ -241,6 +254,4 @@ public class PRHeaderController { return R.ok("操作成功!"); } - - } diff --git a/src/main/java/com/gaotao/modules/purchaseorder/dao/AuthorizationHistMapper.java b/src/main/java/com/gaotao/modules/purchaseorder/dao/AuthorizationHistMapper.java index db2c432..d52e110 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/dao/AuthorizationHistMapper.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/dao/AuthorizationHistMapper.java @@ -1,7 +1,11 @@ package com.gaotao.modules.purchaseorder.dao; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.purchaseorder.entity.AuthorizationHist; import java.util.List; + +import com.gaotao.modules.purchaseorder.entity.vo.AuthorizationHistVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -70,4 +74,16 @@ public interface AuthorizationHistMapper { */ AuthorizationHist getReviewStep(AuthorizationHist authorizationHist); + + + /** + * @author: sxm + * @description: 获取所有审批步骤 + * @param [authorizationHist] + * @return: java.util.List + * @date: 2022/7/15 17:06 + */ + IPage getAuthorizationHists(Page authorizationHistPage,@Param("query") AuthorizationHistVo authorizationHist); + + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/purchaseorder/entity/vo/AuthorizationHistVo.java b/src/main/java/com/gaotao/modules/purchaseorder/entity/vo/AuthorizationHistVo.java new file mode 100644 index 0000000..ed63127 --- /dev/null +++ b/src/main/java/com/gaotao/modules/purchaseorder/entity/vo/AuthorizationHistVo.java @@ -0,0 +1,51 @@ +package com.gaotao.modules.purchaseorder.entity.vo; + +import com.gaotao.modules.purchaseorder.entity.AuthorizationHist; + +import java.util.Date; + +/** + * @Classname AuthorizationHistVo + * @Description TODO + * @Date 2022/7/15 17:33 + * @Created by sxm + */ +public class AuthorizationHistVo extends AuthorizationHist { + private long limit; + private long page; + + private Date startDate; + private Date endDate; + + public long getLimit() { + return limit; + } + + public void setLimit(long limit) { + this.limit = limit; + } + + public long getPage() { + return page; + } + + public void setPage(long page) { + this.page = page; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } +} diff --git a/src/main/java/com/gaotao/modules/purchaseorder/service/AuthorizationHistService.java b/src/main/java/com/gaotao/modules/purchaseorder/service/AuthorizationHistService.java index 3947aac..9687c8f 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/service/AuthorizationHistService.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/service/AuthorizationHistService.java @@ -1,6 +1,8 @@ package com.gaotao.modules.purchaseorder.service; +import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.purchaseorder.entity.AuthorizationHist; +import com.gaotao.modules.purchaseorder.entity.vo.AuthorizationHistVo; import java.util.List; @@ -56,4 +58,13 @@ public interface AuthorizationHistService { */ AuthorizationHist getReviewStep(AuthorizationHist authorizationHist); + /** + * @author: sxm + * @description: 获取所有的审批步骤信息 + * @param [authorizationHist] + * @return: java.util.List + * @date: 2022/7/15 17:04 + */ + PageUtils getAuthorizationHists(AuthorizationHistVo authorizationHist); + } diff --git a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java index 1f40149..eb655d5 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/AuthorizationHistServiceImpl.java @@ -1,10 +1,15 @@ package com.gaotao.modules.purchaseorder.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.common.constant.AuditType; +import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.auditManagement.dao.AuthStepMapper; +import com.gaotao.modules.base.entity.PartData; import com.gaotao.modules.purchaseorder.dao.AuthorizationHistMapper; import com.gaotao.modules.purchaseorder.dao.PRHeaderMapper; import com.gaotao.modules.purchaseorder.entity.AuthorizationHist; +import com.gaotao.modules.purchaseorder.entity.vo.AuthorizationHistVo; import com.gaotao.modules.purchaseorder.query.PRHeaderQuery; import com.gaotao.modules.purchaseorder.service.AuthorizationHistService; import com.gaotao.modules.toolman.dao.IfsToolMapper; @@ -147,4 +152,12 @@ public class AuthorizationHistServiceImpl implements AuthorizationHistService { public AuthorizationHist getReviewStep(AuthorizationHist authorizationHist) { return authorizationHistMapper.getReviewStep(authorizationHist); } + + @Override + public PageUtils getAuthorizationHists(AuthorizationHistVo authorizationHist) { + IPage authorizationHists = authorizationHistMapper.getAuthorizationHists( + new Page(authorizationHist.getPage(), authorizationHist.getLimit()), authorizationHist); + PageUtils pageUtils = new PageUtils(authorizationHists); + return pageUtils; + } } diff --git a/src/main/resources/mapper/purchaseorder/AuthorizationHistMapper.xml b/src/main/resources/mapper/purchaseorder/AuthorizationHistMapper.xml index 5ce867c..8bfbf1f 100644 --- a/src/main/resources/mapper/purchaseorder/AuthorizationHistMapper.xml +++ b/src/main/resources/mapper/purchaseorder/AuthorizationHistMapper.xml @@ -77,7 +77,7 @@ h.order_ref1 = #{orderRef1} AND h.site = #{site} - h.step_id = #{stepId} + and h.step_id = #{stepId} and A.auth_user_id=#{authUserId} @@ -239,4 +239,41 @@ WHERE order_ref1 = #{orderRef1} AND site = #{site} AND step_id = #{stepId} AND auth_user_id = #{authUserId} + + \ No newline at end of file