feat：审核展示修改

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

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -42,6 +44,8 @@ public class AuditController extends WebBaseController {
     private StaffApiService staffApiService;
     @Autowired
     private StoreService storeService;
+    @Autowired
+    private ClerkService clerkService;
 
     //设置保存
     @HttpLimit
@@ -130,7 +134,14 @@ public class AuditController extends WebBaseController {
                 AuditStaffDTO oldAuditStaffDTO = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
                 String staffName = oldAuditStaffDTO.getStaffName();
                 String clerkCode = oldAuditStaffDTO.getClerkCode();
+                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(oldAuditStaffDTO.getClerkId());
                 String detail = staffName + "申请关联导购code:" + clerkCode;
+                if (clerkDTO != null) {
+                    Integer clerkType = clerkDTO.getClerkType();
+                    if (clerkType == 2) {
+                        detail = staffName + "申请关联区经code:" + clerkCode;
+                    }
+                }
                 dto.setDetail(detail);
             } else if (dto.getAuditType() != null && dto.getAuditType() == 5) {
                 //门店导购解绑

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

@@ -59,12 +59,12 @@ public class AuditController extends WebBaseController {
 
     //关联记录列表
     @RequestMapping("clerk-apply-list")
-    public HaobanResponse staffStoreList(String staffId, Integer auditType, Integer auditStatus, String wxEnterpriseId, BasePageInfo pageInfo) {
+    public HaobanResponse staffStoreList(String staffId, Integer auditType, Integer auditStatus, String enterpriseId, String wxEnterpriseId, BasePageInfo pageInfo) {
         if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
 
-        Page<AuditDTO> page = auditApiService.listByStaffId(staffId, auditType, auditStatus, pageInfo);
+        Page<AuditDTO> page = auditApiService.listByStaffId(staffId, auditType, auditStatus, enterpriseId, pageInfo);
         List<AuditDTO> list = page.getResult();
         List<AuditVO> voList = new ArrayList<AuditVO>();
         for (AuditDTO auditDTO : list) {