diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
index a3a016e5a0..9974aece32 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillfile/BusAttachTypeEnum.java
@@ -14,7 +14,10 @@ public enum BusAttachTypeEnum {
FJ("005", "附件"),
QKLPFJ("006", "欠款领票附件"),
CLMMHT("007", "车辆买卖合同"),
- JZKHBA("008", "价值客户备案");
+ JZKHBA("008", "价值客户备案"),
+ GKXY("009", "车队管理-挂靠协议"),
+ XGYWBX("010", "车队管理-相关业务保险"),
+ ;
/**
* 附件类型
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleet.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleet.java
new file mode 100644
index 0000000000..017376fa00
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleet.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleet.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleet
+ * Description: 车队管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车队管理", description = "车队管理")
+@TableName("bus_fleet")
+public class BusFleet extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("创建人sid")
+ private String createByName; // 创建人sid
+ @ApiModelProperty("车队名称")
+ private String fleetName; // 车队名称
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactNumber; // 联系电话
+ @ApiModelProperty("车辆台数")
+ private Integer carNum; // 车辆台数
+ @ApiModelProperty("相关业务备注")
+ private String businessRemarks; // 相关业务备注
+ @ApiModelProperty("相关业务保险")
+ private String businessInsurance; // 相关业务保险
+ @ApiModelProperty("相关业务违章")
+ private String businessillegally; // 相关业务违章
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date attachmentStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date attachmentEndDate; // 结束日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetDetailsVo.java
new file mode 100644
index 0000000000..a9a05da588
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetDetailsVo.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetVo.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleetVo
+ * Description: 车队管理 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:58
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车队管理 视图数据详情", description = "车队管理 视图数据详情")
+public class BusFleetDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建人姓名")
+ private String createByName;
+ @ApiModelProperty("车队名称")
+ private String fleetName; // 车队名称
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactNumber; // 联系电话
+ @ApiModelProperty("车辆台数")
+ private Integer carNum; // 车辆台数
+ @ApiModelProperty("相关业务备注")
+ private String businessRemarks; // 相关业务备注
+ @ApiModelProperty("相关业务保险")
+ private String businessInsurance; // 相关业务保险
+ @ApiModelProperty("相关业务违章")
+ private String businessillegally; // 相关业务违章
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date attachmentStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date attachmentEndDate; // 结束日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("挂靠协议")
+ private List urls = new ArrayList<>();
+ @ApiModelProperty("相关业务附件")
+ private List businessUrls = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetDto.java
new file mode 100644
index 0000000000..160803bd9f
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetDto.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetDto.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleetDto
+ * Description: 车队管理 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车队管理 数据传输对象", description = "车队管理 数据传输对象")
+public class BusFleetDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建人姓名")
+ private String createByName;
+ @ApiModelProperty("车队名称")
+ private String fleetName; // 车队名称
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactNumber; // 联系电话
+ @ApiModelProperty("车辆台数")
+ private Integer carNum; // 车辆台数
+ @ApiModelProperty("相关业务备注")
+ private String businessRemarks; // 相关业务备注
+ @ApiModelProperty("相关业务保险")
+ private String businessInsurance; // 相关业务保险
+ @ApiModelProperty("相关业务违章")
+ private String businessillegally; // 相关业务违章
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date attachmentStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date attachmentEndDate; // 结束日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("挂靠协议")
+ private List urls = new ArrayList<>();
+ @ApiModelProperty("相关业务附件")
+ private List businessUrls = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetFeign.java
new file mode 100644
index 0000000000..29802c34b3
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetFeign.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetFeign.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleetFeign
+ * Description: 车队管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:58
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车队管理")
+@FeignClient(
+ contextId = "anrui-buscenter-BusFleet",
+ name = "anrui-buscenter",
+ path = "v1/fleetManagement")
+public interface BusFleetFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/saveOrUpdate")
+ @ResponseBody
+ public ResultBean save(@RequestBody BusFleetDto dto);
+
+ @ApiOperation("相关业务补充")
+ @PostMapping("/saveBusiness")
+ @ResponseBody
+ public ResultBean saveBusiness(@RequestBody BusFleetNewDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/gteInitBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetNewDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetNewDto.java
new file mode 100644
index 0000000000..347cd54fd0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetNewDto.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetDto.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleetDto
+ * Description: 车队管理 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车队管理 数据传输对象", description = "车队管理 数据传输对象")
+public class BusFleetNewDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("相关业务备注")
+ private String remarks; // 相关业务备注
+ @ApiModelProperty("相关业务保险")
+ private String insurance; // 相关业务保险
+ @ApiModelProperty("相关业务违章")
+ private String illegally; // 相关业务违章
+ @ApiModelProperty("相关业务附件")
+ private List urls = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetQuery.java
new file mode 100644
index 0000000000..754316cf12
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetQuery.java
@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetQuery.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleetQuery
+ * Description: 车队管理 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车队管理 查询条件", description = "车队管理 查询条件")
+public class BusFleetQuery implements Query {
+
+ @ApiModelProperty("创建组织名称")
+ private String orgName;
+ @ApiModelProperty("车队名称")
+ private String fleetName;
+
+ @ApiModelProperty("开始日期")
+ private String attachmentStartDate;
+ @ApiModelProperty("结束日期")
+ private String attachmentEndDate;
+
+ private String userSid;
+ private String orgPath;
+ private String menuUrl;
+ private String menuSid;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetVo.java
new file mode 100644
index 0000000000..ebe457c710
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfleet/BusFleetVo.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.busfleet;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetVo.java
+ * Class: com.yxt.anrui.buscenter.api.busfleet.BusFleetVo
+ * Description: 车队管理 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车队管理 视图数据对象", description = "车队管理 视图数据对象")
+public class BusFleetVo implements Vo {
+
+ private String sid;
+
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName;
+ @ApiModelProperty("车队名称")
+ private String fleetName;
+ @ApiModelProperty("联系人")
+ private String contacts;
+ @ApiModelProperty("联系电话")
+ private String contactNumber;
+ @ApiModelProperty("车辆台数")
+ private Integer carNum;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date attachmentStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date attachmentEndDate; // 结束日期
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java
index 7acf9de66a..27a4246d64 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.java
@@ -20,4 +20,9 @@ public interface BusFileMapper extends BaseMapper {
@Delete("delete from bus_file where linkSid = #{dtoSid}")
void delByLinkSid(String dtoSid);
+
+ List selByLinkSidAndType(@Param("sid") String sid,@Param("type") String type);
+
+ @Delete("delete from bus_file where linkSid = #{dtoSid} and attachType = #{attachType}")
+ void delByLinkSidAndType(@Param("dtoSid") String dtoSid,@Param("attachType") String attachType);
}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml
index ad662d88df..f71f09eda0 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileMapper.xml
@@ -8,4 +8,11 @@
from bus_file
where linkSid = #{sid}
+
+
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java
index 1f08593b86..2aab603e76 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfile/BusFileService.java
@@ -33,4 +33,12 @@ public class BusFileService extends MybatisBaseService {
public void delByLinkSid(String dtoSid) {
baseMapper.delByLinkSid(dtoSid);
}
+
+ public List selByLinkSidAndType(String sid, String type) {
+ return baseMapper.selByLinkSidAndType(sid,type);
+ }
+
+ public void delByLinkSidAndType(String dtoSid, String attachType) {
+ baseMapper.delByLinkSidAndType(dtoSid,attachType);
+ }
}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetMapper.java
new file mode 100644
index 0000000000..d677a91d2f
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetMapper.java
@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busfleet;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.busfleet.BusFleet;
+import com.yxt.anrui.buscenter.api.busfleet.BusFleetVo;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetMapper.java
+ * Class: com.yxt.anrui.buscenter.biz.busfleet.BusFleetMapper
+ * Description: 车队管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:58
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusFleetMapper extends BaseMapper {
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ @Update("update bus_fleet set isDelete = 1 where sid = #{sid}")
+ void updateIsDel(String sid);
+}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetMapper.xml
new file mode 100644
index 0000000000..5eee89fb1a
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetMapper.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetRest.java
new file mode 100644
index 0000000000..bbd5ff022c
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetRest.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busfleet;
+
+import com.yxt.anrui.buscenter.api.busfleet.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.biz.busfleet.BusFleetRest
+ * Description: 车队管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:58
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车队管理")
+@RestController("com.yxt.anrui.buscenter.biz.busfleet.BusFleetRest")
+@RequestMapping("v1/fleetManagement")
+public class BusFleetRest implements BusFleetFeign {
+
+ @Autowired
+ private BusFleetService busFleetService;
+
+ @Override
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = busFleetService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ public ResultBean save(@RequestBody BusFleetDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ busFleetService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ public ResultBean saveBusiness(BusFleetNewDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ busFleetService.saveBusiness(dto);
+ return rb.success();
+ }
+
+ @Override
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ busFleetService.updateIsDel(sids);
+ return rb.success();
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ BusFleetDetailsVo vo = busFleetService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetService.java
new file mode 100644
index 0000000000..98e336a6d4
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busfleet/BusFleetService.java
@@ -0,0 +1,230 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.busfleet;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
+import com.yxt.anrui.buscenter.api.busfile.BusFile;
+import com.yxt.anrui.buscenter.api.busfile.BusFileDto;
+import com.yxt.anrui.buscenter.api.busfleet.*;
+import com.yxt.anrui.buscenter.biz.busfile.BusFileService;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendix;
+import com.yxt.anrui.riskcenter.api.loanaudit.LoanAuditVo;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(车队管理)
+ * File: BusFleetService.java
+ * Class: com.yxt.anrui.buscenter.biz.busfleet.BusFleetService
+ * Description: 车队管理 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 13:41:58
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusFleetService extends MybatisBaseService {
+
+ @Autowired
+ private SysUserFeign sysUserFeign;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private BusFileService busFileService;
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ BusFleetQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ //========================================数据授权开始
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setMenuSid(query.getMenuSid());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("bf.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ qw.eq("bf.isDelete", 0);
+ if (StringUtils.isNotBlank(query.getOrgName())) {
+ qw.like("bf.createOrgName", query.getOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getFleetName())) {
+ qw.like("bf.fleetName", query.getFleetName());
+ }
+ String attachmentStartDate = query.getAttachmentStartDate();
+ String attachmentEndDate = query.getAttachmentEndDate();
+ qw.apply(StringUtils.isNotEmpty(attachmentStartDate), "date_format (bf.attachmentStartDate,'%Y-%m-%d') >= date_format('" + attachmentStartDate + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(attachmentEndDate), "date_format (bf.attachmentEndDate,'%Y-%m-%d') <= date_format('" + attachmentEndDate + "','%Y-%m-%d')"
+ );
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(BusFleetDto dto) {
+ String dtoSid = dto.getSid();
+ List urls = dto.getUrls();
+ if (StringUtils.isBlank(dtoSid)) {
+ String sid = this.insertByDto(dto);
+ for (String url : urls) {
+ String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
+ BusFile busFile = new BusFile();
+ busFile.setLinkSid(sid);
+ busFile.setAttachType(BusAttachTypeEnum.GKXY.getAttachType());
+ busFile.setFilePath(filePath);
+ busFileService.save(busFile);
+ }
+ return;
+ }
+ this.updateByDto(dto);
+ busFileService.delByLinkSidAndType(dtoSid,BusAttachTypeEnum.GKXY.getAttachType());
+ for (String url : urls) {
+ String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
+ BusFile busFile = new BusFile();
+ busFile.setLinkSid(dtoSid);
+ busFile.setAttachType(BusAttachTypeEnum.GKXY.getAttachType());
+ busFile.setFilePath(filePath);
+ busFileService.save(busFile);
+ }
+ }
+
+ public String insertByDto(BusFleetDto dto) {
+ BusFleet entity = new BusFleet();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ return entity.getSid();
+ }
+
+ public void updateByDto(BusFleetDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ BusFleet entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public BusFleetDetailsVo fetchDetailsVoBySid(String sid) {
+ BusFleet entity = fetchBySid(sid);
+ BusFleetDetailsVo vo = new BusFleetDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ List gkxys = busFileService.selByLinkSidAndType(sid, BusAttachTypeEnum.GKXY.getAttachType());
+ ArrayList gkxy = new ArrayList<>();
+ for (BusFileDto busFileDto : gkxys) {
+ String url = fileUploadComponent.getUrlPrefix() + busFileDto.getFilePath();
+ gkxy.add(url);
+ }
+ vo.setUrls(gkxy);
+ List xgywbxs = busFileService.selByLinkSidAndType(sid, BusAttachTypeEnum.XGYWBX.getAttachType());
+ ArrayList xgywbx = new ArrayList<>();
+ for (BusFileDto busFileDto : xgywbxs) {
+ String url = fileUploadComponent.getUrlPrefix() + busFileDto.getFilePath();
+ xgywbx.add(url);
+ }
+ vo.setBusinessUrls(xgywbx);
+ return vo;
+ }
+
+ public void updateIsDel(String[] sids) {
+ for (String sid : sids) {
+ baseMapper.updateIsDel(sid);
+ }
+ }
+
+ public void saveBusiness(BusFleetNewDto dto) {
+ BusFleetDto busFleetDto = new BusFleetDto();
+ BusFleet busFleet = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(busFleet,busFleetDto);
+ busFleetDto.setBusinessInsurance(dto.getInsurance());
+ busFleetDto.setBusinessillegally(dto.getIllegally());
+ busFleetDto.setBusinessRemarks(dto.getRemarks());
+ List urls = dto.getUrls();
+ busFileService.delByLinkSidAndType(dto.getSid(), BusAttachTypeEnum.XGYWBX.getAttachType());
+ for (String url : urls) {
+ String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
+ BusFile busFile = new BusFile();
+ busFile.setLinkSid(dto.getSid());
+ busFile.setAttachType(BusAttachTypeEnum.XGYWBX.getAttachType());
+ busFile.setFilePath(filePath);
+ busFileService.save(busFile);
+ }
+ this.updateByDto(busFleetDto);
+ }
+}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
index 98284c3ead..9c8a891563 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
@@ -65,6 +65,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
@@ -137,6 +138,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService createQueryWrapper(CrmMaintenanceenterpriseRecordQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -626,6 +630,10 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
// String orderNames = "<" + entity.getCustomer() + ">" + "欠款客户备案";
// variables.put("orderNames", orderNames);
CrmMaintenanceenterpriseRecord record = fetchBySid(businessSid);
@@ -713,6 +721,10 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService variables = new HashMap<>();
+ //判断发起人是否为前台主管
+ String createBySid = record.getCreateBySid();
+ List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
Map appMap = new HashMap<>();
//若有网关，则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
@@ -839,6 +851,10 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
flowTaskVo.setValues(variables);
ResultBean resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@@ -948,6 +964,10 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
bv.setFormVariables(variables);
bv.setModelId(paymentApply.getProcDefId());
ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
@@ -973,6 +993,10 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
+ variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
bv.setFormVariables(variables);
bv.setModelId(paymentApply.getProcDefId());
ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivity.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivity.java
new file mode 100644
index 0000000000..364c739357
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivity.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmactivity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivity.java
+ * Class: com.yxt.anrui.scm.api.scmactivity.ScmActivity
+ * Description: 营销活动管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "营销活动管理", description = "营销活动管理")
+@TableName("scm_activity")
+public class ScmActivity extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("活动名称")
+ private String activityName; // 活动名称
+ @ApiModelProperty("活动地点")
+ private String activityAddress; // 活动地点
+ @ApiModelProperty("活动内容")
+ private String activityContent; // 活动内容
+ @ApiModelProperty("活动总结")
+ private String activitySummary; // 活动总结
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date activityStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date activityEndDate; // 结束日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityDetailsVo.java
new file mode 100644
index 0000000000..53e51025ff
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityDetailsVo.java
@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmactivity;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityVo.java
+ * Class: com.yxt.anrui.scm.api.scmactivity.ScmActivityVo
+ * Description: 营销活动管理 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "营销活动管理 视图数据详情", description = "营销活动管理 视图数据详情")
+public class ScmActivityDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("活动名称")
+ private String activityName; // 活动名称
+ @ApiModelProperty("活动地点")
+ private String activityAddress; // 活动地点
+ @ApiModelProperty("活动内容")
+ private String activityContent; // 活动内容
+ @ApiModelProperty("活动总结")
+ private String activitySummary; // 活动总结
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date activityStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date activityEndDate; // 结束日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty
+ private List urls = new ArrayList<>();
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityDto.java
new file mode 100644
index 0000000000..2468518343
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityDto.java
@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmactivity;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityDto.java
+ * Class: com.yxt.anrui.scm.api.scmactivity.ScmActivityDto
+ * Description: 营销活动管理 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "营销活动管理 数据传输对象", description = "营销活动管理 数据传输对象")
+public class ScmActivityDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("活动名称")
+ private String activityName; // 活动名称
+ @ApiModelProperty("活动地点")
+ private String activityAddress; // 活动地点
+ @ApiModelProperty("活动内容")
+ private String activityContent; // 活动内容
+ @ApiModelProperty("活动总结")
+ private String activitySummary; // 活动总结
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date activityStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date activityEndDate; // 结束日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty
+ private List urls = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityFeign.java
new file mode 100644
index 0000000000..c139b26dc0
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityFeign.java
@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmactivity;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityFeign.java
+ * Class: com.yxt.anrui.scm.api.scmactivity.ScmActivityFeign
+ * Description: 营销活动管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "营销活动管理")
+@FeignClient(
+ contextId = "anrui-scm-ScmActivity",
+ name = "anrui-scm",
+ path = "v1/marketingActivities")
+public interface ScmActivityFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/saveOrUpdate")
+ @ResponseBody
+ public ResultBean save(@RequestBody ScmActivityDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/gteInitBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityQuery.java
new file mode 100644
index 0000000000..b12f1c723b
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityQuery.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmactivity;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityQuery.java
+ * Class: com.yxt.anrui.scm.api.scmactivity.ScmActivityQuery
+ * Description: 营销活动管理 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "营销活动管理 查询条件", description = "营销活动管理 查询条件")
+public class ScmActivityQuery implements Query {
+
+ @ApiModelProperty("创建组织名称")
+ private String orgName;
+ @ApiModelProperty("活动名称")
+ private String activityName; // 活动名称
+ @ApiModelProperty("开始日期")
+ private String activityStartDate; // 开始日期
+ @ApiModelProperty("结束日期")
+ private String activityEndDate; // 结束日期
+
+ private String userSid;
+ private String orgPath;
+ private String menuUrl;
+ private String menuSid;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityVo.java
new file mode 100644
index 0000000000..890f14542f
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmactivity/ScmActivityVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmactivity;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityVo.java
+ * Class: com.yxt.anrui.scm.api.scmactivity.ScmActivityVo
+ * Description: 营销活动管理 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "营销活动管理 视图数据对象", description = "营销活动管理 视图数据对象")
+public class ScmActivityVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName;
+ @ApiModelProperty("活动名称")
+ private String activityName; // 活动名称
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("开始日期")
+ private Date activityStartDate; // 开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ApiModelProperty("结束日期")
+ private Date activityEndDate; // 结束日期
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteract.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteract.java
new file mode 100644
index 0000000000..42feaa5cf3
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteract.java
@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteract.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteract
+ * Description: 厂家沟通管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家沟通管理", description = "厂家沟通管理")
+@TableName("scm_interact")
+public class ScmInteract extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("厂家名称")
+ private String manufactorName; // 厂家名称
+ @ApiModelProperty("对接人")
+ private String contacts; // 对接人
+ @ApiModelProperty("沟通事宜")
+ private String interactContent; // 沟通事宜
+ @ApiModelProperty("沟通结果")
+ private String interactResult; // 沟通结果
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("沟通日期")
+ private Date interactDate; // 沟通日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDetailsVo.java
new file mode 100644
index 0000000000..5c2c364383
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDetailsVo.java
@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractVo.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteractVo
+ * Description: 厂家沟通管理 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家沟通管理 视图数据详情", description = "厂家沟通管理 视图数据详情")
+public class ScmInteractDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("厂家名称")
+ private String manufactorName; // 厂家名称
+ @ApiModelProperty("对接人")
+ private String contacts; // 对接人
+ @ApiModelProperty("沟通事宜")
+ private String interactContent; // 沟通事宜
+ @ApiModelProperty("沟通结果")
+ private String interactResult; // 沟通结果
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("沟通日期")
+ private Date interactDateStart; // 沟通日期
+ private Date interactDateEnd; // 沟通日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDto.java
new file mode 100644
index 0000000000..df2fe737b3
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractDto.java
@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractDto.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteractDto
+ * Description: 厂家沟通管理 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家沟通管理 数据传输对象", description = "厂家沟通管理 数据传输对象")
+public class ScmInteractDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("厂家名称")
+ private String manufactorName; // 厂家名称
+ @ApiModelProperty("对接人")
+ private String contacts; // 对接人
+ @ApiModelProperty("沟通事宜")
+ private String interactContent; // 沟通事宜
+ @ApiModelProperty("沟通结果")
+ private String interactResult; // 沟通结果
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("沟通日期")
+ private Date interactDateStart; // 沟通日期
+ private Date interactDateEnd; // 沟通日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeign.java
new file mode 100644
index 0000000000..dd8e17bd88
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeign.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractFeign.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteractFeign
+ * Description: 厂家沟通管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "厂家沟通管理")
+@FeignClient(
+ contextId = "anrui-scm-ScmInteract",
+ name = "anrui-scm",
+ path = "v1/scminteract",
+ fallback = ScmInteractFeignFallback.class)
+public interface ScmInteractFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody ScmInteractDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeignFallback.java
new file mode 100644
index 0000000000..14a6731741
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteractFeignFallback
+ * Description: 厂家沟通管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmInteractFeignFallback implements ScmInteractFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-scm/scminteract/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(ScmInteractDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-scm/scminteract/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-scm/scminteract/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-scm/scminteract/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractQuery.java
new file mode 100644
index 0000000000..330caaca17
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractQuery.java
@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractQuery.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteractQuery
+ * Description: 厂家沟通管理 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家沟通管理 查询条件", description = "厂家沟通管理 查询条件")
+public class ScmInteractQuery implements Query {
+
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("厂家名称")
+ private String manufactorName; // 厂家名称
+ @ApiModelProperty("对接人")
+ private String contacts; // 对接人
+ @ApiModelProperty("沟通事宜")
+ private String interactContent; // 沟通事宜
+ @ApiModelProperty("沟通结果")
+ private String interactResult; // 沟通结果
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("沟通日期")
+ private Date interactDateStart; // 沟通日期
+ private Date interactDateEnd; // 沟通日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractVo.java
new file mode 100644
index 0000000000..7518d88267
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scminteract/ScmInteractVo.java
@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scminteract;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractVo.java
+ * Class: com.yxt.anrui.scm.api.scminteract.ScmInteractVo
+ * Description: 厂家沟通管理 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂家沟通管理 视图数据对象", description = "厂家沟通管理 视图数据对象")
+public class ScmInteractVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建人姓名")
+ private String createByName; // 创建人姓名
+ @ApiModelProperty("厂家名称")
+ private String manufactorName; // 厂家名称
+ @ApiModelProperty("对接人")
+ private String contacts; // 对接人
+ @ApiModelProperty("沟通事宜")
+ private String interactContent; // 沟通事宜
+ @ApiModelProperty("沟通结果")
+ private String interactResult; // 沟通结果
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("沟通日期")
+ private Date interactDateStart; // 沟通日期
+ private Date interactDateEnd; // 沟通日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.java
new file mode 100644
index 0000000000..ebc5f4cb83
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmactivity;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivity;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmactivity.ScmActivityMapper
+ * Description: 营销活动管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmActivityMapper extends BaseMapper {
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.xml
new file mode 100644
index 0000000000..af4905281f
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityMapper.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityRest.java
new file mode 100644
index 0000000000..86ca1d7ab4
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityRest.java
@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmactivity;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivity;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityQuery;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityVo;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityDetailsVo;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityDto;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityFeign;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmactivity.ScmActivityRest
+ * Description: 营销活动管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "营销活动管理")
+@RestController("com.yxt.anrui.scm.biz.scmactivity.ScmActivityRest")
+@RequestMapping("v1/scmactivity")
+public class ScmActivityRest implements ScmActivityFeign {
+
+ @Autowired
+ private ScmActivityService scmActivityService;
+
+ @Override
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = scmActivityService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ public ResultBean save(@RequestBody ScmActivityDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ scmActivityService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ scmActivityService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ ScmActivityDetailsVo vo = scmActivityService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityService.java
new file mode 100644
index 0000000000..53b9e7b3da
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmactivity/ScmActivityService.java
@@ -0,0 +1,182 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmactivity;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busbillfile.BusAttachTypeEnum;
+import com.yxt.anrui.buscenter.api.busfile.BusFile;
+import com.yxt.anrui.buscenter.api.busfleet.BusFleetVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivity;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityQuery;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityVo;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityDetailsVo;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityDto;
+import com.yxt.anrui.scm.api.scmactivity.ScmActivityFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmActivityService.java
+ * Class: com.yxt.anrui.scm.biz.scmactivity.ScmActivityService
+ * Description: 营销活动管理 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmActivityService extends MybatisBaseService {
+
+ @Autowired
+ private SysUserFeign sysUserFeign;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private ScmFileService scmFileService;
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ ScmActivityQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ //========================================数据授权开始
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setMenuSid(query.getMenuSid());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("u.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("sa.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ qw.eq("sa.isDelete", 0);
+ if (StringUtils.isNotBlank(query.getOrgName())) {
+ qw.like("sa.createOrgName", query.getOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getActivityName())) {
+ qw.like("sa.activityName", query.getActivityName());
+ }
+ String activityStartDate = query.getActivityStartDate();
+ String activityEndDate = query.getActivityEndDate();
+ qw.apply(StringUtils.isNotEmpty(activityStartDate), "date_format (sa.activityStartDate,'%Y-%m-%d') >= date_format('" + activityStartDate + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(activityEndDate), "date_format (sa.activityEndDate,'%Y-%m-%d') <= date_format('" + activityEndDate + "','%Y-%m-%d')"
+ );
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(ScmActivityDto dto) {
+ String dtoSid = dto.getSid();
+ List urls = dto.getUrls();
+ if (StringUtils.isBlank(dtoSid)) {
+ String sid = this.insertByDto(dto);
+ for (String url : urls) {
+ String filePath = url.replace(fileUploadComponent.getUrlPrefix(), "");
+ ScmFile scmFile = new ScmFile();
+ scmFile.setLinkSid(sid);
+ // scmFile.setAttachType(ScmEnum.GKXY.getAttachType());
+ scmFile.setFilePath(filePath);
+ scmFileService.save(scmFile);
+ }
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public String insertByDto(ScmActivityDto dto) {
+ ScmActivity entity = new ScmActivity();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ return entity.getSid();
+ }
+
+ public void updateByDto(ScmActivityDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ ScmActivity entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public ScmActivityDetailsVo fetchDetailsVoBySid(String sid) {
+ ScmActivity entity = fetchBySid(sid);
+ ScmActivityDetailsVo vo = new ScmActivityDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.java
new file mode 100644
index 0000000000..3e276bf438
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scminteract;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scminteract.ScmInteract;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractMapper.java
+ * Class: com.yxt.anrui.scm.biz.scminteract.ScmInteractMapper
+ * Description: 厂家沟通管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmInteractMapper extends BaseMapper {
+
+ //@Update("update scm_interact set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from scm_interact")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.xml
new file mode 100644
index 0000000000..d169c5ba15
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractRest.java
new file mode 100644
index 0000000000..0f0340e603
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scminteract;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scminteract.ScmInteract;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractQuery;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractVo;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractDetailsVo;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractDto;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractFeign;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scminteract.ScmInteractRest
+ * Description: 厂家沟通管理.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "厂家沟通管理")
+@RestController("com.yxt.anrui.scm.biz.scminteract.ScmInteractRest")
+@RequestMapping("v1/scminteract")
+public class ScmInteractRest implements ScmInteractFeign {
+
+ @Autowired
+ private ScmInteractService scmInteractService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = scmInteractService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody ScmInteractDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ scmInteractService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ scmInteractService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ ScmInteractDetailsVo vo = scmInteractService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractService.java
new file mode 100644
index 0000000000..d4c3701e89
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scminteract/ScmInteractService.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scminteract;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scminteract.ScmInteract;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractQuery;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractVo;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractDetailsVo;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractDto;
+import com.yxt.anrui.scm.api.scminteract.ScmInteractFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(销售支持业务)
+ * File: ScmInteractService.java
+ * Class: com.yxt.anrui.scm.biz.scminteract.ScmInteractService
+ * Description: 厂家沟通管理 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-10-14 17:20:43
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmInteractService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(ScmInteractQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ ScmInteractQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(ScmInteractDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(ScmInteractDto dto){
+ ScmInteract entity = new ScmInteract();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(ScmInteractDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ ScmInteract entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public ScmInteractDetailsVo fetchDetailsVoBySid(String sid){
+ ScmInteract entity = fetchBySid(sid);
+ ScmInteractDetailsVo vo = new ScmInteractDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java
index fc55350977..bc61584757 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java
@@ -513,6 +513,7 @@ public class AsBwdiffapplyService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f"));
bv.setModelId(asBwdiffapply.getProcDefId());
+ bv.setFormVariables(variables);
ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BwdiffApplyNodeVo.class)).collect(Collectors.toList());