查询审核信息 2022-07-15 sxm

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("操作成功！");
     }
 
-
-
 }

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<com.gaotao.modules.purchaseorder.entity.AuthorizationHist>
+     * @date: 2022/7/15 17:06
+     */
+    IPage<AuthorizationHist> getAuthorizationHists(Page<AuthorizationHist> authorizationHistPage,@Param("query") AuthorizationHistVo authorizationHist);
+
+
 }

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;
+    }
+}

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<com.gaotao.modules.purchaseorder.entity.AuthorizationHist>
+     * @date: 2022/7/15 17:04
+     */
+    PageUtils getAuthorizationHists(AuthorizationHistVo authorizationHist);
+
 }

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<AuthorizationHist> authorizationHists = authorizationHistMapper.getAuthorizationHists(
+                new Page<AuthorizationHist>(authorizationHist.getPage(), authorizationHist.getLimit()), authorizationHist);
+        PageUtils pageUtils = new PageUtils(authorizationHists);
+        return pageUtils;
+    }
 }

src/main/resources/mapper/purchaseorder/AuthorizationHistMapper.xml

@@ -77,7 +77,7 @@
         <where>
             h.order_ref1 = #{orderRef1} AND h.site = #{site}
             <if test="stepId != null and stepId != ''">
-                h.step_id = #{stepId}
+                and  h.step_id = #{stepId}
             </if>
             <if test="authUserId != null and authUserId != ''">
                 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}
     </select>
 
+    <select id="getAuthorizationHists" resultType="com.gaotao.modules.purchaseorder.entity.AuthorizationHist">
+        SELECT h.id,h.order_ref1,h.step_id,h.auth_flag,h.can_auth_flag,h.site,
+               (CASE
+                    WHEN h.auth_type_db = 'G' THEN  (SELECT top 1 '审批组/'+group_desc FROM auth_group where id = auth_group_id )
+                    WHEN h.auth_type_db = 'P' THEN (SELECT top 1 '个人/'+user_display FROM sys_user where user_id = auth_user_id )
+                   END) AS  name_desc,h.approve_result_comments,h.last_step_flag,h.remark,
+               h.act_authorizator,h.act_authorize_date,
+              ( case when auth_flag = 'Y' then '已审批'
+                   else '未审批'
+               end ) as approve_result,
+               u.user_display as user_name
+        FROM authorization_hist h
+                 LEFT JOIN sys_user u on h.act_authorizator = u.user_id and h.site = u.site
+        <where>
+             h.site = #{query.site}
+            <if test="query.authFlag != null and query.authFlag != ''">
+                and h.auth_flag = #{query.authFlag}
+            </if>
+            <if test="query.orderRef1 != null and query.orderRef1 != ''">
+               and h.order_ref1 like #{query.orderRef1}
+            </if>
+            <if test="query.stepId != null and query.stepId != ''">
+              and  h.step_id = #{query.stepId}
+            </if>
+            <if test="query.userDisplay != null and query.userDisplay != ''">
+                and A.user_display like #{query.userDisplay}
+            </if>
+            <if test="query.startDate != null ">
+                and h.act_authorize_date <![CDATA[ >= ]]> #{query.startDate}
+            </if>
+            <if test="query.endDate != null ">
+                and h.act_authorize_date <![CDATA[ <= ]]> #{query.endDate}
+            </if>
+
+        </where>
+    </select>
+
 </mapper>