需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WorkerNumberCheckVO.java

@@ -0,0 +1,61 @@
+package com.gree.mall.manager.bean.workorder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import com.gree.mall.manager.plus.entity.WorkerNumberCheck;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class WorkerNumberCheckVO     {
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "所属公司")
+    @ZfireField(tbName = "b")
+    private String belongCompany;
+
+    @ApiModelProperty(value = "所属公司编号")
+    @ZfireField(tbName = "b")
+    private String belongCompanyCode;
+
+    @ApiModelProperty(value = "网点编号")
+    @ZfireField(tbName = "b")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    @ZfireField(tbName = "b")
+    private String websitName;
+
+    @ApiModelProperty(value = "联系人名称")
+    @ZfireField(tbName = "b")
+    private String linkName;
+
+    @ApiModelProperty(value = "联系电话")
+    @ZfireField(tbName = "b")
+    private String linkMobile;
+
+    @ApiModelProperty(value = "师傅名称")
+    private String workerName;
+
+    @ApiModelProperty(value = "云售后4.0手机号")
+    private String workerPhoneYun;
+
+    @ApiModelProperty(value = "师傅电话")
+    @ZfireField(tbName = "c",colName = "mobile")
+    private String mobile;
+
+    @ApiModelProperty(value = "云售后4.0编号")
+    private String workerNumberYun;
+
+    @ApiModelProperty(value = "广佛家用系统师傅编号")
+    @ZfireField(tbName = "c",colName = "worker_number")
+    private String workerNumber;
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -743,4 +743,6 @@ public interface CommonMapper {
     IPage<PgAppraiseCategoryVO> appraiseCategoryList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
     IPage<PgAppraiseApplyVO> appraiseApplyList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
+
+    IPage<WorkerNumberCheckVO> workerManagerCheck(Page page,@Param("ex") WorkerParamBean zfireParamBean);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/WorkerManagerController.java

@@ -15,6 +15,7 @@ import com.gree.mall.manager.bean.policy.WorkerManagerDetail;
 import com.gree.mall.manager.bean.policy.WorkerUserCount;
 import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
 import com.gree.mall.manager.bean.user.UserWxBean;
+import com.gree.mall.manager.bean.workorder.WorkerNumberCheckVO;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
@@ -191,4 +192,29 @@ public class WorkerManagerController {
     }
 
 
+
+    @ZfireList
+    @PostMapping("/list/workerManagerCheck")
+    @ApiOperation(value = "师傅编号查询-v2")
+    public ResponseHelper<Page<WorkerNumberCheckVO>> workerManagerCheck(
+            @RequestBody WorkerParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        IPage<WorkerNumberCheckVO> page = workerManagerLogic.workerManagerCheck(zfireParamBean);
+        return ResponseHelper.success(page, new TypeReference<WorkerNumberCheckVO>() {
+        });
+    }
+
+    @PostMapping("/list/workerManagerCheck/export")
+    @ApiOperation(value = "师傅编号查询-导出-v2")
+    public void workerManagerCheckExel(
+            @RequestBody WorkerParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //2.查询要导出的内容
+        IPage<WorkerNumberCheckVO> page = workerManagerLogic.workerManagerCheck(zfireParamBean);
+        //3.导出
+        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
+    }
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -4,11 +4,16 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.db.sql.Order;
 import com.alibaba.druid.support.spring.stat.annotation.Stat;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.listvo.workorder.OrderBaseVO;
 import com.gree.mall.manager.bean.policy.WorkerManagerBean;
 import com.gree.mall.manager.bean.policy.WorkerManagerDetail;
 import com.gree.mall.manager.bean.policy.WorkerUserCount;
+import com.gree.mall.manager.bean.workorder.WorkerNumberCheckVO;
+import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -16,6 +21,8 @@ import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.StringUtil;
+import com.gree.mall.manager.zfire.bean.WorkerParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +67,9 @@ public class WorkerManagerLogic {
     @Autowired
     SysDictCompanyService sysDictCompanyService;
 
+    @Autowired
+    CommonMapper commonMapper;
+
 
 
     public void stop(String id) {
@@ -993,4 +1003,15 @@ public class WorkerManagerLogic {
         return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
     }
 
+    public IPage<WorkerNumberCheckVO> workerManagerCheck(WorkerParamBean zfireParamBean) {
+
+        FieldUtils.supplyParam(zfireParamBean, WorkerNumberCheckVO.class, commonLogic.getAdminUser());
+        zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
+
+        IPage<WorkerNumberCheckVO> page = commonMapper.workerManagerCheck(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+                zfireParamBean);
+
+        return page;
+
+    }
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1603,6 +1603,26 @@
         </if>
         ${ex.orderBy}
     </select>
+    <select id="workerManagerCheck" resultType="com.gree.mall.manager.bean.workorder.WorkerNumberCheckVO">
+        SELECT
+        ${ex.selected}
+        FROM
+        worker_number_check a
+        LEFT JOIN admin_websit b on a.websit_id = b.websit_id
+        LEFT JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
+        LEFT JOIN websit_user d on d.websit_id = a.websit_id and d.user_id = c.user_id
+        ${ex.query}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.apply_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
 
 
 </mapper>