diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 72978988f6..1efd21e571 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -41,7 +41,8 @@ public enum BillTypeEnum { FKCEQRSQ("FKCEQRSQ", "放款差额确认申请"), YQZF("YQZF", "逾期对账申请资方"), YQCW("YQCW", "逾期对账申请财务"), - AJBH("AJBH", "案件进程编号"); + AJBH("AJBH", "案件进程编号"), + DDQYBA("DDQYBA", "定点企业备案编号"); private String billType; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index fb25bb4640..172fbbe1e9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3510,7 +3510,7 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode())); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); //锁定状态为未锁定 qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode()); List list = params.getList(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 5b52e47776..9ac4c4614f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -3,11 +3,11 @@ insert into bus_sales_order(createBySid,sid,createTime,payType,payTypeKey,financePlan,financePlanValue, - isEnable,customerSid,useOrgSid,useOrgName,orgSid,orgName,orgSidPath) + isEnable,customerSid,customerName,useOrgSid,useOrgName,orgSid,orgName,orgSidPath) values (#{item.createBySid},#{item.sid},#{item.createTime},#{item.payType},#{item.payTypeKey},#{item.financePlan},#{item.financePlanValue}, - #{item.isEnable},#{item.customerSid},#{item.useOrgSid},#{item.useOrgName},#{item.orgSid},#{item.orgName},#{item.orgSidPath}) + #{item.isEnable},#{item.customerSid},#{item.customerName},#{item.useOrgSid},#{item.useOrgName},#{item.orgSid},#{item.orgName},#{item.orgSidPath}) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java index 937a4fa74d..4f592f419d 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java @@ -31,6 +31,7 @@ public class AsCustomerListQuery implements Query { private String userSid; @ApiModelProperty("菜单url") private String menuUrl; - + @ApiModelProperty("是否为定点企业 1是0否") + private String isDesignatedEnterprise; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java index 6483977336..0e59690f46 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java @@ -33,6 +33,11 @@ public class AsCustomerListVo implements Vo { @ApiModelProperty("提醒日期") private String remind_day; private String vehCount; //车辆数量 + private String personCount; //对接人数量 + private String isDesignatedEnterprise; //是否为定点企业 1是0否 + private String filingIndate; //备案有效期 + private String isFilingIndate; //备案有效期是否已过 1是0否 + private String isEnable; //使用状态 1启用0禁用 diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java index 3119998687..4135579d33 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-crm(客户管理)
* File: CrmCustomerTemp.java
@@ -160,4 +162,10 @@ public class CrmCustomerTemp extends BaseEntity { @ApiModelProperty("证件地址") private String certificateAddress; + + @ApiModelProperty("是否为定点企业(1是0否)") + private Integer isDesignatedEnterprise; + + @ApiModelProperty("定点企业备案有效期") + private Date filingIndate; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index f463957475..fe39cf2799 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -143,6 +143,14 @@ public interface CrmCustomerTempFeign { @DeleteMapping("/del") public ResultBean del(@RequestBody String[] sid); + + @ApiOperation("定点企业批量禁用") + @PostMapping("/disableState") + public ResultBean disableState(@RequestBody String[] sid); + + @ApiOperation("定点企业批量启用") + @PostMapping("/enable") + public ResultBean enable(@RequestBody String[] sid); /** * pc潜在客户的编辑回显 * diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index f35643b6ed..651ebbceb0 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -98,6 +98,16 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/del无法访问"); } + @Override + public ResultBean disableState(String[] sid) { + return null; + } + + @Override + public ResultBean enable(String[] sid) { + return null; + } + @Override public ResultBean fetchSid(String sid) { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeople.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeople.java new file mode 100644 index 0000000000..de9c538b71 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeople.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeople.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeople
+ * Description: 定点企业对接人信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业对接人信息", description = "定点企业对接人信息") +@TableName("crm_docking_people") +public class CrmDockingPeople extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("对接人") + private String name; // 对接人 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleDetailsVo.java new file mode 100644 index 0000000000..c6e194a4ab --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleDetailsVo.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeopleVo.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo
+ * Description: 定点企业对接人信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业对接人信息 视图数据详情", description = "定点企业对接人信息 视图数据详情") +public class CrmDockingPeopleDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("对接人") + private String name; // 对接人 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleDto.java new file mode 100644 index 0000000000..dc8ff6da51 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleDto.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeopleDto.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleDto
+ * Description: 定点企业对接人信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业对接人信息 数据传输对象", description = "定点企业对接人信息 数据传输对象") +public class CrmDockingPeopleDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("对接人") + private String name; // 对接人 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java new file mode 100644 index 0000000000..003bd968b6 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + +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-crm(crm)
+ * File: CrmDockingPeopleFeign.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleFeign
+ * Description: 定点企业对接人信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业对接人信息") +@FeignClient( + contextId = "anrui-crm-CrmDockingPeople", + name = "anrui-crm", + path = "v1/crmdockingpeople", + fallback = CrmDockingPeopleFeignFallback.class) +public interface CrmDockingPeopleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody CrmDockingPeopleDto 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-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeignFallback.java new file mode 100644 index 0000000000..9361fc3867 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + +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-crm(crm)
+ * File: CrmDockingPeopleFeignFallback.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleFeignFallback
+ * Description: 定点企业对接人信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class CrmDockingPeopleFeignFallback implements CrmDockingPeopleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-crm/crmdockingpeople/listPage无法访问"); + } + + @Override + public ResultBean save(CrmDockingPeopleDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-crm/crmdockingpeople/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-crm/crmdockingpeople/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-crm/crmdockingpeople/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleQuery.java new file mode 100644 index 0000000000..3dbebfc94b --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleQuery.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeopleQuery.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleQuery
+ * Description: 定点企业对接人信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业对接人信息 查询条件", description = "定点企业对接人信息 查询条件") +public class CrmDockingPeopleQuery implements Query { + + @ApiModelProperty("对接人") + private String name; // 对接人 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleVo.java new file mode 100644 index 0000000000..7eb81b352b --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleVo.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmdockingpeople; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeopleVo.java
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo
+ * Description: 定点企业对接人信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业对接人信息 视图数据对象", description = "定点企业对接人信息 视图数据对象") +public class CrmDockingPeopleVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("对接人") + private String name; // 对接人 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePerson.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePerson.java new file mode 100644 index 0000000000..03f154df43 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePerson.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePerson.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson
+ * Description: 定点企业备案-对接人员.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-对接人员", description = "定点企业备案-对接人员") +@TableName("crm_maintenanceenterprise_person") +public class CrmMaintenanceenterprisePerson extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + @ApiModelProperty("姓名") + private String name; // 姓名 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonDetailsVo.java new file mode 100644 index 0000000000..29037c88df --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonDetailsVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonVo.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo
+ * Description: 定点企业备案-对接人员 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-对接人员 视图数据详情", description = "定点企业备案-对接人员 视图数据详情") +public class CrmMaintenanceenterprisePersonDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + @ApiModelProperty("姓名") + private String name; // 姓名 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonDto.java new file mode 100644 index 0000000000..2b69b21a9c --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonDto.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonDto.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonDto
+ * Description: 定点企业备案-对接人员 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-对接人员 数据传输对象", description = "定点企业备案-对接人员 数据传输对象") +public class CrmMaintenanceenterprisePersonDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + @ApiModelProperty("姓名") + private String name; // 姓名 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java new file mode 100644 index 0000000000..604a7470ce --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + +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: crm(crm)
+ * File: CrmMaintenanceenterprisePersonFeign.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonFeign
+ * Description: 定点企业备案-对接人员.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业备案-对接人员") +@FeignClient( + contextId = "crm-CrmMaintenanceenterprisePerson", + name = "crm", + path = "v1/crmmaintenanceenterpriseperson", + fallback = CrmMaintenanceenterprisePersonFeignFallback.class) +public interface CrmMaintenanceenterprisePersonFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody CrmMaintenanceenterprisePersonDto 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); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/personList") + @ResponseBody + public ResultBean> personList(@RequestParam("sid") String sid); +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java new file mode 100644 index 0000000000..48e2f47323 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + +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: crm(crm)
+ * File: CrmMaintenanceenterprisePersonFeignFallback.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonFeignFallback
+ * Description: 定点企业备案-对接人员.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class CrmMaintenanceenterprisePersonFeignFallback implements CrmMaintenanceenterprisePersonFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口crm/crmmaintenanceenterpriseperson/listPage无法访问"); + } + + @Override + public ResultBean save(CrmMaintenanceenterprisePersonDto dto){ + return ResultBean.fireFail().setMsg("接口crm/crmmaintenanceenterpriseperson/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口crm/crmmaintenanceenterpriseperson/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口crm/crmmaintenanceenterpriseperson/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean> personList(String sid) { + return null; + } +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonQuery.java new file mode 100644 index 0000000000..42ee077c02 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonQuery.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonQuery
+ * Description: 定点企业备案-对接人员 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-对接人员 查询条件", description = "定点企业备案-对接人员 查询条件") +public class CrmMaintenanceenterprisePersonQuery implements Query { + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + @ApiModelProperty("姓名") + private String name; // 姓名 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonVo.java new file mode 100644 index 0000000000..390b4907e4 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonVo.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo
+ * Description: 定点企业备案-对接人员 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-对接人员 视图数据对象", description = "定点企业备案-对接人员 视图数据对象") +public class CrmMaintenanceenterprisePersonVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + @ApiModelProperty("姓名") + private String name; // 姓名 + @ApiModelProperty("手机号码") + private String mobile; // 手机号码 + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java new file mode 100644 index 0000000000..0bd2a4c61b --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/29 16:48 + */ +@Data +public class CrmPersonListVo { + private String mobile; + private String name; + private String remarks; + private String sid; + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CarListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CarListVo.java new file mode 100644 index 0000000000..129f3a1102 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CarListVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 14:42 + */ +@Data +public class CarListVo { + + /** + * 购买日期 + */ + private String buyDate; + private String sid; + /** + * 车牌号 + */ + private String vehMark; + /** + * 车架号 + */ + private String vinNo; + + + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecord.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecord.java new file mode 100644 index 0000000000..fdece1d2f1 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecord.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseRecord.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecord
+ * Description: 定点企业备案.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案", description = "定点企业备案") +@TableName("crm_maintenanceenterprise_record") +public class CrmMaintenanceenterpriseRecord extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + @ApiModelProperty("备案类别") + private String filingType; // 备案类别 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("备案有效期") + private Date filingIndate; // 备案有效期 + @ApiModelProperty("申请部门") + private String deptName; // 申请部门 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("taskId") + private String taskId; // taskId + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称(分公司)") + private String useOrgName; // 使用组织名称(分公司) + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称(分公司)") + private String createOrgName; // 创建组织名称(分公司) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date closingDate; // 办结日期 + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java new file mode 100644 index 0000000000..24cd447a91 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java @@ -0,0 +1,206 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordVo.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo
+ * Description: 定点企业备案 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案 视图数据详情", description = "定点企业备案 视图数据详情") +public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo { + + /** + * 客户sid + */ + private String customerSid; + /** + * 详细地址 + */ + private String address; + /** + * 车辆列表 + */ + private List carList = new ArrayList<>(); + /** + * 证件类型 + */ + private String certificateType; + /** + * 证件类型Key + */ + private String certificateTypeKey; + /** + * 市 + */ + private String city; + /** + * 对接人列表 + */ + private List contactPerson = new ArrayList<>(); + /** + * 县 + */ + private String county; + /** + * 申请人 + */ + private String createByName; + /** + * 申请人sid + */ + private String createBySid; + /** + * 分公司 + */ + private String createOrgName; + /** + * 分公司sid + */ + private String createOrgSid; + /** + * 申请日期 + */ + private String createTime; + /** + * 客户名称 + */ + private String customerName; + /** + * 客户类型 + */ + private String customerType; + /** + * 客户类型Key + */ + private String customerTypeKey; + /** + * 申请部门 + */ + private String deptName; + /** + * 申请部门sid + */ + private String deptSid; + /** + * 电子邮箱 + */ + private String e_mail; + /** + * 紧急联系人 + */ + private String emergencyContact; + /** + * 紧急联系电话 + */ + private String emergencyMobile; + /** + * 证书有效期 + */ + private String endDate; + /** + * 附件 + */ + private List files = new ArrayList<>(); + /** + * 备案有效期 + */ + private String filingIndate; + /** + * 备案类别,默认赋值"首次" + */ + private String filingType; + /** + * 证书号码 + */ + private String idnumber; + /** + * 流程实例ID + */ + private String instanceId; + /** + * 联系电话 + */ + private String mobile; + /** + * 省 + */ + private String province; + /** + * 已备人数,首次备案默认为空 + */ + private String readyStrength; + /** + * 已备车辆,首次备案默认为空 + */ + private String readyVehicle; + /** + * 备注 + */ + private String remarks; + private String sid; + /** + * 流程ID + */ + private String taskId; + /** + * 分公司 + */ + private String useOrgName; + /** + * 分公司sid + */ + private String useOrgSid; + /** + * 微信号 + */ + private String weixin; + + + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java new file mode 100644 index 0000000000..945b45c202 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java @@ -0,0 +1,205 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordDto.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDto
+ * Description: 定点企业备案 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案 数据传输对象", description = "定点企业备案 数据传输对象") +public class CrmMaintenanceenterpriseRecordDto implements Dto { + + + /** + * 客户sid + */ + private String customerSid; + /** + * 详细地址 + */ + private String address; + /** + * 车辆列表 + */ + private List carList = new ArrayList<>(); + /** + * 证件类型 + */ + private String certificateType; + /** + * 证件类型Key + */ + private String certificateTypeKey; + /** + * 市 + */ + private String city; + /** + * 对接人列表 + */ + private List contactPerson = new ArrayList<>(); + /** + * 县 + */ + private String county; + /** + * 申请人 + */ + private String createByName; + /** + * 申请人sid + */ + private String createBySid; + /** + * 分公司 + */ + private String createOrgName; + /** + * 分公司sid + */ + private String createOrgSid; + /** + * 申请日期 + */ + private String createTime; + /** + * 客户名称 + */ + private String customerName; + /** + * 客户类型 + */ + private String customerType; + /** + * 客户类型Key + */ + private String customerTypeKey; + /** + * 申请部门 + */ + private String deptName; + /** + * 申请部门sid + */ + private String deptSid; + /** + * 电子邮箱 + */ + private String eMail; + /** + * 紧急联系人 + */ + private String emergencyContact; + /** + * 紧急联系电话 + */ + private String emergencyMobile; + /** + * 证书有效期 + */ + private String endDate; + /** + * 附件 + */ + private List files = new ArrayList<>(); + /** + * 备案有效期 + */ + private String filingIndate; + /** + * 备案类别,默认赋值"首次" + */ + private String filingType; + /** + * 证书号码 + */ + private String idnumber; + /** + * 流程实例ID + */ + private String instanceId; + /** + * 联系电话 + */ + private String mobile; + /** + * 省 + */ + private String province; + /** + * 已备人数,首次备案默认为空 + */ + private String readyStrength; + /** + * 已备车辆,首次备案默认为空 + */ + private String readyVehicle; + /** + * 备注 + */ + private String remarks; + private String sid; + /** + * 流程ID + */ + private String taskId; + /** + * 分公司 + */ + private String useOrgName; + /** + * 分公司sid + */ + private String useOrgSid; + /** + * 微信号 + */ + private String weixin; + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java new file mode 100644 index 0000000000..6f7feb5b33 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeign.java @@ -0,0 +1,128 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable.*; +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 io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordFeign.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeign
+ * Description: 定点企业备案.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业备案") +@FeignClient( + contextId = "crm-CrmMaintenanceenterpriseRecord", + name = "crm", + path = "v1/maintenanceEnterprise", + fallback = CrmMaintenanceenterpriseRecordFeignFallback.class) +public interface CrmMaintenanceenterpriseRecordFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody CrmMaintenanceenterpriseRecordDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("新增初始化") + @GetMapping("/init") + @ResponseBody + public ResultBean init(@RequestParam("sid") String sid); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + +// //------------------------------流程接口---------------------------------------------- +// +// @ApiOperation("提交") +// @PostMapping("/submit") +// public ResultBean submitRecordApplication(@RequestBody @Valid SubmitEnterpriseDto dto); +// +// @ApiOperation(value = "办理(同意)") +// @PostMapping("/complete") +// public ResultBean complete(@Valid @RequestBody EnterpriseCompleteDto dto); +// +// @ApiOperation(value = "撤回流程") +// @PostMapping(value = "/revokeProcess") +// public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody EnterpriseTaskQuery query); +// +// @ApiOperation(value = "驳回任务") +// @PostMapping(value = "/reject") +// public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody EnterpriseTaskQuery query); +// +// @ApiOperation(value = "终止任务") +// @PostMapping(value = "/breakProcess") +// public ResultBean breakProcess(@RequestBody EnterpriseTaskQuery query); +// +// @ApiOperation(value = "流程历史流转记录") +// @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") +// public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); +// +// @ApiOperation(value = "获取下一个环节") +// @GetMapping(value = "/getNextNodesForSubmit") +// ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap EnterpriseNodeQuery query); +// +// @ApiOperation(value = "获取上一个环节") +// @GetMapping(value = "/getPreviousNodesForReject") +// ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap EnterpriseNodeQuery query); +// +// @ApiOperation(value = "加签") +// @PostMapping(value = "/delegate") +// public ResultBean delegate(@RequestBody EnterpriseDelegateQuery query); + + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java new file mode 100644 index 0000000000..69e140d60a --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordFeignFallback.java @@ -0,0 +1,123 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable.*; +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: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordFeignFallback.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeignFallback
+ * Description: 定点企业备案.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class CrmMaintenanceenterpriseRecordFeignFallback implements CrmMaintenanceenterpriseRecordFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口crm/crmmaintenanceenterpriserecord/listPage无法访问"); + } + + @Override + public ResultBean save(CrmMaintenanceenterpriseRecordDto dto){ + return ResultBean.fireFail().setMsg("接口crm/crmmaintenanceenterpriserecord/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口crm/crmmaintenanceenterpriserecord/delBySids无法访问"); + } + + @Override + public ResultBean init(String sid) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口crm/crmmaintenanceenterpriserecord/fetchDetailsBySid无法访问"); + } + +// @Override +// public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { +// return null; +// } +// +// @Override +// public ResultBean complete(EnterpriseCompleteDto dto) { +// return null; +// } +// +// @Override +// public ResultBean revokeProcess(EnterpriseTaskQuery query) { +// return null; +// } +// +// @Override +// public ResultBean taskReject(EnterpriseTaskQuery query) { +// return null; +// } +// +// @Override +// public ResultBean breakProcess(EnterpriseTaskQuery query) { +// return null; +// } +// +// @Override +// public ResultBean flowRecord(String procInsId) { +// return null; +// } +// +// @Override +// public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { +// return null; +// } +// +// @Override +// public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { +// return null; +// } +// +// @Override +// public ResultBean delegate(EnterpriseDelegateQuery query) { +// return null; +// } +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordQuery.java new file mode 100644 index 0000000000..0118a36979 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordQuery.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordQuery.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordQuery
+ * Description: 定点企业备案 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案 查询条件", description = "定点企业备案 查询条件") +public class CrmMaintenanceenterpriseRecordQuery implements Query { + + private String billNo; + private String closingDateEnd; + private String closingDateStart; + private String createByName; + private String createEndTime; + private String createOrgName; + private String createStartTime; + private String customerName; + private String customerTypeKey; + private String deptName; + private String menuUrl; + private String mobile; + private String orgPath; + /** + * 是否有效 1是0否 + */ + private String state; + private String userSid; + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordVo.java new file mode 100644 index 0000000000..d121fb5629 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordVo.java @@ -0,0 +1,113 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordVo.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo
+ * Description: 定点企业备案 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案 视图数据对象", description = "定点企业备案 视图数据对象") +public class CrmMaintenanceenterpriseRecordVo implements Vo { + + /** + * 单据编号 + */ + private String billNo; + /** + * 办结日期 + */ + private String closingDate; + /** + * 申请人 + */ + private String createByName; + /** + * 申请日期 + */ + private String createTime; + /** + * 客户名称 + */ + private String customerName; + /** + * 客户类型 + */ + private String customerTypeValue; + /** + * 申请部门 + */ + private String deptName; + /** + * 备案有效期 + */ + private String filingIndate; + /** + * 备案有效期是否已过,1是0否 + */ + private String isFilingIndate; + /** + * 联系电话 + */ + private String mobile; + /** + * 流程状态 + */ + private String nodeState; + /** + * 流程定义ID + */ + private String procDefId; + /** + * 流程实例ID + */ + private String procInstId; + private String sid; + /** + * 分公司 + */ + private String useOrgName; + @ApiModelProperty("备案类别") + private String filingType; // 备案类别 +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/FileQueryUrl.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/FileQueryUrl.java new file mode 100644 index 0000000000..2672eb1aea --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/FileQueryUrl.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 14:35 + */ +@Data +public class FileQueryUrl { + + private String url; + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/PersonListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/PersonListVo.java new file mode 100644 index 0000000000..e0a10a309b --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/PersonListVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 14:42 + */ +@Data +public class PersonListVo { + + /** + * 手机号码 + */ + private String mobile; + /** + * 姓名 + */ + private String name; + /** + * 备注 + */ + private String remarks; + private String sid; + + @ApiModelProperty("对接人员sid") + private String personSid; // 对接人员sid + + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseCompleteDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseCompleteDto.java new file mode 100644 index 0000000000..ca2cddf8e4 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseCompleteDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 14:57 + * @Description + */ +@Data +public class EnterpriseCompleteDto implements Dto { + private static final long serialVersionUID = 6378752532534735663L; + + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + @ApiModelProperty(value = "流程id(PC)") + private String instanceId; + @ApiModelProperty(value = "流程id(移动)") + private String procInsId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + + private String orgPath; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseDelegateQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseDelegateQuery.java new file mode 100644 index 0000000000..4bb1e673af --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseDelegateQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class EnterpriseDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; + + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseNodeQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseNodeQuery.java new file mode 100644 index 0000000000..4c837a3e40 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:04 + * @Description + */ +@Data +public class EnterpriseNodeQuery implements Query { + private static final long serialVersionUID = 9117613683840483366L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + private Integer next; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseNodeVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseNodeVo.java new file mode 100644 index 0000000000..70ff8b856a --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseNodeVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:03 + * @Description + */ +@Data +public class EnterpriseNodeVo implements Vo { + private static final long serialVersionUID = -833419512294877848L; + + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseTaskQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseTaskQuery.java new file mode 100644 index 0000000000..ae4e5fa676 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/EnterpriseTaskQuery.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:06 + * @Description + */ +@Data +public class EnterpriseTaskQuery implements Query { + private static final long serialVersionUID = 1288615499873178778L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id(PC)") + private String instanceId; + + @ApiModelProperty("流程实例Id(移动)") + private String procInsId; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/SubmitEnterpriseDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/SubmitEnterpriseDto.java new file mode 100644 index 0000000000..0a469aa4d7 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/flowable/SubmitEnterpriseDto.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable; + +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/13 + */ +@ApiModel("提交") +@Data +public class SubmitEnterpriseDto extends CrmMaintenanceenterpriseRecordDto { + + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVeh.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVeh.java new file mode 100644 index 0000000000..51a087f395 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVeh.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVeh.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh
+ * Description: 定点企业备案-车辆信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-车辆信息", description = "定点企业备案-车辆信息") +@TableName("crm_maintenanceenterprise_veh") +public class CrmMaintenanceenterpriseVeh extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid + @ApiModelProperty("车牌号") + private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("购车日期") + private Date buyDate; // 购车日期 + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehDetailsVo.java new file mode 100644 index 0000000000..c86786516e --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehDetailsVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVehVo.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo
+ * Description: 定点企业备案-车辆信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-车辆信息 视图数据详情", description = "定点企业备案-车辆信息 视图数据详情") +public class CrmMaintenanceenterpriseVehDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid + @ApiModelProperty("车牌号") + private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("购车日期") + private Date buyDateStart; // 购车日期 + private Date buyDateEnd; // 购车日期 + +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehDto.java new file mode 100644 index 0000000000..8007d43c91 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehDto.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVehDto.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehDto
+ * Description: 定点企业备案-车辆信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-车辆信息 数据传输对象", description = "定点企业备案-车辆信息 数据传输对象") +public class CrmMaintenanceenterpriseVehDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid + @ApiModelProperty("车牌号") + private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("购车日期") + private Date buyDateStart; // 购车日期 + private Date buyDateEnd; // 购车日期 + +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java new file mode 100644 index 0000000000..476bef0291 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVehFeign.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehFeign
+ * Description: 定点企业备案-车辆信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业备案-车辆信息") +@FeignClient( + contextId = "crm-CrmMaintenanceenterpriseVeh", + name = "crm", + path = "v1/crmmaintenanceenterpriseveh", + fallback = CrmMaintenanceenterpriseVehFeignFallback.class) +public interface CrmMaintenanceenterpriseVehFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody CrmMaintenanceenterpriseVehDto 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-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeignFallback.java new file mode 100644 index 0000000000..e8e36a03dd --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVehFeignFallback.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehFeignFallback
+ * Description: 定点企业备案-车辆信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class CrmMaintenanceenterpriseVehFeignFallback implements CrmMaintenanceenterpriseVehFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口crm/crmmaintenanceenterpriseveh/listPage无法访问"); + } + + @Override + public ResultBean save(CrmMaintenanceenterpriseVehDto dto){ + return ResultBean.fireFail().setMsg("接口crm/crmmaintenanceenterpriseveh/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口crm/crmmaintenanceenterpriseveh/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口crm/crmmaintenanceenterpriseveh/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehQuery.java new file mode 100644 index 0000000000..a68981d531 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehQuery.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVehQuery.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehQuery
+ * Description: 定点企业备案-车辆信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-车辆信息 查询条件", description = "定点企业备案-车辆信息 查询条件") +public class CrmMaintenanceenterpriseVehQuery implements Query { + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid + @ApiModelProperty("车牌号") + private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("购车日期") + private Date buyDateStart; // 购车日期 + private Date buyDateEnd; // 购车日期 + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehVo.java new file mode 100644 index 0000000000..b403c224a4 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh; + + +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: crm(crm)
+ * File: CrmMaintenanceenterpriseVehVo.java
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo
+ * Description: 定点企业备案-车辆信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "定点企业备案-车辆信息 视图数据对象", description = "定点企业备案-车辆信息 视图数据对象") +public class CrmMaintenanceenterpriseVehVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("定点企业备案sid") + private String billSid; // 定点企业备案sid + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid + @ApiModelProperty("车牌号") + private String vehMark; // 车牌号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("购车日期") + private Date buyDateStart; // 购车日期 + private Date buyDateEnd; // 购车日期 + +} diff --git a/anrui-crm/anrui-crm-biz/pom.xml b/anrui-crm/anrui-crm-biz/pom.xml index 4d80363a9e..f3e0299fde 100644 --- a/anrui-crm/anrui-crm-biz/pom.xml +++ b/anrui-crm/anrui-crm-biz/pom.xml @@ -15,6 +15,17 @@ 0.0.1 + + com.yxt.messagecenter + message-center-api + 0.0.1-SNAPSHOT + + + com.yxt.anrui + anrui-flowable-api + 0.0.1-SNAPSHOT + compile + com.yxt yxt-common-base diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java index acb993ad2d..6de6af8bb5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; }) @EnableScheduling @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin","com.yxt.anrui.crm.fegin.as"}) public class CrmApplication { public static void main(String[] args) { diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index a83a9a5349..398a315483 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -310,7 +310,15 @@ + SELECT * FROM crm_docking_people ${ew.sqlSegment} + + + +
\ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleRest.java new file mode 100644 index 0000000000..958eabbfa5 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmdockingpeople; + +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.crm.api.crmdockingpeople.CrmDockingPeople; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleQuery; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleDetailsVo; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleDto; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleFeign; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeopleFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleRest
+ * Description: 定点企业对接人信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业对接人信息") +@RestController("com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleRest") +@RequestMapping("v1/crmdockingpeople") +public class CrmDockingPeopleRest implements CrmDockingPeopleFeign { + + @Autowired + private CrmDockingPeopleService crmDockingPeopleService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = crmDockingPeopleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody CrmDockingPeopleDto dto){ + ResultBean rb = ResultBean.fireFail(); + crmDockingPeopleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + crmDockingPeopleService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + CrmDockingPeopleDetailsVo vo = crmDockingPeopleService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java new file mode 100644 index 0000000000..c412ad8c3f --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java @@ -0,0 +1,110 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmdockingpeople; + +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.crm.api.crmdockingpeople.CrmDockingPeople; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleQuery; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleDetailsVo; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleDto; +import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-crm(crm)
+ * File: CrmDockingPeopleService.java
+ * Class: com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleService
+ * Description: 定点企业对接人信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 17:21:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class CrmDockingPeopleService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(CrmDockingPeopleQuery 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) { + CrmDockingPeopleQuery 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(CrmDockingPeopleDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(CrmDockingPeopleDto dto){ + CrmDockingPeople entity = new CrmDockingPeople(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(CrmDockingPeopleDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + CrmDockingPeople entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public CrmDockingPeopleDetailsVo fetchDetailsVoBySid(String sid){ + CrmDockingPeople entity = fetchBySid(sid); + CrmDockingPeopleDetailsVo vo = new CrmDockingPeopleDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java new file mode 100644 index 0000000000..3368a72f6b --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson; + +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 com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmPersonListVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo; + +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonMapper.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonMapper
+ * Description: 定点企业备案-对接人员.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface CrmMaintenanceenterprisePersonMapper extends BaseMapper { + + //@Update("update crm_maintenanceenterprise_person 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 crm_maintenanceenterprise_person") + List selectListVo(); + + @Delete("delete from crm_maintenanceenterprise_person where billSid = #{sid}") + void delByBillSid(String sid); + @Select("select * from crm_maintenanceenterprise_person where billSid = #{sid} ") + List selByBillSid(String sid); + + @Select("select * from crm_maintenanceenterprise_person where billSid = #{sid}") + List personList(String sid); +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.xml new file mode 100644 index 0000000000..97d7be29e7 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java new file mode 100644 index 0000000000..aa15dfdea4 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson; + +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.*; +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; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonRest
+ * Description: 定点企业备案-对接人员.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业备案-对接人员") +@RestController("com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonRest") +@RequestMapping("v1/crmmaintenanceenterpriseperson") +public class CrmMaintenanceenterprisePersonRest implements CrmMaintenanceenterprisePersonFeign { + + @Autowired + private CrmMaintenanceenterprisePersonService crmMaintenanceenterprisePersonService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = crmMaintenanceenterprisePersonService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody CrmMaintenanceenterprisePersonDto dto){ + ResultBean rb = ResultBean.fireFail(); + crmMaintenanceenterprisePersonService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + crmMaintenanceenterprisePersonService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + CrmMaintenanceenterprisePersonDetailsVo vo = crmMaintenanceenterprisePersonService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> personList(String sid) { + ResultBean rb = ResultBean.fireFail(); + List list = crmMaintenanceenterprisePersonService.personList(sid); + return rb.success().setData(list); + } +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java new file mode 100644 index 0000000000..447c846944 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java @@ -0,0 +1,120 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson; + +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.crm.api.crmcustomertemp.AsCustomerListVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.*; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +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.stereotype.Service; + +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterprisePersonService.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonService
+ * Description: 定点企业备案-对接人员 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class CrmMaintenanceenterprisePersonService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(CrmMaintenanceenterprisePersonQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public void delByBillSid(String sid) { + baseMapper.delByBillSid(sid); + } + + + public List selByBillSid(String sid) { + return baseMapper.selByBillSid(sid); + } + + public PagerVo listPageVo(PagerQuery pq) { + CrmMaintenanceenterprisePersonQuery 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(CrmMaintenanceenterprisePersonDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(CrmMaintenanceenterprisePersonDto dto){ + CrmMaintenanceenterprisePerson entity = new CrmMaintenanceenterprisePerson(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(CrmMaintenanceenterprisePersonDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + CrmMaintenanceenterprisePerson entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public CrmMaintenanceenterprisePersonDetailsVo fetchDetailsVoBySid(String sid){ + CrmMaintenanceenterprisePerson entity = fetchBySid(sid); + CrmMaintenanceenterprisePersonDetailsVo vo = new CrmMaintenanceenterprisePersonDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List personList(String sid) { + return baseMapper.personList(sid); + } +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java new file mode 100644 index 0000000000..e32e301add --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord; + +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 com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.PersonListVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecord; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo; + +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordMapper.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordMapper
+ * Description: 定点企业备案.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface CrmMaintenanceenterpriseRecordMapper extends BaseMapper { + + //@Update("update crm_maintenanceenterprise_record 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 crm_maintenanceenterprise_record") + List selectListVo(); + + List selPersonList(@Param("sid") String sid); + + int selectNum(String bill); + + int selPersonCount(@Param("customerSid") String customerSid); + + int selectBySid(String join); +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml new file mode 100644 index 0000000000..44fedd5b90 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java new file mode 100644 index 0000000000..eb8bd715d0 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java @@ -0,0 +1,157 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable.*; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*; +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.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecord; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordQuery; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDetailsVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDto; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeign; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordRest
+ * Description: 定点企业备案.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业备案") +@RestController("com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordRest") +@RequestMapping("v1/maintenanceEnterprise") +public class CrmMaintenanceenterpriseRecordRest implements CrmMaintenanceenterpriseRecordFeign { + + @Autowired + private CrmMaintenanceenterpriseRecordService crmMaintenanceenterpriseRecordService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = crmMaintenanceenterpriseRecordService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody CrmMaintenanceenterpriseRecordDto dto){ + ResultBean rb = ResultBean.fireFail(); + crmMaintenanceenterpriseRecordService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + return crmMaintenanceenterpriseRecordService.deleteBySids(sids); + } + + @Override + public ResultBean init(String sid) { + return crmMaintenanceenterpriseRecordService.init(sid); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + CrmMaintenanceenterpriseRecordDetailsVo vo = crmMaintenanceenterpriseRecordService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + +// @Override +// public ResultBean submitRecordApplication(SubmitEnterpriseDto dto) { +// return crmMaintenanceenterpriseRecordService.submitRecordApplication(dto); +// } +// +// @Override +// public ResultBean complete(EnterpriseCompleteDto dto) { +// BusinessVariables bv = new BusinessVariables(); +// BeanUtil.copyProperties(dto, bv); +// bv.setModelId(ProcDefEnum.ENTERPRISEAPPLY.getProDefId()); +// return crmMaintenanceenterpriseRecordService.complete(bv); +// } +// +// @Override +// public ResultBean revokeProcess(EnterpriseTaskQuery query) { +// return crmMaintenanceenterpriseRecordService.revokeProcess(query); +// } +// +// @Override +// public ResultBean taskReject(EnterpriseTaskQuery query) { +// return crmMaintenanceenterpriseRecordService.taskReject(query); +// } +// +// @Override +// public ResultBean breakProcess(EnterpriseTaskQuery query) { +// return crmMaintenanceenterpriseRecordService.breakProcess(query); +// } +// +// @Override +// public ResultBean flowRecord(String procInsId) { +// return crmMaintenanceenterpriseRecordService.flowRecord(procInsId); +// } +// +// @Override +// public ResultBean> getNextNodesForSubmit(EnterpriseNodeQuery query) { +// return crmMaintenanceenterpriseRecordService.getNextNodesForSubmit(query); +// } +// +// @Override +// public ResultBean> getPreviousNodesForReject(EnterpriseNodeQuery query) { +// return crmMaintenanceenterpriseRecordService.getPreviousNodesForReject(query); +// } +// +// @Override +// public ResultBean delegate(EnterpriseDelegateQuery query) { +// return crmMaintenanceenterpriseRecordService.delegate(query); +// } +} 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 new file mode 100644 index 0000000000..5bbab40c1d --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java @@ -0,0 +1,484 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.common.enums.BillTypeEnum; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.crm.api.crmcustomertemp.AsCustomerListVo; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; +import com.yxt.anrui.crm.api.crmfile.CrmFile; +import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.*; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh; +import com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempService; +import com.yxt.anrui.crm.biz.crmfile.CrmFileService; +import com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonService; +import com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehService; +import com.yxt.anrui.crm.fegin.as.AsCustomerVehicleFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +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 javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseRecordService.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordService
+ * Description: 定点企业备案 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService { + + @Autowired + private CrmFileService crmFileService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private CrmMaintenanceenterprisePersonService crmMaintenanceenterprisePersonService; + @Autowired + private CrmMaintenanceenterpriseVehService crmMaintenanceenterpriseVehService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Resource + private AsCustomerVehicleFeign asCustomerVehicleFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private CrmCustomerTempService crmCustomerTempService; + + + private QueryWrapper createQueryWrapper(CrmMaintenanceenterpriseRecordQuery 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) { + CrmMaintenanceenterpriseRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + 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("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("a.isFilingIndate", query.getState()); + } + if (StringUtils.isNotBlank(query.getCustomerTypeKey())) { + qw.eq("a.customerTypeKey", query.getCustomerTypeKey()); + } + if (StringUtils.isNotBlank(query.getMobile())) { + qw.like("a.mobile", query.getMobile()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("a.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("a.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("a.useOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("a.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("a.customerName", query.getCustomerName()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String closingDateStart = query.getClosingDateStart(); + String closingDateEnd = query.getClosingDateEnd(); + qw.apply(StringUtils.isNotBlank(closingDateStart), "date_format (a.closingDate,'%Y-%m-%d') >= date_format('" + closingDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(closingDateEnd), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingDateEnd + "','%Y-%m-%d')" + ); + qw.orderBy(true, false, "a.createTime") + .orderBy(true, false, "a.filingIndate") + ; + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public String saveOrUpdateDto(CrmMaintenanceenterpriseRecordDto dto) { + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + crmMaintenanceenterprisePersonService.delByBillSid(sid); + crmMaintenanceenterpriseVehService.delByBillSid(sid); + crmFileService.deleteByLinkSidAndAttachType(sid, "2"); + CrmMaintenanceenterpriseRecord entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } else { + CrmMaintenanceenterpriseRecord entity = new CrmMaintenanceenterpriseRecord(); + sid = entity.getSid(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + String applyCode = getApplyCode(dto.getCreateOrgSid()); + entity.setBillNo(applyCode); + baseMapper.insert(entity); + } + if (!dto.getCarList().isEmpty()) { + List carList = dto.getCarList(); + for (CarListVo carListVo : carList) { + CrmMaintenanceenterpriseVeh veh = new CrmMaintenanceenterpriseVeh(); + BeanUtil.copyProperties(carListVo, veh, "id", "sid"); + veh.setBillSid(sid); + crmMaintenanceenterpriseVehService.insert(veh); + } + } + if (!dto.getContactPerson().isEmpty()) { + List personListVos = dto.getContactPerson(); + for (PersonListVo personListVo : personListVos) { + CrmMaintenanceenterprisePerson person = new CrmMaintenanceenterprisePerson(); + BeanUtil.copyProperties(personListVo, person, "id", "sid"); + person.setBillSid(sid); + crmMaintenanceenterprisePersonService.insert(person); + } + } + if (!dto.getFiles().isEmpty()) { + List files = dto.getFiles(); + for (FileQueryUrl url : files) { + String file = url.getUrl(); + if (file.contains(fileUploadComponent.getUrlPrefix())) { + file = file.replace(fileUploadComponent.getUrlPrefix(), ""); + } + CrmFile crmFile = new CrmFile(); + crmFile.setFilePath(file); + crmFile.setLinkSid(sid); + crmFile.setCreateBySid(dto.getCreateBySid()); + crmFile.setCreateTime(new Date()); + crmFile.setName(dto.getCreateByName()); + crmFile.setAttachType("2"); + crmFileService.save(crmFile); + } + } + return sid; + } + + + /** + * 生成申请单单据编号 + * + * @param orgSid + * @return + */ + public String getApplyCode(String orgSid) { + //获取分公司sid + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.DDQYBA.getBillType()); + String bill = Rule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; + } + + + public void insertByDto(CrmMaintenanceenterpriseRecordDto dto) { + CrmMaintenanceenterpriseRecord entity = new CrmMaintenanceenterpriseRecord(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(CrmMaintenanceenterpriseRecordDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + CrmMaintenanceenterpriseRecord entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public CrmMaintenanceenterpriseRecordDetailsVo fetchDetailsVoBySid(String sid) { + CrmMaintenanceenterpriseRecordDetailsVo vo = new CrmMaintenanceenterpriseRecordDetailsVo(); + CrmMaintenanceenterpriseRecord entity = fetchBySid(sid); + List contactPerson = new ArrayList<>(); + List carListVos = new ArrayList<>(); + List files = new ArrayList<>(); + if (null != entity) { + BeanUtil.copyProperties(entity, vo); + if (StringUtils.isNotBlank(entity.getProcInstId())) { + vo.setInstanceId(entity.getProcInstId()); + } + vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime())); + if (null != entity.getFilingIndate()) { + vo.setFilingIndate(DateUtil.formatDate(entity.getFilingIndate())); + } + CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(entity.getCustomerSid()); + if (null != customerTemp) { + if (StringUtils.isNotBlank(customerTemp.getAddress())) { + vo.setAddress(customerTemp.getAddress()); + } + if (StringUtils.isNotBlank(customerTemp.getCertificateType())) { + vo.setCertificateType(customerTemp.getCertificateType()); + } + if (StringUtils.isNotBlank(customerTemp.getCertificateTypeKey())) { + vo.setCertificateTypeKey(customerTemp.getCertificateTypeKey()); + } + if (StringUtils.isNotBlank(customerTemp.getCity())) { + vo.setCity(customerTemp.getCity()); + } + if (StringUtils.isNotBlank(customerTemp.getCounty())) { + vo.setCounty(customerTemp.getCounty()); + } + if (StringUtils.isNotBlank(customerTemp.getName())) { + vo.setCustomerName(customerTemp.getName()); + } + if (StringUtils.isNotBlank(customerTemp.getCustomerType())) { + vo.setCustomerType(customerTemp.getCustomerType()); + } + if (StringUtils.isNotBlank(customerTemp.getCustomerTypeKey())) { + vo.setCustomerTypeKey(customerTemp.getCustomerTypeKey()); + } + if (StringUtils.isNotBlank(customerTemp.getE_mail())) { + vo.setE_mail(customerTemp.getE_mail()); + } + if (StringUtils.isNotBlank(customerTemp.getEmergencyContact())) { + vo.setEmergencyContact(customerTemp.getEmergencyContact()); + } + if (StringUtils.isNotBlank(customerTemp.getEmergencyMobile())) { + vo.setEmergencyMobile(customerTemp.getEmergencyMobile()); + } + if (StringUtils.isNotBlank(customerTemp.getEndDate())) { + vo.setEndDate(customerTemp.getEndDate()); + } + if (StringUtils.isNotBlank(customerTemp.getMobile())) { + vo.setMobile(customerTemp.getMobile()); + } + if (StringUtils.isNotBlank(customerTemp.getProvince())) { + vo.setProvince(customerTemp.getProvince()); + } + if (StringUtils.isNotBlank(customerTemp.getIDNumber())) { + vo.setIdnumber(customerTemp.getIDNumber()); + } + if (StringUtils.isNotBlank(customerTemp.getWeixin())) { + vo.setWeixin(customerTemp.getWeixin()); + } + } + List personList = crmMaintenanceenterprisePersonService.selByBillSid(sid); + if (!personList.isEmpty()) { + for (CrmMaintenanceenterprisePerson person : personList) { + PersonListVo personListVo = new PersonListVo(); + BeanUtil.copyProperties(person, personListVo); + contactPerson.add(personListVo); + } + vo.setContactPerson(contactPerson); + } + List vehList = crmMaintenanceenterpriseVehService.selByBillSid(sid); + if (!vehList.isEmpty()) { + for (CrmMaintenanceenterpriseVeh veh : vehList) { + CarListVo carListVo = new CarListVo(); + BeanUtil.copyProperties(veh, carListVo); + if (null != veh.getBuyDate()) { + carListVo.setBuyDate(DateUtil.formatDate(veh.getBuyDate())); + } + carListVos.add(carListVo); + } + vo.setCarList(carListVos); + } + int personCount = baseMapper.selPersonCount(entity.getCustomerSid()); + int vehCount = asCustomerVehicleFeign.getVehListCountsByCustomerSid(entity.getCustomerSid()); + vo.setReadyStrength(String.valueOf(personCount)); + vo.setReadyVehicle(String.valueOf(vehCount)); + List crmFileDetailsVos = crmFileService.fetchByLinkSid(sid); + if (crmFileDetailsVos != null) { + for (CrmFileDetailsVo crmFileDetailsVo : crmFileDetailsVos) { + FileQueryUrl url = new FileQueryUrl(); + String filePath = crmFileDetailsVo.getFilePath(); + url.setUrl(fileUploadComponent.getUrlPrefix() + filePath); + files.add(url); + } + vo.setFiles(files); + } + } + return vo; + } + + public ResultBean init(String sid) { + ResultBean rb = ResultBean.fireFail(); + CrmMaintenanceenterpriseRecordDetailsVo vo = new CrmMaintenanceenterpriseRecordDetailsVo(); + CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(sid); + if (null != customerTemp) { + if (StringUtils.isNotBlank(customerTemp.getAddress())) { + vo.setAddress(customerTemp.getAddress()); + } + if (StringUtils.isNotBlank(customerTemp.getCertificateType())) { + vo.setCertificateType(customerTemp.getCertificateType()); + } + if (StringUtils.isNotBlank(customerTemp.getCertificateTypeKey())) { + vo.setCertificateTypeKey(customerTemp.getCertificateTypeKey()); + } + if (StringUtils.isNotBlank(customerTemp.getCity())) { + vo.setCity(customerTemp.getCity()); + } + if (StringUtils.isNotBlank(customerTemp.getCounty())) { + vo.setCounty(customerTemp.getCounty()); + } + if (StringUtils.isNotBlank(customerTemp.getName())) { + vo.setCustomerName(customerTemp.getName()); + } + if (StringUtils.isNotBlank(customerTemp.getCustomerType())) { + vo.setCustomerType(customerTemp.getCustomerType()); + } + if (StringUtils.isNotBlank(customerTemp.getCustomerTypeKey())) { + vo.setCustomerTypeKey(customerTemp.getCustomerTypeKey()); + } + if (StringUtils.isNotBlank(customerTemp.getE_mail())) { + vo.setE_mail(customerTemp.getE_mail()); + } + if (StringUtils.isNotBlank(customerTemp.getEmergencyContact())) { + vo.setEmergencyContact(customerTemp.getEmergencyContact()); + } + if (StringUtils.isNotBlank(customerTemp.getEmergencyMobile())) { + vo.setEmergencyMobile(customerTemp.getEmergencyMobile()); + } + if (StringUtils.isNotBlank(customerTemp.getEndDate())) { + vo.setEndDate(customerTemp.getEndDate()); + } + if (StringUtils.isNotBlank(customerTemp.getMobile())) { + vo.setMobile(customerTemp.getMobile()); + } + if (StringUtils.isNotBlank(customerTemp.getProvince())) { + vo.setProvince(customerTemp.getProvince()); + } + if (StringUtils.isNotBlank(customerTemp.getIDNumber())) { + vo.setIdnumber(customerTemp.getIDNumber()); + } + if (StringUtils.isNotBlank(customerTemp.getWeixin())) { + vo.setWeixin(customerTemp.getWeixin()); + } + //获取当前日期 + LocalDateTime now = LocalDateTime.now(); + //加一年 + LocalDateTime afterOneYear = now.plusYears(1); + //格式化输出 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + vo.setFilingIndate(afterOneYear.format(formatter)); + vo.setCustomerSid(sid); + vo.setReadyStrength(""); + vo.setReadyVehicle(""); + vo.setFilingType("首次"); + List contactPerson = baseMapper.selPersonList(customerTemp.getSid()); + if (!contactPerson.isEmpty()) { + vo.setContactPerson(contactPerson); + } + List carListVos = asCustomerVehicleFeign.getVehListByCustomerSid(customerTemp.getSid()).getData(); + if (!carListVos.isEmpty()) { + vo.setCarList(carListVos); + } + } + return rb.success().setData(vo); + } + + public ResultBean deleteBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败"); + } + delBySids(sids); + for (String sid : sids) { + crmMaintenanceenterprisePersonService.delByBillSid(sid); + crmMaintenanceenterpriseVehService.delByBillSid(sid); + crmFileService.deleteByLinkSidAndAttachType(sid, "2"); + } + return rb.success(); + } +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java new file mode 100644 index 0000000000..3dae25b19a --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh; + +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.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo; + +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseVehMapper.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehMapper
+ * Description: 定点企业备案-车辆信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface CrmMaintenanceenterpriseVehMapper extends BaseMapper { + + //@Update("update crm_maintenanceenterprise_veh 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 crm_maintenanceenterprise_veh") + List selectListVo(); + + @Delete("delete from crm_maintenanceenterprise_veh where billSid = #{sid}") + void delByBillSid(String sid); + @Select("select * from crm_maintenanceenterprise_veh where billSid = #{sid} ") + List selByBillSid(String sid); +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.xml new file mode 100644 index 0000000000..c559b320f2 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehRest.java new file mode 100644 index 0000000000..882354e159 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh; + +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.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehQuery; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehDetailsVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehDto; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehFeign; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseVehFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehRest
+ * Description: 定点企业备案-车辆信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "定点企业备案-车辆信息") +@RestController("com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehRest") +@RequestMapping("v1/crmmaintenanceenterpriseveh") +public class CrmMaintenanceenterpriseVehRest implements CrmMaintenanceenterpriseVehFeign { + + @Autowired + private CrmMaintenanceenterpriseVehService crmMaintenanceenterpriseVehService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = crmMaintenanceenterpriseVehService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody CrmMaintenanceenterpriseVehDto dto){ + ResultBean rb = ResultBean.fireFail(); + crmMaintenanceenterpriseVehService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + crmMaintenanceenterpriseVehService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + CrmMaintenanceenterpriseVehDetailsVo vo = crmMaintenanceenterpriseVehService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehService.java new file mode 100644 index 0000000000..dc46b102ed --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehService.java @@ -0,0 +1,120 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh; + +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.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson; +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.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehQuery; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehDetailsVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehDto; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: crm(crm)
+ * File: CrmMaintenanceenterpriseVehService.java
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehService
+ * Description: 定点企业备案-车辆信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-22 13:49:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class CrmMaintenanceenterpriseVehService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(CrmMaintenanceenterpriseVehQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public void delByBillSid(String sid) { + baseMapper.delByBillSid(sid); + } + + + public List selByBillSid(String sid) { + return baseMapper.selByBillSid(sid); + } + + public PagerVo listPageVo(PagerQuery pq) { + CrmMaintenanceenterpriseVehQuery 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(CrmMaintenanceenterpriseVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(CrmMaintenanceenterpriseVehDto dto){ + CrmMaintenanceenterpriseVeh entity = new CrmMaintenanceenterpriseVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(CrmMaintenanceenterpriseVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + CrmMaintenanceenterpriseVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public CrmMaintenanceenterpriseVehDetailsVo fetchDetailsVoBySid(String sid){ + CrmMaintenanceenterpriseVeh entity = fetchBySid(sid); + CrmMaintenanceenterpriseVehDetailsVo vo = new CrmMaintenanceenterpriseVehDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java new file mode 100644 index 0000000000..14988ede70 --- /dev/null +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/fegin/as/AsCustomerVehicleFeign.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.crm.fegin.as; + +import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CarListVo; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @description: 客户车辆信息 + * @author: fzz + * @date: 2024/3/7 + **/ +@FeignClient( + contextId = "yxt-as-AsCustomerVehicle", + name = "yxt-as", + path = "v1/ascustomervehicle" +) +public interface AsCustomerVehicleFeign { + @ApiOperation("根据客户sid查询车辆") + @GetMapping("/getVehListByCustomerSid") + public ResultBean> getVehListByCustomerSid(@RequestParam("customerSid") String customerSid); + + + @ApiOperation("根据客户sid查询车辆数量") + @GetMapping("/getVehListCountsByCustomerSid") + public int getVehListCountsByCustomerSid(@RequestParam("customerSid") String customerSid); +} diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 3ca6d1a73b..dd6514ff26 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -82,6 +82,7 @@ public enum ProcDefEnum { LOANCASECLOSEAPPLY("案件结案申请", "process_llaxpwkd:1:8220008"), LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"), LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"), + ENTERPRISEAPPLY("定点企业备案", ""), /******************************测试流程id*********************************************/ diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index d053f64966..18fda29e5a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -203,5 +203,5 @@ public interface SysOrganizationFeign { @GetMapping("/selectByOrgCodeAndPsid") @ResponseBody @ApiOperation("根据code查询组织信息") - ResultBean selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid); + ResultBean> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index fa3d1c82f9..86da604ebc 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -203,7 +203,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { } @Override - public ResultBean selectByOrgCodeAndPsid(String orgCode, String pSid) { + public ResultBean> selectByOrgCodeAndPsid(String orgCode, String pSid) { return null; } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 1b95a4f072..b869be61a3 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -129,5 +129,5 @@ public interface SysOrganizationMapper extends BaseMapper { List selectByOrgDeptSid2(String orgDeptSid); - SysOrganization selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); + List selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 7156bae3d0..8713261da6 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -468,9 +468,9 @@ public class SysOrganizationRest implements SysOrganizationFeign { } @Override - public ResultBean selectByOrgCodeAndPsid(String orgCode, String pSid) { + public ResultBean> selectByOrgCodeAndPsid(String orgCode, String pSid) { ResultBean rb = ResultBean.fireFail(); - SysOrganization sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); + List sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid); return rb.success().setData(sysOrganization); } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index ebc7cb0946..4776975b27 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -716,7 +716,7 @@ public class SysOrganizationService extends MybatisBaseService selectByOrgCodeAndPsid(String orgCode, String pSid) { return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid); } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java index 2a8f7bd3dc..a6b37872e2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ImportSleepData.java @@ -40,4 +40,6 @@ public class ImportSleepData { private String loanContractNo; private String bankName; private String salesOrderSid; + private String customerSid; + private String customer; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 1f39d29e4e..8e7e764f36 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -5038,7 +5038,11 @@ public class LoanRepaymentScheduleService extends MybatisBaseService orgDepts = sysOrganizationFeign.selectByOrgCodeAndPsid(salesDeptNo, useOrgSid).getData(); + SysOrganization orgDept = null; + if (!orgDepts.isEmpty() && orgDepts.size() > 0) { + orgDept = orgDepts.get(0); + } if (orgDept != null) { deptSid = orgDept.getSid(); deptName = orgDept.getName(); @@ -5196,6 +5200,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService { const res = response.data - if(res.type !=undefined){ - return res - } + if (res.type != undefined) { + return res + } // if the custom code is not 20000, it is judged as an error. if (res.code != 200) { if (res.msg == "请重新登录") { diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue index 9f7970ca3e..c7d0989a71 100644 --- a/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue +++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue @@ -26,14 +26,14 @@
* 操作人
- {{formobj.createByName}} + {{ formobj.createByName }}
* 操作部门
- {{formobj.deptName}} + {{ formobj.deptName }}
@@ -51,8 +51,13 @@
* 领料人
- + @@ -77,14 +82,14 @@
维修工单编号
- {{formobj.sourceBillNo}} + {{ formobj.sourceBillNo }}
单据日期
- {{formobj.billDate}} + {{ formobj.billDate }}
@@ -101,21 +106,21 @@
工单类型
- {{formobj.billType}} + {{ formobj.billType }}
科目
- {{formobj.subject}} + {{ formobj.subject }}
是否外出
- + @@ -128,14 +133,14 @@
客户名称
- {{formobj.customerName}} + {{ formobj.customerName }}
车牌号/车架号
- {{formobj.vehMark}}/{{formobj.vinNo}} + {{ formobj.vehMark }}/{{ formobj.vinNo }}
@@ -178,8 +183,12 @@
前台登记时对商品要求备注
- +
@@ -197,7 +206,10 @@ @@ -233,8 +253,12 @@ @@ -257,399 +281,385 @@ diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue new file mode 100644 index 0000000000..7c4429543e --- /dev/null +++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue @@ -0,0 +1,374 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue new file mode 100644 index 0000000000..477beecf2d --- /dev/null +++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue @@ -0,0 +1,271 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue new file mode 100644 index 0000000000..57ec6d889f --- /dev/null +++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue @@ -0,0 +1,352 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue new file mode 100644 index 0000000000..d12d9ed218 --- /dev/null +++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/CarListVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/CarListVo.java new file mode 100644 index 0000000000..f72c359b76 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/CarListVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.as.api.ascustomervehicle; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 14:42 + */ +@Data +public class CarListVo { + + /** + * 购买日期 + */ + private String buyDate; + private String sid; + /** + * 车牌号 + */ + private String vehMark; + /** + * 车架号 + */ + private String vinNo; + @ApiModelProperty("售后客户车辆信息sid") + private String asVinSid; // 售后客户车辆信息sid +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java index 907ebe7c41..dd9d37bcf1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerCrmVehVo; import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicle; import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicleVo; +import com.yxt.anrui.as.api.ascustomervehicle.CarListVo; import org.apache.ibatis.annotations.*; import java.util.List; @@ -72,4 +73,8 @@ public interface AsCustomerVehicleMapper extends BaseMapper { void delBySid(@Param("sid") String sid); IPage customerList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + List getVehListByCustomerSid(@Param("customerSid") String customerSid); + + int getVehListCountsByCustomerSid(@Param("customerSid") String customerSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml index b71d80cf85..1b910e5a4d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml @@ -41,4 +41,18 @@ LEFT JOIN anrui_portal.sys_organization AS s ON c.createOrgSid = s.sid ${ew.sqlSegment} + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java index 9b9e26ca77..08cddffc01 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java @@ -135,4 +135,21 @@ public class AsCustomerVehicleRest{ public ResultBean quickAddSave(@RequestBody QuickAddCustomer dto){ return asCustomerVehicleService.quickAddSave(dto); } + + @ApiOperation("根据客户sid查询车辆") + @GetMapping("/getVehListByCustomerSid") + public ResultBean> getVehListByCustomerSid(@RequestParam("customerSid") String customerSid){ + ResultBean rb = ResultBean.fireFail(); + List list = asCustomerVehicleService.getVehListByCustomerSid(customerSid); + return rb.success().setData(list); + } + + + @ApiOperation("根据客户sid查询车辆数量") + @GetMapping("/getVehListCountsByCustomerSid") + public int getVehListCountsByCustomerSid(@RequestParam("customerSid") String customerSid){ + int i = asCustomerVehicleService.getVehListCountsByCustomerSid(customerSid); + return i; + } + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java index 09e86ebbde..dc8829bd48 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java @@ -263,4 +263,12 @@ public class AsCustomerVehicleService extends MybatisBaseService getVehListByCustomerSid(String customerSid) { + return baseMapper.getVehListByCustomerSid(customerSid); + } + + public int getVehListCountsByCustomerSid(String customerSid) { + return baseMapper.getVehListCountsByCustomerSid(customerSid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java index 63775c838a..a1e8a94e7f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/28 8:59 @@ -32,6 +34,12 @@ public class WmsWarehouseRackRest { return wmsWarehouseRackService.getAllType(); } + @ApiOperation("根据库区sid查询所有库位") + @GetMapping("/getAllTypeByAreaSid") + public ResultBean> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) { + return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid); + } + @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index f3fc1e37e2..4ca25de69a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -67,11 +68,33 @@ public class WmsInventoryCheckbillRest { @ApiOperation("新建盘点单") @PostMapping("/save") public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){ + return wmsInventoryCheckbillService.saveOrUpdateDto(dto); + } + + @ApiOperation("生成盘点报告") + @PostMapping("/createReport") + public ResultBean createReport(@RequestParam("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillService.saveOrUpdateDto(dto); + wmsInventoryCheckbillService.createReport(sid); return rb.success(); } + @ApiOperation("查看盘点报告") + @PostMapping("/viewReport") + public ResultBean viewReport(@RequestParam("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid); + return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo); + } + + @ApiOperation("生成盘点报告PDF") + @PostMapping("/createPdf") + public ResultBean createPdf(@RequestParam("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + String url = wmsInventoryCheckbillService.createPdf(sid); + return rb.success().success().setData(url); + } + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ @@ -93,4 +116,12 @@ public class WmsInventoryCheckbillRest { PagerVo pv = wmsInventoryCheckbillService.detailGoodPageList(pq); return rb.success().setData(pv); } + + @ApiOperation("查看库区商品盘点列表") + @PostMapping("/detailRackGoodPageList") + public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq); + return rb.success().setData(pv); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java index 9de677c40a..56f4338ad5 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java @@ -25,4 +25,6 @@ public interface WmsWarehouseRackMapper extends BaseMapper { WmsWarehouseRack checkForUpdate(@Param("rackCode")String rackCode,@Param("locationSid") String locationSid, @Param("sid")String sid); WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode); + + List getAllTypeByAreaSid(String areaSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml index 3acefd0267..2792cefa18 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml @@ -47,4 +47,12 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} and isDelete=0 + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java index 1ee9ad2122..60c85d940b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java @@ -209,4 +209,10 @@ public class WmsWarehouseRackService extends MybatisBaseService> getAllTypeByAreaSid(String areaSid) { + ResultBean rb = ResultBean.fireFail(); + List wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid); + return rb.success().setData(wmsWarehouseRackVos); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index c68bb51590..514559e216 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -31,10 +31,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -59,6 +61,8 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper detailRackPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); IPage detailGoodPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + IPage detailRackGoodPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @@ -68,4 +72,11 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper SELECT + billSid, warehouseName, warehouseArea, + warehouseRackSid, warehouseRackName, SUM(bookCount) AS bookCount, SUM(bookCount) * cost AS bookAmount, @@ -114,7 +118,57 @@ wms_inventory_checkbill_detail ${ew.sqlSegment} - + + + @@ -133,4 +187,14 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 046121926f..00102d71c3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.DocPdfComponent; +import com.yxt.common.base.utils.WordConvertUtils; import com.yxt.common.core.result.ResultBean; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService; @@ -38,7 +40,7 @@ import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; -import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportService; +import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; @@ -54,7 +56,9 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.io.File; +import java.io.InputStream; +import java.util.*; /** * Project: yxt-wms(仓储)
@@ -90,6 +94,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryCheckbillQuery query = pq.getParams(); @@ -164,7 +170,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailRackPageList(PagerQuery pq) { WmsInventoryCheckbillDetailRackPageListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("billSid",query.getBillSid()); + qw.eq("billSid", query.getBillSid()); if (StringUtils.isNotBlank(query.getWarehouseSid())) { qw.eq("warehouseSid", query.getWarehouseSid()); } @@ -184,7 +190,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailGoodPageList(PagerQuery pq) { WmsInventoryCheckbillDetailGoodPageListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("billSid",query.getBillSid()); + qw.eq("billSid", query.getBillSid()); if (StringUtils.isNotBlank(query.getWarehouseSid())) { qw.eq("warehouseSid", query.getWarehouseSid()); } @@ -195,13 +201,13 @@ public class WmsInventoryCheckbillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.detailGoodPageList(page, qw); @@ -209,7 +215,32 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailRackGoodPageList(PagerQuery pq) { + WmsInventoryCheckbillDetailRackGoodPageListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("billSid", query.getBillSid()); + qw.eq("warehouseRackSid", query.getWarehouseRackSid()); + if (StringUtils.isNotBlank(query.getGoodsID())) { + qw.like("goodsID", query.getGoodsID()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) { + qw.like("goodsSkuTitle", query.getGoodsSkuTitle()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("goodsSkuCode", query.getGoodsSkuCode()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.detailRackGoodPageList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(WmsInventoryCheckbillDto dto) { + ResultBean rb = ResultBean.fireFail(); + String nodeState = baseMapper.checkState(dto.getDeptSid()); + if (!"已办结".equals(nodeState)) { + return rb.setMsg("存在盘点中数据,无法生成新的盘点单"); + } SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(dto.getDeptSid()).getData(); String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData(); @@ -249,7 +280,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService total = wmsInventoryCheckbillDetailService.reportSum(sid, "total"); + for (WmsInventoryCheckbillReportSumVo totalSum : total) { + wmsInventoryCheckbillReportDetailsVo.setBookCountTotal(totalSum.getBookCount()); + wmsInventoryCheckbillReportDetailsVo.setBookAmountTotal(totalSum.getBookAmount()); + wmsInventoryCheckbillReportDetailsVo.setRealCountTotal(totalSum.getRealCount()); + wmsInventoryCheckbillReportDetailsVo.setRealAmountTotal(totalSum.getRealAmount()); + wmsInventoryCheckbillReportDetailsVo.setProfitCountTotal(totalSum.getProfitCount()); + wmsInventoryCheckbillReportDetailsVo.setProfitAmountTotal(totalSum.getProfitAmount()); + wmsInventoryCheckbillReportDetailsVo.setLoseCountTotal(totalSum.getLoseCount()); + wmsInventoryCheckbillReportDetailsVo.setLoseAmountTotal(totalSum.getLoseAmount()); + } + //仓库盘点情况 + List ware = wmsInventoryCheckbillDetailService.reportSum(sid, "ware"); + wmsInventoryCheckbillReportDetailsVo.setWare(ware); + //库区盘点情况 + List area = wmsInventoryCheckbillDetailService.reportSum(sid, "area"); + wmsInventoryCheckbillReportDetailsVo.setArea(area); + return wmsInventoryCheckbillReportDetailsVo; + } + + public String createPdf(String sid) { + WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = viewReport(sid); + Map map = new HashMap<>(); + //发起人 + map.put("createName", wmsInventoryCheckbillReportDetailsVo.getCreateByName()); + //发起部门 + map.put("deptName", wmsInventoryCheckbillReportDetailsVo.getDeptName()); + //发起日期 + map.put("createTime", wmsInventoryCheckbillReportDetailsVo.getCreateTime()); + //盘点人 + map.put("pdrName", wmsInventoryCheckbillReportDetailsVo.getCreateByName()); + //监盘人 + map.put("jprName", wmsInventoryCheckbillReportDetailsVo.getSuperviseName()); + //备注 + map.put("remarks", wmsInventoryCheckbillReportDetailsVo.getRemarks()); + //总体应盘数量 + map.put("ypsl", wmsInventoryCheckbillReportDetailsVo.getBookCountTotal()); + //总体应盘金额 + map.put("ypje", wmsInventoryCheckbillReportDetailsVo.getBookAmountTotal()); + //总体实盘数量 + map.put("spsl", wmsInventoryCheckbillReportDetailsVo.getRealCountTotal()); + //总体实盘金额 + map.put("spje", wmsInventoryCheckbillReportDetailsVo.getRealAmountTotal()); + //总体盘盈数量 + map.put("pysl", wmsInventoryCheckbillReportDetailsVo.getProfitCountTotal()); + //总体盘盈金额 + map.put("pyje", wmsInventoryCheckbillReportDetailsVo.getProfitAmountTotal()); + //总体盘亏数量 + map.put("pksl", wmsInventoryCheckbillReportDetailsVo.getLoseCountTotal()); + //总体盘亏金额 + map.put("pkje", wmsInventoryCheckbillReportDetailsVo.getLoseAmountTotal()); + //总体盘损数量 + map.put("pssl", wmsInventoryCheckbillReportDetailsVo.getLossCountTotal()); + //总体盘损金额 + map.put("psje", wmsInventoryCheckbillReportDetailsVo.getLossAmountTotal()); + List ware = wmsInventoryCheckbillReportDetailsVo.getWare(); + map.put("ware", ware); + List area = wmsInventoryCheckbillReportDetailsVo.getArea(); + map.put("area", area); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "pdbg" + ".ftl"); + //生成word文件名 + String targetPath = docPdfComponent.getUploadTemplateUrl(); + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + File file = new File(targetPath + "pdbg" + seconds + ".ftl"); + File dir = new File(targetPath); + WordConvertUtils.inputStreamToFile(inputStream, file); + WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir); + //新生成的word路径 + String wordPath = targetPath + typeName; + //生成文件名 + String pdfName = map.get("num").toString() + "盘点报告_" + dateStr + seconds + ".pdf"; + WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName); + return pdfName; + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java index be3ed7fd16..1dc2fce8fc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java @@ -55,6 +55,8 @@ public class WmsInventoryCheckbillVo implements Vo { private String sid; // sid + @ApiModelProperty("是否生成盘库报告") + private String state; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("流程状态") @@ -71,7 +73,7 @@ public class WmsInventoryCheckbillVo implements Vo { @ApiModelProperty("监盘人姓名") private String superviseName; @ApiModelProperty("盘点状态(盘点中1,盘点完成2)") - private Integer checkState; + private String checkState; @ApiModelProperty("应盘数量") private BigDecimal bookCount; @@ -81,6 +83,10 @@ public class WmsInventoryCheckbillVo implements Vo { private BigDecimal realCount; @ApiModelProperty("实盘金额") private BigDecimal realAmount; + @ApiModelProperty("未盘数量") + private BigDecimal notCount; + @ApiModelProperty("未盘金额") + private BigDecimal notAmount; @ApiModelProperty("盘盈数量") private BigDecimal profitCount; @ApiModelProperty("盘盈金额") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java index 5491c360e1..891109aea8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java @@ -48,8 +48,6 @@ import lombok.Data; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailGoodPageListQuery implements Query { - private String sid; // sid - @ApiModelProperty("盘点sid") private String billSid; @ApiModelProperty("仓库sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index 053a4b78c7..bddfdf7b54 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -29,6 +29,7 @@ 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 com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -56,4 +57,10 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper selByMainSid(String billSid); + + WmsInventoryCheckbillReportSumVo reportSumTotal(String billSid); + + List reportSumWare(String billSid); + + List reportSumArea(String billSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml index a5d998d1ac..06b7c9ef72 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml @@ -17,4 +17,65 @@ ON wicd.inventorySid = wi.`sid` WHERE billSid = #{billSid} + + + + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java new file mode 100644 index 0000000000..c4f23d6908 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query { + + @ApiModelProperty("盘点sid") + private String billSid; + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java new file mode 100644 index 0000000000..177d469761 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("库位名称") + private String warehouseRackName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("成本单价") + private BigDecimal cost; + @ApiModelProperty("应盘数量") + private BigDecimal bookCount; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("实盘金额") + private BigDecimal realAmount; + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("盈亏数量") + private BigDecimal profitAndLoseCount; + @ApiModelProperty("盈亏金额") + private BigDecimal profitAndLoseAmount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; + @ApiModelProperty("盘损金额") + private BigDecimal lossAmount; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("附件") + private List fileList; +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java index 1676012049..30ae8008d8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java @@ -50,8 +50,6 @@ import java.math.BigDecimal; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailRackPageListQuery implements Query { - private String sid; // sid - @ApiModelProperty("盘点sid") private String billSid; @ApiModelProperty("仓库sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java index 05d801b831..01ab8e7fe3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java @@ -50,12 +50,14 @@ import java.math.BigDecimal; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailRackPageListVo implements Vo { - private String sid; // sid + private String billSid; @ApiModelProperty("仓库名称") private String warehouseName; @ApiModelProperty("库区名称") private String warehouseArea; + @ApiModelProperty("库位sid") + private String warehouseRackSid; @ApiModelProperty("库位名称") private String warehouseRackName; @ApiModelProperty("应盘数量") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java index 9b422c6152..07ff51aeb1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java @@ -26,16 +26,12 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; 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.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; 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.vo.PagerVo; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -74,4 +70,17 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService selByMainSid(String billSid) { return baseMapper.selByMainSid(billSid); } + + public List reportSum(String sid, String sumType) { + List wmsInventoryCheckbillReportSumVos = new ArrayList<>(); + if ("total".equals(sumType)){ + WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = baseMapper.reportSumTotal(sid); + wmsInventoryCheckbillReportSumVos.add(wmsInventoryCheckbillReportSumVo); + }else if ("ware".equals(sumType)){ + wmsInventoryCheckbillReportSumVos = baseMapper.reportSumWare(sid); + }else if ("area".equals(sumType)){ + wmsInventoryCheckbillReportSumVos = baseMapper.reportSumArea(sid); + } + return wmsInventoryCheckbillReportSumVos; + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java index 451d8156f4..9d21eecc61 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java @@ -26,12 +26,18 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** * Project: yxt-wms(盘点报告)
* File: WmsInventoryCheckbillReportVo.java
@@ -51,9 +57,45 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("盘点单sid") - private String billSid; // 盘点单sid - @ApiModelProperty("pdf路径") - private String pdfUrl; // pdf路径 + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("生成日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("监盘人姓名") + private String superviseName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("pdf路径") + private String pdfUrl; + + //总体盘点情况 + @ApiModelProperty("应盘数量") + private BigDecimal bookCountTotal; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmountTotal; + @ApiModelProperty("实盘数量") + private BigDecimal realCountTotal; + @ApiModelProperty("实盘金额") + private BigDecimal realAmountTotal; + @ApiModelProperty("盘盈数量") + private BigDecimal profitCountTotal; + @ApiModelProperty("盘盈金额") + private BigDecimal profitAmountTotal; + @ApiModelProperty("盘亏数量") + private BigDecimal loseCountTotal; + @ApiModelProperty("盘亏金额") + private BigDecimal loseAmountTotal; + @ApiModelProperty("盘损数量") + private BigDecimal lossCountTotal; + @ApiModelProperty("盘损金额") + private BigDecimal lossAmountTotal; + + //仓库盘点情况 + List ware = new ArrayList<>(); + //库区盘点情况 + List Area = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java index fa0f04cd69..8ba983b95f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportMapper.java @@ -28,6 +28,7 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** * Project: yxt-wms(盘点报告)
@@ -47,4 +48,7 @@ public interface WmsInventoryCheckbillReportMapper extends BaseMapper_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbillreport; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-wms(盘点报告)
+ * File: WmsInventoryCheckbillReportVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbillreport.WmsInventoryCheckbillReportVo
+ * Description: 盘点报告 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 09:52:51
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "盘点报告 视图数据详情", description = "盘点报告 视图数据详情") +public class WmsInventoryCheckbillReportSumVo implements Vo { + + @ApiModelProperty("仓库名称(或仓库-库区名称)") + private String warehouseName; + @ApiModelProperty("应盘数量") + private BigDecimal bookCount; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("实盘金额") + private BigDecimal realAmount; + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘盈金额") + private BigDecimal profitAmount; + @ApiModelProperty("盘亏数量") + private BigDecimal loseCount; + @ApiModelProperty("盘亏金额") + private BigDecimal loseAmount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; + @ApiModelProperty("盘损金额") + private BigDecimal lossAmount; +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/resources/ftl/pdbg.ftl b/yxt-wms-biz/src/main/resources/ftl/pdbg.ftl new file mode 100644 index 0000000000..b736f5b412 --- /dev/null +++ b/yxt-wms-biz/src/main/resources/ftl/pdbg.ftl @@ -0,0 +1,3733 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘点报告 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发起人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${createName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发起部门 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${deptName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发起日期 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${createTime} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘点人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${pdrName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 监盘人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jprName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${remarks} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 总体盘点情况 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 应盘数量:${ypsl} 应盘金额:${ypje} 实盘数量:${spsl} 实盘金额:${spje} + 盘盈数量:${pysl} 盘盈金额:${pyje} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘亏数量:${pksl} 盘亏金额:${pkje} 盘损数量:${pssl} 盘损金额:${psje} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库盘点情况 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 应盘 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 应盘金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 实盘 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 实盘金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘盈 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘盈金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘亏 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘亏金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘损 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘损金额 + + + + + <#list ware as w> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.id1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.ck1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.yp1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.ypje1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.sp1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.spje1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.py1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.pyje1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.pk1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.pkje1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.ps1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${w.psje1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 库区盘点情况 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 仓库-库区 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 应盘 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 应盘金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 实盘 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 实盘金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘盈 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘盈金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘亏 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘亏金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘损 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 盘损金额 + + + + + <#list area as a> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.id2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.ck2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.yp2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.ypje2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.sp2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.spje2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.py2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.pyje2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.pk2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.pkje2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.ps2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${a.psje2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 202 + 463 + 0 + 0 + 7 + false + false + 529 + WPS Office_12.1.0.17147_F1E327BC-269C-435d-A152-05C5408002CA + 0 + + + + + + + 2024-07-22T05:49:20Z + God + WPS_1599826008 + 2024-07-22T06:25:44Z + + + + + + + + 2052-12.1.0.17147 + + + 2CF64CCE4CE6487CAE9DE1713D1F25E1_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/resources/ftl/盘点报告.doc b/yxt-wms-biz/src/main/resources/ftl/盘点报告.doc new file mode 100644 index 0000000000..0f8233bb79 --- /dev/null +++ b/yxt-wms-biz/src/main/resources/ftl/盘点报告.doc @@ -0,0 +1,18 @@ + +|盘点报告 | +|发起人 |${createName} |发起部|${deptName} |发起日|${createTime}| +| | |门 | |期 | | +|盘点人 |${pdrName} |监盘人|${jprName} |备注 |${remarks} | +|总体盘点情况 | +|应盘数量:${ypsl} 应盘金额:${ypje} | +|实盘数量:${spsl} 实盘金额:${spje} | +|盘盈数量:${pysl} 盘盈金额:${pyje} | +|盘亏数量:${pksl} 盘亏金额:${pkje} | +|盘损数量:${pssl} 盘损金额:${psje} | +|仓库盘点情况 | +|序号 | + + + 序号 |仓库-库区 |应盘 |应盘金额 |实盘 |实盘金额 |盘盈 |盘盈金额 |盘亏 + |盘亏金额 |盘损 |盘损金额 | |${id2} |${ck2} |${yp2} |${ypje2} |${sp2} + |${spje2} |${py2} |${pyje2} |${pk2} |${pkje2} |${ps2} |${psje2} | |