获取中介列表

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -66,8 +66,8 @@ public interface BaseDistributorFeign {
     @ApiOperation(value = "经销商列表导出（已测试）")
     public void exportExcel(BaseDistributorExportQuery query);
 
-    @ApiOperation("手机端分页查询中介单位（经销商）")
-    @PostMapping("/getAppDistributorList")
+    @ApiOperation("手机端分页查询中介单位（经销商）:废弃")
+    @PostMapping("/getAppDistributorListOld")
     ResultBean<PagerVo<AppBaseDistributorChooseVo>> getAppDistributorList(@RequestBody PagerQuery<BaseDistributorQuery> pagerQuery);
 
     @ApiOperation("Pc端分页查询中介单位（经销商）")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basemiddleman;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 16:52
+ * @Description
+ */
+@Data
+public class BaseMiddleQuery implements Query {
+    private static final long serialVersionUID = 1582178443217852396L;
+
+    private String orgName;
+    @ApiModelProperty("参数错误：userSid不能为空")
+    private String userSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleVo.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.base.api.basemiddleman;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 16:51
+ * @Description
+ */
+@Data
+public class BaseMiddleVo implements Vo {
+    private static final long serialVersionUID = 5858992176533843267L;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("所在单位")
+    private String company;
+    @ApiModelProperty("开户行")
+    private String bankName;
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("中介人员sid")
+    private String sid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java

@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * Project: anrui-base(基础) <br/>
  * File: BaseMiddlemanFeign.java <br/>
@@ -78,4 +80,9 @@ public interface BaseMiddlemanFeign {
     @DeleteMapping("/deleteIntermediary/{sid}")
     @ResponseBody
     ResultBean deleteIntermediary(@PathVariable(value = "sid") String sid);
+
+    @ApiOperation("移动端-销售订单-获取中介列表")
+    @PostMapping("/getMiddleList")
+    @ResponseBody
+    ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(@Valid @RequestBody PagerQuery<BaseMiddleQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeignFallback.java

@@ -72,4 +72,9 @@ public class BaseMiddlemanFeignFallback implements BaseMiddlemanFeign {
 	public ResultBean deleteIntermediary(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(PagerQuery<BaseMiddleQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.java

@@ -26,9 +26,11 @@
 package com.yxt.anrui.base.biz.basemiddleman;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basemiddleman.BaseMiddleVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -63,4 +65,14 @@ public interface BaseMiddlemanMapper extends BaseMapper<BaseMiddleman> {
     List<BaseMiddlemanVo> selectListVo();
 
     BaseMiddlemanDetailsVo fetchDetailsVoBySid(String sid);
+
+    /**
+     * 移动端-销售订单-获取中介列表
+     *
+     * @param page
+     * @param qw
+     * @param name
+     * @return
+     */
+    IPage<BaseMiddleVo> getMiddleList(IPage<BaseMiddleman> page, @Param(Constants.WRAPPER) QueryWrapper<BaseMiddleman> qw, @Param("name") String name);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml

@@ -48,4 +48,23 @@
         from base_middleman bm
         where bm.sid = #{sid}
     </select>
+
+    <select id="getMiddleList" resultType="com.yxt.anrui.base.api.basemiddleman.BaseMiddleVo">
+        SELECT bm.name,
+               bm.mobile,
+               bm.bankName,
+               bm.bankAccount,
+               bm.sid,
+               bm.company,
+               bm.remarks
+        FROM base_middleman bm
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and bm.name LIKE concat('%'
+                  , #{name}
+                  , '%')
+            </if>
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanRest.java

@@ -100,4 +100,11 @@ public class BaseMiddlemanRest implements BaseMiddlemanFeign {
         }
         return rb.success();
     }
+
+    @Override
+    public ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(PagerQuery<BaseMiddleQuery> query) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseMiddleVo> pv = baseMiddlemanService.getMiddleList(query);
+        return rb.success().setData(pv);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -101,4 +101,19 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         BaseMiddlemanDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid);
         return vo;
     }
+
+    public PagerVo<BaseMiddleVo> getMiddleList(PagerQuery<BaseMiddleQuery> query) {
+        IPage<BaseMiddleman> page = PagerUtil.queryToPage(query);
+        BaseMiddleQuery params = query.getParams();
+        QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
+        if (params != null) {
+            if (StringUtils.isNotBlank(params.getUserSid())) {
+                ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
+                qw.eq("useOrgSid", resultBean.getData());
+            }
+        }
+        IPage<BaseMiddleVo> pagging = baseMapper.getMiddleList(page, qw, params.getOrgName());
+        PagerVo<BaseMiddleVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -19,7 +19,7 @@ public enum ProcDefEnum {
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:3:485012"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:400004"),