Merge branch 'feature/xgh/20241月迭代' into 'developer'

Feature/xgh/20241月迭代

See merge request !1651

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java

@@ -32,7 +32,7 @@ public interface AuditApiService {
 	Page<AuditDTO> listByStaffId(String staffId,Integer auditType,Integer auditStatus,String enterpriseId, BasePageInfo pageInfo);
 
 	Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo,
-										 Integer auditType, Integer auditStatus,String wxEnterpriseId,String enterpriseId);
+										 Integer auditType, Integer auditStatus,String wxEnterpriseId,String enterpriseId,String clerkId);
 	
 	AuditDTO findById(String auditId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanAuditMapper.java

@@ -36,7 +36,7 @@ public interface TabHaobanAuditMapper {
                                                      @Param("auditType") Integer auditType,
                                                      @Param("auditStatus") Integer auditStatus,
                                                      @Param("wxEnterpriseId") String wxEnterpriseId,
-                                                     @Param("enterpriseId") String enterpriseId);
+                                                     @Param("enterpriseId") String enterpriseId , @Param("clerkType")int clerkType);
 
     TabHaobanAudit findByBindRelatedIdAndAuditType(@Param("relatedId") String relatedId,
                                                    @Param("auditType") int auditType,
@@ -51,5 +51,5 @@ public interface TabHaobanAuditMapper {
     int getAuditCount(@Param("wxEnterpriseId") String wxEnterpriseId,
                       @Param("enterpriseId") String enterpriseId,
                       @Param("relatedId") String relatedId,
-                      @Param("storeIds") List<String> storeIds);
+                      @Param("storeIds") List<String> storeIds, @Param("clerkType")int clerkType);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -412,9 +412,11 @@ public class AuditApiServiceImpl implements AuditApiService {
 
     @Override
     public Page<AuditDTO> pageStoreListByParams(List<String> storeIds, BasePageInfo pageInfo, Integer auditType,
-                                                Integer auditStatus, String wxEnterpriseId, String enterpriseId) {
+                                                Integer auditStatus, String wxEnterpriseId, String enterpriseId,String clerkId) {
+        ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId) ;
+        int clerkType = clerkDTO.getClerkType() ;
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-        return PageUtil.changePageHelperToCurrentPage(auditMapper.pageStoreListByParams(storeIds, auditType, auditStatus, wxEnterpriseId, enterpriseId), AuditDTO.class);
+        return PageUtil.changePageHelperToCurrentPage(auditMapper.pageStoreListByParams(storeIds, auditType, auditStatus, wxEnterpriseId, enterpriseId,clerkType), AuditDTO.class);
     }
 
     public void insertBatchLog(String batchId, int auditResult, TabHaobanAudit tab) {
@@ -492,7 +494,7 @@ public class AuditApiServiceImpl implements AuditApiService {
                 clerkId = null;
             }
         }
-        return this.auditMapper.getAuditCount(wxEnterpriseId, enterpriseId, clerkId, storeIdList);
+        return this.auditMapper.getAuditCount(wxEnterpriseId, enterpriseId, clerkId, storeIdList,clerkType);
     }
 
 }

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -210,8 +210,10 @@
         from tab_haoban_audit
         where
         status_flag = 1
-        <if test="auditType == null || auditType == -1">
-            and audit_type in (2,3,4,5)
+        <if test="clerkType==1">
+            <if test="auditType == null || auditType == -1">
+                and audit_type in (2,3,4,5)
+            </if>
         </if>
         <if test="auditType != null and auditType != -1">
             and audit_type = #{auditType}
@@ -280,6 +282,9 @@
         <if test="relatedId != null and relatedId != ''">
             and related_Id = #{relatedId}
         </if>
+        <if test="clerkType == 1">
+            and audit_type in (2,3,4,5)
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

@@ -145,7 +145,7 @@ public class AuditController extends WebBaseController {
         if (storeIds.contains("-1")) {
             storeIds = null;
         }
-        Page<AuditDTO> page = auditApiService.pageStoreListByParams(storeIds, pageInfo, auditType, auditStatus, wxEnterpriseId, enterpriseId);
+        Page<AuditDTO> page = auditApiService.pageStoreListByParams(storeIds, pageInfo, auditType, auditStatus, wxEnterpriseId, enterpriseId,clerkId);
         List<AuditDTO> list = page.getResult();
         List<AuditVO> voList = new ArrayList<AuditVO>();
         for (AuditDTO auditDTO : list) {