Merge remote-tracking branch 'origin/master'

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;

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<BaseVehicleMapper, Ba
             //非删除
             qw.eq("bv.isDelete", 0);
             //库存状态为库存
-            qw.and(wrapper -> 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<String> list = params.getList();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderMapper">
     <insert id="saveList">
         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
         <foreach collection="list" item="item" index="index" separator=",">
             (#{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})
         </foreach>
     </insert>
     <!--    <where> ${ew.sqlSegment} </where>-->

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;
 
 }

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禁用
 
 
 

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(客户管理) <br/>
  * File: CrmCustomerTemp.java <br/>
@@ -160,4 +162,10 @@ public class CrmCustomerTemp extends BaseEntity {
 
     @ApiModelProperty("证件地址")
     private String certificateAddress;
+
+    @ApiModelProperty("是否为定点企业（1是0否）")
+    private Integer isDesignatedEnterprise;
+
+    @ApiModelProperty("定点企业备案有效期")
+    private Date filingIndate;
 }

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潜在客户的编辑回显
      *

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<CrmCustomerTempVo> fetchSid(String sid) {

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) <br/>
+ * File: CrmDockingPeople.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeople <br/>
+ * Description: 定点企业对接人信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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
+
+}

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) <br/>
+ * File: CrmDockingPeopleVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo <br/>
+ * Description: 定点企业对接人信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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
+
+}

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) <br/>
+ * File: CrmDockingPeopleDto.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleDto <br/>
+ * Description: 定点企业对接人信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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
+
+}

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) <br/>
+ * File: CrmDockingPeopleFeign.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleFeign <br/>
+ * Description: 定点企业对接人信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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<PagerVo<CrmDockingPeopleVo>> listPage(@RequestBody PagerQuery<CrmDockingPeopleQuery> 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<CrmDockingPeopleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

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) <br/>
+ * File: CrmDockingPeopleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleFeignFallback <br/>
+ * Description: 定点企业对接人信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class CrmDockingPeopleFeignFallback implements CrmDockingPeopleFeign {
+
+	@Override
+	public ResultBean<PagerVo<CrmDockingPeopleVo>> listPage(PagerQuery<CrmDockingPeopleQuery> 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<CrmDockingPeopleDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-crm/crmdockingpeople/fetchDetailsBySid无法访问");
+	}
+}

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) <br/>
+ * File: CrmDockingPeopleQuery.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleQuery <br/>
+ * Description: 定点企业对接人信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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
+
+}

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) <br/>
+ * File: CrmDockingPeopleVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo <br/>
+ * Description: 定点企业对接人信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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
+
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePerson.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson <br/>
+ * Description: 定点企业备案-对接人员. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 手机号码
+
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo <br/>
+ * Description: 定点企业备案-对接人员 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 手机号码
+
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonDto.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonDto <br/>
+ * Description: 定点企业备案-对接人员 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 手机号码
+
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonFeign.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonFeign <br/>
+ * Description: 定点企业备案-对接人员. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<PagerVo<CrmMaintenanceenterprisePersonVo>> listPage(@RequestBody PagerQuery<CrmMaintenanceenterprisePersonQuery> 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<CrmMaintenanceenterprisePersonDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/personList")
+    @ResponseBody
+    public ResultBean<List<CrmPersonListVo>> personList(@RequestParam("sid") String sid);
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonFeignFallback <br/>
+ * Description: 定点企业备案-对接人员. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class CrmMaintenanceenterprisePersonFeignFallback implements CrmMaintenanceenterprisePersonFeign {
+
+	@Override
+	public ResultBean<PagerVo<CrmMaintenanceenterprisePersonVo>> listPage(PagerQuery<CrmMaintenanceenterprisePersonQuery> 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<CrmMaintenanceenterprisePersonDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口crm/crmmaintenanceenterpriseperson/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean<List<CrmPersonListVo>> personList(String sid) {
+		return null;
+	}
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonQuery.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonQuery <br/>
+ * Description: 定点企业备案-对接人员 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 手机号码
+
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo <br/>
+ * Description: 定点企业备案-对接人员 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 手机号码
+
+}

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;
+
+}

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
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecord.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecord <br/>
+ * Description: 定点企业备案. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 办结日期
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo <br/>
+ * Description: 定点企业备案 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<CarListVo> carList = new ArrayList<>();
+    /**
+     * 证件类型
+     */
+    private String certificateType;
+    /**
+     * 证件类型Key
+     */
+    private String certificateTypeKey;
+    /**
+     * 市
+     */
+    private String city;
+    /**
+     * 对接人列表
+     */
+    private List<PersonListVo> 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<FileQueryUrl> 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;
+
+
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordDto.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDto <br/>
+ * Description: 定点企业备案 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<CarListVo> carList = new ArrayList<>();
+    /**
+     * 证件类型
+     */
+    private String certificateType;
+    /**
+     * 证件类型Key
+     */
+    private String certificateTypeKey;
+    /**
+     * 市
+     */
+    private String city;
+    /**
+     * 对接人列表
+     */
+    private List<PersonListVo> 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<FileQueryUrl> 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;
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordFeign.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeign <br/>
+ * Description: 定点企业备案. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<PagerVo<CrmMaintenanceenterpriseRecordVo>> listPage(@RequestBody PagerQuery<CrmMaintenanceenterpriseRecordQuery> 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<CrmMaintenanceenterpriseRecordDetailsVo> init(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<CrmMaintenanceenterpriseRecordDetailsVo> 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<List<EnterpriseNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap EnterpriseNodeQuery query);
+//
+//    @ApiOperation(value = "获取上一个环节")
+//    @GetMapping(value = "/getPreviousNodesForReject")
+//    ResultBean<List<EnterpriseNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap EnterpriseNodeQuery query);
+//
+//    @ApiOperation(value = "加签")
+//    @PostMapping(value = "/delegate")
+//    public ResultBean delegate(@RequestBody EnterpriseDelegateQuery query);
+
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordFeignFallback <br/>
+ * Description: 定点企业备案. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class CrmMaintenanceenterpriseRecordFeignFallback implements CrmMaintenanceenterpriseRecordFeign {
+
+	@Override
+	public ResultBean<PagerVo<CrmMaintenanceenterpriseRecordVo>> listPage(PagerQuery<CrmMaintenanceenterpriseRecordQuery> 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<CrmMaintenanceenterpriseRecordDetailsVo> init(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<CrmMaintenanceenterpriseRecordDetailsVo> 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<List<EnterpriseNodeVo>> getNextNodesForSubmit(EnterpriseNodeQuery query) {
+//		return null;
+//	}
+//
+//	@Override
+//	public ResultBean<List<EnterpriseNodeVo>> getPreviousNodesForReject(EnterpriseNodeQuery query) {
+//		return null;
+//	}
+//
+//	@Override
+//	public ResultBean delegate(EnterpriseDelegateQuery query) {
+//		return null;
+//	}
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordQuery.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordQuery <br/>
+ * Description: 定点企业备案 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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;
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo <br/>
+ * Description: 定点企业备案 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 备案类别
+}

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;
+
+}

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
+
+
+}

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;
+}

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;
+
+
+}

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;
+}

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<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

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;
+}

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;
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVeh.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVeh <br/>
+ * Description: 定点企业备案-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 购车日期
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo <br/>
+ * Description: 定点企业备案-车辆信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 购车日期
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehDto.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehDto <br/>
+ * Description: 定点企业备案-车辆信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 购车日期
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehFeign.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehFeign <br/>
+ * Description: 定点企业备案-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<PagerVo<CrmMaintenanceenterpriseVehVo>> listPage(@RequestBody PagerQuery<CrmMaintenanceenterpriseVehQuery> 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<CrmMaintenanceenterpriseVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehFeignFallback <br/>
+ * Description: 定点企业备案-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class CrmMaintenanceenterpriseVehFeignFallback implements CrmMaintenanceenterpriseVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<CrmMaintenanceenterpriseVehVo>> listPage(PagerQuery<CrmMaintenanceenterpriseVehQuery> 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<CrmMaintenanceenterpriseVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口crm/crmmaintenanceenterpriseveh/fetchDetailsBySid无法访问");
+	}
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehQuery.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehQuery <br/>
+ * Description: 定点企业备案-车辆信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 购车日期
+
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehVo.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo <br/>
+ * Description: 定点企业备案-车辆信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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; // 购车日期
+
+}

anrui-crm/anrui-crm-biz/pom.xml

@@ -15,6 +15,17 @@
     <version>0.0.1</version>
 
     <dependencies>
+        <dependency>
+            <groupId>com.yxt.messagecenter</groupId>
+            <artifactId>message-center-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui</groupId>
+            <artifactId>anrui-flowable-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
             <artifactId>yxt-common-base</artifactId>

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) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -310,7 +310,15 @@
     <select id="asListPage" resultType="com.yxt.anrui.crm.api.crmcustomertemp.AsCustomerListVo">
         SELECT
             a.*,
-            (SELECT COUNT(*) FROM yxt_4sas.as_customer_vehicle as v WHERE v.customerSid = a.sid) as vehCount
+        CASE
+        WHEN a.filingIndate >= NOW() THEN
+        '0'
+        WHEN a.filingIndate &lt; NOW() THEN
+        '1'
+        ELSE '1'
+        END as isFilingIndate,
+            (SELECT COUNT(*) FROM yxt_4sas.as_customer_vehicle as v WHERE v.customerSid = a.sid) as vehCount,
+        (SELECT COUNT(*) FROM crm_docking_people as d WHERE d.customerSid = a.sid) as personCount
         FROM
             crm_customer_temp AS a
                 LEFT JOIN anrui_portal.sys_organization as s on a.useOrgSid = s.sid

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -195,6 +195,20 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return rb.success();
     }
 
+    @Override
+    public ResultBean disableState(String[] sid) {
+        ResultBean rb = ResultBean.fireFail();
+        crmCustomerTempService.disableState(sid);
+        return rb.success();
+    }
+
+    @Override
+    public ResultBean enable(String[] sid) {
+        ResultBean rb = ResultBean.fireFail();
+        crmCustomerTempService.enable(sid);
+        return rb.success();
+    }
+
     @Override
     public ResultBean<CrmCustomerTempVo> fetchSid(String sid) {
         ResultBean<CrmCustomerTempVo> rb = ResultBean.fireFail();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1508,6 +1508,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         if (StringUtils.isNotBlank(query.getLevelKey())) {
             qw.like("a.levelKey", query.getLevelKey());
         }
+        if (StringUtils.isNotBlank(query.getIsDesignatedEnterprise())) {
+            qw.eq("a.isDesignatedEnterprise", query.getIsDesignatedEnterprise());
+        }
         String remindStartDay = query.getRemindStartDay();
         String remindEndDay = query.getRemindEndDay();
         qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (a.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
@@ -1527,4 +1530,20 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         int i = baseMapper.saveList(customerTemps);
         return rb.success();
     }
+
+    public void disableState(String[] sid) {
+        for (String s : sid) {
+            CrmCustomerTemp customerTemp = fetchBySid(s);
+            customerTemp.setIsEnable(0);
+            baseMapper.updateById(customerTemp);
+        }
+    }
+
+    public void enable(String[] sid) {
+        for (String s : sid) {
+            CrmCustomerTemp customerTemp = fetchBySid(s);
+            customerTemp.setIsEnable(1);
+            baseMapper.updateById(customerTemp);
+        }
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmdockingpeople;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeople;
+import com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(crm) <br/>
+ * File: CrmDockingPeopleMapper.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleMapper <br/>
+ * Description: 定点企业对接人信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface CrmDockingPeopleMapper extends BaseMapper<CrmDockingPeople> {
+
+	//@Update("update crm_docking_people set name=#{msg} where id=#{id}")
+	//IPage<CrmDockingPeopleVo> voPage(IPage<CrmDockingPeople> page, @Param(Constants.WRAPPER) QueryWrapper<CrmDockingPeople> qw);
+	
+	IPage<CrmDockingPeopleVo> selectPageVo(IPage<CrmDockingPeople> page, @Param(Constants.WRAPPER) Wrapper<CrmDockingPeople> qw);
+	
+	List<CrmDockingPeopleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmDockingPeople> qw);
+	
+	@Select("select * from crm_docking_people")
+	List<CrmDockingPeopleVo> selectListVo();
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo">
+		SELECT * FROM crm_docking_people <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmdockingpeople.CrmDockingPeopleVo">
+		SELECT * FROM crm_docking_people <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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) <br/>
+ * File: CrmDockingPeopleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleRest <br/>
+ * Description: 定点企业对接人信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @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<PagerVo<CrmDockingPeopleVo>> listPage(@RequestBody PagerQuery<CrmDockingPeopleQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<CrmDockingPeopleVo> 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<CrmDockingPeopleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		CrmDockingPeopleDetailsVo vo = crmDockingPeopleService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

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) <br/>
+ * File: CrmDockingPeopleService.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmdockingpeople.CrmDockingPeopleService <br/>
+ * Description: 定点企业对接人信息 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 17:21:58 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmDockingPeopleService extends MybatisBaseService<CrmDockingPeopleMapper, CrmDockingPeople> {
+	private QueryWrapper<CrmDockingPeople> createQueryWrapper(CrmDockingPeopleQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<CrmDockingPeople> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<CrmDockingPeopleVo> listPageVo(PagerQuery<CrmDockingPeopleQuery> pq) {
+		CrmDockingPeopleQuery query = pq.getParams();
+		QueryWrapper<CrmDockingPeople> qw = createQueryWrapper(query);
+		IPage<CrmDockingPeople> page = PagerUtil.queryToPage(pq);
+		IPage<CrmDockingPeopleVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<CrmDockingPeopleVo> 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;
+	}
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonMapper.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonMapper <br/>
+ * Description: 定点企业备案-对接人员. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface CrmMaintenanceenterprisePersonMapper extends BaseMapper<CrmMaintenanceenterprisePerson> {
+
+	//@Update("update crm_maintenanceenterprise_person set name=#{msg} where id=#{id}")
+	//IPage<CrmMaintenanceenterprisePersonVo> voPage(IPage<CrmMaintenanceenterprisePerson> page, @Param(Constants.WRAPPER) QueryWrapper<CrmMaintenanceenterprisePerson> qw);
+
+	IPage<CrmMaintenanceenterprisePersonVo> selectPageVo(IPage<CrmMaintenanceenterprisePerson> page, @Param(Constants.WRAPPER) Wrapper<CrmMaintenanceenterprisePerson> qw);
+
+	List<CrmMaintenanceenterprisePersonVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmMaintenanceenterprisePerson> qw);
+
+	@Select("select * from crm_maintenanceenterprise_person")
+	List<CrmMaintenanceenterprisePersonVo> selectListVo();
+
+	@Delete("delete from crm_maintenanceenterprise_person where billSid = #{sid}")
+	void delByBillSid(String sid);
+	@Select("select * from crm_maintenanceenterprise_person where billSid = #{sid} ")
+	List<CrmMaintenanceenterprisePerson> selByBillSid(String sid);
+
+	@Select("select * from crm_maintenanceenterprise_person where billSid = #{sid}")
+    List<CrmPersonListVo> personList(String sid);
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo">
+		SELECT * FROM crm_maintenanceenterprise_person <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo">
+		SELECT * FROM crm_maintenanceenterprise_person <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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) <br/>
+ * File: CrmMaintenanceenterprisePersonFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonRest <br/>
+ * Description: 定点企业备案-对接人员. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<PagerVo<CrmMaintenanceenterprisePersonVo>> listPage(@RequestBody PagerQuery<CrmMaintenanceenterprisePersonQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<CrmMaintenanceenterprisePersonVo> 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<CrmMaintenanceenterprisePersonDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		CrmMaintenanceenterprisePersonDetailsVo vo = crmMaintenanceenterprisePersonService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean<List<CrmPersonListVo>> personList(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<CrmPersonListVo> list = crmMaintenanceenterprisePersonService.personList(sid);
+		return rb.success().setData(list);
+	}
+}

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) <br/>
+ * File: CrmMaintenanceenterprisePersonService.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonService <br/>
+ * Description: 定点企业备案-对接人员 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmMaintenanceenterprisePersonService extends MybatisBaseService<CrmMaintenanceenterprisePersonMapper, CrmMaintenanceenterprisePerson> {
+	private QueryWrapper<CrmMaintenanceenterprisePerson> createQueryWrapper(CrmMaintenanceenterprisePersonQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<CrmMaintenanceenterprisePerson> qw = new QueryWrapper<>();
+		return qw;
+	}
+
+	public void delByBillSid(String sid) {
+		baseMapper.delByBillSid(sid);
+	}
+
+
+	public List<CrmMaintenanceenterprisePerson> selByBillSid(String sid) {
+		return baseMapper.selByBillSid(sid);
+	}
+
+	public PagerVo<CrmMaintenanceenterprisePersonVo> listPageVo(PagerQuery<CrmMaintenanceenterprisePersonQuery> pq) {
+		CrmMaintenanceenterprisePersonQuery query = pq.getParams();
+		QueryWrapper<CrmMaintenanceenterprisePerson> qw = createQueryWrapper(query);
+		IPage<CrmMaintenanceenterprisePerson> page = PagerUtil.queryToPage(pq);
+		IPage<CrmMaintenanceenterprisePersonVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<CrmMaintenanceenterprisePersonVo> 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<CrmPersonListVo> personList(String sid) {
+		return baseMapper.personList(sid);
+	}
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordMapper.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordMapper <br/>
+ * Description: 定点企业备案. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface CrmMaintenanceenterpriseRecordMapper extends BaseMapper<CrmMaintenanceenterpriseRecord> {
+
+	//@Update("update crm_maintenanceenterprise_record set name=#{msg} where id=#{id}")
+	//IPage<CrmMaintenanceenterpriseRecordVo> voPage(IPage<CrmMaintenanceenterpriseRecord> page, @Param(Constants.WRAPPER) QueryWrapper<CrmMaintenanceenterpriseRecord> qw);
+
+	IPage<CrmMaintenanceenterpriseRecordVo> selectPageVo(IPage<CrmMaintenanceenterpriseRecord> page, @Param(Constants.WRAPPER) Wrapper<CrmMaintenanceenterpriseRecord> qw);
+
+	List<CrmMaintenanceenterpriseRecordVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmMaintenanceenterpriseRecord> qw);
+
+	@Select("select * from crm_maintenanceenterprise_record")
+	List<CrmMaintenanceenterpriseRecordVo> selectListVo();
+
+	List<PersonListVo> selPersonList(@Param("sid") String sid);
+
+	int selectNum(String bill);
+
+    int selPersonCount(@Param("customerSid") String customerSid);
+
+	int selectBySid(String join);
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo">
+		SELECT
+		*
+		FROM
+		(
+		SELECT
+		t.customerTypeKey,
+		r.createBySid,
+		r.billNo,
+		date_format ( r.closingDate, '%Y-%m-%d' ) closingDate,
+		t.mobile,
+		r.nodeState,
+		r.procDefId,
+		r.procInstId,
+		r.sid,
+		r.deptName,
+		r.filingType,
+		r.useOrgName,
+		r.createByName,
+		date_format ( r.createTime, '%Y-%m-%d' ) createTime,
+		t.`name` customerName,
+		t.customerType customerTypeValue,
+		date_format ( r.filingIndate, '%Y-%m-%d' ) filingIndate,
+		CASE
+
+		WHEN r.filingIndate >= NOW() THEN
+		'0'
+		WHEN r.filingIndate &lt; NOW() THEN
+		'1' ELSE '1'
+		END AS isFilingIndate,
+		s.orgSidPath
+		FROM
+		crm_maintenanceenterprise_record AS r
+		LEFT JOIN crm_customer_temp AS t ON r.customerSid = t.sid
+		LEFT JOIN anrui_portal.sys_organization AS s ON r.deptSid = s.sid
+		) a
+		<where>
+		    ${ew.sqlSegment}
+		</where>
+	</select>
+
+	<select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo">
+		SELECT * FROM crm_maintenanceenterprise_record <where> ${ew.sqlSegment} </where>
+	</select>
+	<select id="selPersonList" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.PersonListVo">
+		select
+		sid as personSid,
+		mobile,
+		`name`,
+		remarks
+		from crm_docking_people where customerSid =#{sid}
+	</select>
+	<select id="selectNum" resultType="java.lang.Integer">
+		select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
+		from crm_maintenanceenterprise_record
+		where billNo LIKE concat(#{bill}, '%')
+	</select>
+	<select id="selPersonCount" resultType="java.lang.Integer">
+		select
+			count(*)
+		from crm_docking_people where customerSid =#{customerSid}
+	</select>
+	<select id="selectBySid" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		FROM crm_maintenanceenterprise_record
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+	</select>
+</mapper>

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordRest <br/>
+ * Description: 定点企业备案. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<PagerVo<CrmMaintenanceenterpriseRecordVo>> listPage(@RequestBody PagerQuery<CrmMaintenanceenterpriseRecordQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<CrmMaintenanceenterpriseRecordVo> 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<CrmMaintenanceenterpriseRecordDetailsVo> init(String sid) {
+		return crmMaintenanceenterpriseRecordService.init(sid);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<CrmMaintenanceenterpriseRecordDetailsVo> 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<List<EnterpriseNodeVo>> getNextNodesForSubmit(EnterpriseNodeQuery query) {
+//		return crmMaintenanceenterpriseRecordService.getNextNodesForSubmit(query);
+//	}
+//
+//	@Override
+//	public ResultBean<List<EnterpriseNodeVo>> getPreviousNodesForReject(EnterpriseNodeQuery query) {
+//		return crmMaintenanceenterpriseRecordService.getPreviousNodesForReject(query);
+//	}
+//
+//	@Override
+//	public ResultBean delegate(EnterpriseDelegateQuery query) {
+//		return crmMaintenanceenterpriseRecordService.delegate(query);
+//	}
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseRecordService.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordService <br/>
+ * Description: 定点企业备案 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<CrmMaintenanceenterpriseRecordMapper, CrmMaintenanceenterpriseRecord> {
+
+    @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<CrmMaintenanceenterpriseRecord> createQueryWrapper(CrmMaintenanceenterpriseRecordQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<CrmMaintenanceenterpriseRecord> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<CrmMaintenanceenterpriseRecordVo> listPageVo(PagerQuery<CrmMaintenanceenterpriseRecordQuery> pq) {
+        CrmMaintenanceenterpriseRecordQuery query = pq.getParams();
+        QueryWrapper<CrmMaintenanceenterpriseRecord> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        privilegeQuery.setUserSid(query.getUserSid());
+        ResultBean<String> 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<CrmMaintenanceenterpriseRecordVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<CrmMaintenanceenterpriseRecordVo> 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<CrmMaintenanceenterpriseRecord> page = PagerUtil.queryToPage(pq);
+        IPage<CrmMaintenanceenterpriseRecordVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<CrmMaintenanceenterpriseRecordVo> 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<CarListVo> 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<PersonListVo> 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<FileQueryUrl> 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<SysOrganizationVo> 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<PersonListVo> contactPerson = new ArrayList<>();
+        List<CarListVo> carListVos = new ArrayList<>();
+        List<FileQueryUrl> 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<CrmMaintenanceenterprisePerson> 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<CrmMaintenanceenterpriseVeh> 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<CrmFileDetailsVo> 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<CrmMaintenanceenterpriseRecordDetailsVo> 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<PersonListVo> contactPerson = baseMapper.selPersonList(customerTemp.getSid());
+            if (!contactPerson.isEmpty()) {
+                vo.setContactPerson(contactPerson);
+            }
+            List<CarListVo> 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();
+    }
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehMapper.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehMapper <br/>
+ * Description: 定点企业备案-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface CrmMaintenanceenterpriseVehMapper extends BaseMapper<CrmMaintenanceenterpriseVeh> {
+
+	//@Update("update crm_maintenanceenterprise_veh set name=#{msg} where id=#{id}")
+	//IPage<CrmMaintenanceenterpriseVehVo> voPage(IPage<CrmMaintenanceenterpriseVeh> page, @Param(Constants.WRAPPER) QueryWrapper<CrmMaintenanceenterpriseVeh> qw);
+
+	IPage<CrmMaintenanceenterpriseVehVo> selectPageVo(IPage<CrmMaintenanceenterpriseVeh> page, @Param(Constants.WRAPPER) Wrapper<CrmMaintenanceenterpriseVeh> qw);
+
+	List<CrmMaintenanceenterpriseVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<CrmMaintenanceenterpriseVeh> qw);
+
+	@Select("select * from crm_maintenanceenterprise_veh")
+	List<CrmMaintenanceenterpriseVehVo> selectListVo();
+
+	@Delete("delete from crm_maintenanceenterprise_veh where billSid = #{sid}")
+    void delByBillSid(String sid);
+	@Select("select * from crm_maintenanceenterprise_veh where billSid = #{sid} ")
+	List<CrmMaintenanceenterpriseVeh> selByBillSid(String sid);
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo">
+		SELECT * FROM crm_maintenanceenterprise_veh <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.crm.api.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehVo">
+		SELECT * FROM crm_maintenanceenterprise_veh <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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) <br/>
+ * File: CrmMaintenanceenterpriseVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehRest <br/>
+ * Description: 定点企业备案-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @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<PagerVo<CrmMaintenanceenterpriseVehVo>> listPage(@RequestBody PagerQuery<CrmMaintenanceenterpriseVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<CrmMaintenanceenterpriseVehVo> 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<CrmMaintenanceenterpriseVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		CrmMaintenanceenterpriseVehDetailsVo vo = crmMaintenanceenterpriseVehService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

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) <br/>
+ * File: CrmMaintenanceenterpriseVehService.java <br/>
+ * Class: com.yxt.anrui.crm.biz.crmmaintenanceenterpriseveh.CrmMaintenanceenterpriseVehService <br/>
+ * Description: 定点企业备案-车辆信息 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-22 13:49:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmMaintenanceenterpriseVehService extends MybatisBaseService<CrmMaintenanceenterpriseVehMapper, CrmMaintenanceenterpriseVeh> {
+	private QueryWrapper<CrmMaintenanceenterpriseVeh> createQueryWrapper(CrmMaintenanceenterpriseVehQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<CrmMaintenanceenterpriseVeh> qw = new QueryWrapper<>();
+		return qw;
+	}
+
+	public void delByBillSid(String sid) {
+		baseMapper.delByBillSid(sid);
+	}
+
+
+	public List<CrmMaintenanceenterpriseVeh> selByBillSid(String sid) {
+		return baseMapper.selByBillSid(sid);
+	}
+
+	public PagerVo<CrmMaintenanceenterpriseVehVo> listPageVo(PagerQuery<CrmMaintenanceenterpriseVehQuery> pq) {
+		CrmMaintenanceenterpriseVehQuery query = pq.getParams();
+		QueryWrapper<CrmMaintenanceenterpriseVeh> qw = createQueryWrapper(query);
+		IPage<CrmMaintenanceenterpriseVeh> page = PagerUtil.queryToPage(pq);
+		IPage<CrmMaintenanceenterpriseVehVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<CrmMaintenanceenterpriseVehVo> 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;
+	}
+}

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<List<CarListVo>> getVehListByCustomerSid(@RequestParam("customerSid") String customerSid);
+
+
+    @ApiOperation("根据客户sid查询车辆数量")
+    @GetMapping("/getVehListCountsByCustomerSid")
+    public int getVehListCountsByCustomerSid(@RequestParam("customerSid") String customerSid);
+}

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*********************************************/
 

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<SysOrganization> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid);
+    ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(@RequestParam("orgCode") String orgCode, @RequestParam("pSid") String pSid);
 }

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<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
+    public ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         return null;
     }
 }

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<SysOrganization> {
 
     List<SysOrgStaffVo> selectByOrgDeptSid2(String orgDeptSid);
 
-    SysOrganization selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid);
+    List<SysOrganization> selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid);
 }

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<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
+    public ResultBean<List<SysOrganization>> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         ResultBean rb = ResultBean.fireFail();
-        SysOrganization sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid);
+        List<SysOrganization> sysOrganization = sysOrganizationService.selectByOrgCodeAndPsid(orgCode,pSid);
         return rb.success().setData(sysOrganization);
     }
 }

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<SysOrganizationMa
         return rb.success().setData(sysOrganizationListVos);
     }
 
-    public SysOrganization selectByOrgCodeAndPsid(String orgCode, String pSid) {
+    public List<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
         return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid);
     }
 }

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;
 }

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<LoanRepayme
                 useOrgSid = orgCompany.getSid();
                 useOrgName = orgCompany.getName();
             }
-            SysOrganization orgDept = sysOrganizationFeign.selectByOrgCodeAndPsid(salesDeptNo, useOrgSid).getData();
+            List<SysOrganization> 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<LoanRepayme
                 busSalesOrder.setFinancePlan("01");
                 busSalesOrder.setFinancePlanValue("担保");
                 busSalesOrder.setCustomerSid(customerSid);
+                busSalesOrder.setCustomerName(customerName);
                 busSalesOrder.setUseOrgSid(useOrgSid);
                 busSalesOrder.setUseOrgName(useOrgName);
                 busSalesOrder.setOrgSid(deptSid);
@@ -5651,6 +5656,17 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         }
                         String salesOrderSid = mainSchedule.getSalesOrderSid();
                         String orgSidPath = mainSchedule.getOrgSidPath();
+                        String customerSid = "";
+                        String customerName = "";
+                        BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
+                        if (null != order) {
+                            if (StringUtils.isNotBlank(order.getCustomerSid())) {
+                                customerSid = order.getCustomerSid();
+                            }
+                            if (StringUtils.isNotBlank(order.getCustomerName())) {
+                                customerName = order.getCustomerName();
+                            }
+                        }
                         SysOrganizationVo deptData = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
                         if (null != deptData) {
                             importSleepData.setDeptSid(deptData.getSid());
@@ -5675,6 +5691,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             importSleepData.setBankContractNo(mainSchedule.getBankContractNo());
                         }
                         importSleepData.setSalesOrderSid(mainSchedule.getSalesOrderSid());
+                        importSleepData.setCustomer(customerName);
+                        importSleepData.setCustomerSid(customerSid);
                         if (StringUtils.isNotBlank(mainSchedule.getBankName())) {
                             importSleepData.setBankName(mainSchedule.getBankName());
                         }
@@ -5687,19 +5705,23 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             }
                             String salesOrderSid = otherSchedule.getSalesOrderSid();
                             BusSalesOrder order = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
+                            String customerSid = "";
+                            String customerName = "";
                             if (null != order) {
-                                if (StringUtils.isNotBlank(order.getOrgSid())) {
+                                    if (StringUtils.isNotBlank(order.getCustomerSid())) {
-                                    importSleepData.setDeptSid(order.getOrgSid());
+                                        customerSid = order.getCustomerSid();
-                                }
+                                    }
-                                if (StringUtils.isNotBlank(order.getOrgName())) {
+                                    if (StringUtils.isNotBlank(order.getCustomerName())) {
-                                    importSleepData.setDept(order.getOrgName());
+                                        customerName = order.getCustomerName();
-                                }
+                                    }
-                                if (StringUtils.isNotBlank(order.getUseOrgSid())) {
+                            }
-                                    importSleepData.setUseOrgSid(order.getUseOrgSid());
+                            String orgSidPath = otherSchedule.getOrgSidPath();
-                                }
+                            SysOrganizationVo deptData = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
-                                if (StringUtils.isNotBlank(order.getOrgSidPath())) {
+                            if (null != deptData) {
-                                    importSleepData.setOrgSidPath(order.getOrgSidPath());
+                                importSleepData.setDeptSid(deptData.getSid());
-                                }
+                                importSleepData.setDept(deptData.getName());
+                                importSleepData.setUseOrgSid(deptData.getPsid());
+                                importSleepData.setOrgSidPath(orgSidPath);
                             }
                             BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo).getData();
                             if (null != orderVehicle) {
@@ -5720,6 +5742,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 importSleepData.setBankContractNo(otherSchedule.getOtherBankNo());
                             }
                             importSleepData.setSalesOrderSid(otherSchedule.getSalesOrderSid());
+                            importSleepData.setCustomer(customerName);
+                            importSleepData.setCustomerSid(customerSid);
                         } else {
                             setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "不存在，请先导入还款计划主表");
                         }

yxt-as-ui/src/api/Common/dictcommons.js

@@ -69,6 +69,16 @@ export function selectOrgList(data) {
   })
 }
 
+// 根据当前登录用户的全路径查询财务部门下的所有人
+export function selFianceByOrgSidPath(data) {
+  return request({
+    // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+    url: '/portal/v1/sysstafforg/selFianceByOrgSidPath',
+    method: 'post',
+    params: data
+  })
+}
+
 // 当前用户创建申请时判断该用户是否有该菜单的操作权限
 export function selectHaveMessage(data) {
   return request({

yxt-as-ui/src/api/storage/stocktaking.js

@@ -2,50 +2,154 @@ import request from '@/utils/request'
 
 export default {
 
+  // 生成盘点点
+  createBill: function(data) {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
   // 查询分页列表
   listPage: function(params) {
     return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/wms/v1/wmsinventorycheckbill/listPage',
       method: 'post',
       data: params,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
-// 新增、保存
+
-  save: function(data) {
+  // 生成盘点报告
+  billCreateReport: function(data) {
     return request({
-      url: '/wms/v1/wmsinventorycheckbill/save',
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/createReport',
       method: 'post',
-      data: data,
+      params: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
-  // 初始化
+  //  盘点单详情
+  billDetail: function(params) {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/detailGoodPageList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  //  盘库列表
+  billStocktak: function(params) {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/detailRackPageList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  //  库位盘点明细列表
+  billRackCodeDetail: function(params) {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/detailRackGoodPageList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 初始化盘库报告
   init: function(data) {
     return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/wms/v1/wmsinventorycheckbill/fetchDetailsBySid/' + data,
       method: 'get'
     });
   },
 
-// 查询所有商品
+  // 保存盘点报告
+  saveReport: function(data) {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/saveReport',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 查询所有商品
   getWarehousesGoods: function(params) {
     return request({
       url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage',
       method: 'post',
       data: params,
-       headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
   // 盘点
-  inven: function(params) {
+  submitReport: function(params) {
     return request({
-      url: '/wms/v1/wmsinventorycheckbill/inven',
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/submitReport',
       method: 'post',
       data: params,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
+
+  downloadExcel: function() {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/downloadExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  downloadPDF: function() {
+    return request({
+      //  baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventorycheckbill/downloadPdf',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
 }

yxt-as-ui/src/api/warehouse/goodsShelves.js

@@ -17,19 +17,34 @@ export default {
   // 根据仓库查询库位
   getWarehouseareas: function(data) {
     return request({
-     url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-     method: 'get',
+      method: 'get',
-     params: data,
+      params: data,
-     headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 根据库区查询库位
+  getAllTypeByAreaSid: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/wmswarehouserack/getAllTypeByAreaSid',
+      method: 'get',
+      params: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
 
   // 修改是否可用状态
-  updateIsEnable: function(sid,isEnable) {
+  updateIsEnable: function(sid, isEnable) {
-  	return request({
+    return request({
-  		url: '/wms/apiadmin/base/wmswarehouserack/updateIsEnable/'+sid+"/"+isEnable
+      url: '/wms/apiadmin/base/wmswarehouserack/updateIsEnable/' + sid + "/" + isEnable
-  	});
+    });
   },
 
 

yxt-as-ui/src/utils/axios.js

@@ -1,7 +1,12 @@
 import axios from 'axios'
 import router from '@/router'
-import { Message } from 'element-ui'
+import {
-import { removeToken, getToken } from '@/utils/auth'
+  Message
+} from 'element-ui'
+import {
+  removeToken,
+  getToken
+} from '@/utils/auth'
 // 统一请求路径前缀
 const base = process.env.VUE_APP_BASE_API
 // 超时设定

yxt-as-ui/src/utils/request.js

@@ -1,14 +1,22 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import {
+  MessageBox,
+  Message
+} from 'element-ui'
 import store from '@/store'
-import { getToken, getStorage } from '@/utils/auth'
+import {
+  getToken,
+  getStorage
+} from '@/utils/auth'
 
 // create an axios instance
 console.log(process.env.VUE_APP_URL)
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // timeout: 5000 // request timeout
-  headers:{'Content-Type':'application/x-www-form-urlencoded;'}
+  headers: {
+    'Content-Type': 'application/x-www-form-urlencoded;'
+  }
 })
 
 // request interceptor
@@ -36,9 +44,9 @@ service.interceptors.response.use(
   response => {
     const res = response.data
 
-     if(res.type !=undefined){
+    if (res.type != undefined) {
-       return res
+      return res
-     }
+    }
     // if the custom code is not 20000, it is judged as an error.
     if (res.code != 200) {
       if (res.msg == "请重新登录") {

yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue

@@ -26,14 +26,14 @@
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 操作人</div>
               <el-form-item prop="createByName">
-                <span class="addinputw addinputInfo">{{formobj.createByName}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.createByName }}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 操作部门</div>
               <el-form-item prop="deptName">
-                <span class="addinputw addinputInfo">{{formobj.deptName}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.deptName }}</span>
               </el-form-item>
             </el-col>
 
@@ -51,8 +51,13 @@
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 领料人</div>
               <el-form-item prop="warehouseManager">
-                <el-select v-model="formobj.warehouseManager" filterable clearable placeholder="请选择"
+                <el-select
-                  class="addinputw addinputInfo" @change="receivePerSelect">
+                  v-model="formobj.warehouseManager"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                  class="addinputw addinputInfo"
+                  @change="receivePerSelect">
                   <el-option v-for="item in receivePerList" :key="item.sid" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
@@ -77,14 +82,14 @@
             <el-col :span="8">
               <div class="span-sty">维修工单编号</div>
               <el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <div class="span-sty">单据日期</div>
               <el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.billDate }}</span>
               </el-form-item>
             </el-col>
 
@@ -101,21 +106,21 @@
             <el-col :span="8">
               <div class="span-sty">工单类型</div>
               <el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.billType}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.billType }}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <div class="span-sty">科目</div>
               <el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.subject}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.subject }}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <div class="span-sty">是否外出</div>
               <el-form-item>
-                <el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
+                <el-radio-group v-model="formobj.isGoOut" class="addinputw addinputInfo" :disabled="true">
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="0">否</el-radio>
                 </el-radio-group>
@@ -128,14 +133,14 @@
             <el-col :span="8">
               <div class="span-sty">客户名称</div>
               <el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.customerName }}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <div class="span-sty">车牌号/车架号</div>
               <el-form-item>
-                <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
+                <span class="addinputw addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span>
               </el-form-item>
             </el-col>
 
@@ -178,8 +183,12 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
-              <el-form-item><el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks"
+              <el-form-item><el-input
-                  clearable placeholder="" /></el-form-item>
+                v-model="formobj.registerRemarks"
+                class="addinputInfo-one"
+                style="width: 70%"
+                clearable
+                placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-table v-loading="listLoading" :data="formobj.detailList" border>
@@ -197,7 +206,10 @@
               <template slot-scope="scope">
                 <el-popover placement="right" width="800" trigger="click">
                   <div>
-                    <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
+                    <el-table
+                      v-loading="commodityLoading"
+                      :data="commodityData"
+                      highlight-current-row
                       @current-change="commodityCurrentChange($event, scope.row)">
                       <el-table-column fixed prop="goodsSpuName" label="商品名称" width="180" align="center" />
                       <el-table-column fixed prop="goodsSkuCode" label="商品图号" width="100" align="center" />
@@ -211,15 +223,23 @@
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
                     </el-table>
 
-                    <pagination v-show="commodityData.length > 0" :total="commodityQuery.total"
+                    <pagination
-                      :page.sync="commodityQuery.current" :limit.sync="commodityQuery.size" class="total pager"
+                      v-show="commodityData.length > 0"
+                      :total="commodityQuery.total"
+                      :page.sync="commodityQuery.current"
+                      :limit.sync="commodityQuery.size"
+                      class="total pager"
                       @pagination="commodityInput(scope.row)" />
 
                     <!--  <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
                       layout="total, pager" :total="commodityQuery.total" /> -->
                   </div>
-                  <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row)"
+                  <el-input
-                    clearable placeholder="商品名称" />
+                    slot="reference"
+                    v-model="scope.row.goodsSpuName"
+                    clearable
+                    placeholder="商品名称"
+                    @input="commodityInput(scope.row)" />
                 </el-popover>
               </template>
             </el-table-column>
@@ -233,8 +253,12 @@
             <el-table-column label="库存数量" prop="inventoryNum" width="120" align="center" />
             <el-table-column label="出库数量" align="center" width="120">
               <template slot-scope="scope">
-                <el-input @input="commodityComputeYHAndXSJE(scope.row,$event)" v-model="scope.row.count" clearable
+                <el-input
-                  placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+                  v-model="scope.row.count"
+                  clearable
+                  placeholder=""
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"
+                  @input="commodityComputeYHAndXSJE(scope.row,$event)" />
               </template>
             </el-table-column>
             <el-table-column label="金额" prop="amount" align="center" />
@@ -257,399 +281,385 @@
 </template>
 
 <script>
-  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
+import req from '@/api/maintenanceReceive/maintenanceReceive.js'
-  import chooseproducts from './relation/chooseproducts'
+import chooseproducts from './relation/chooseproducts'
-  import {
+import {
-    getOrgSidByPath,
+  getOrgSidByPath,
-    selAllByOrgSidPath
+  selAllByOrgSidPath
-  } from '@/api/Common/dictcommons'
+} from '@/api/Common/dictcommons'
-  import {
+import {
-    getCurrentDate
+  getCurrentDate
-  } from '@/utils/index.js'
+} from '@/utils/index.js'
-  export default {
+export default {
-    components: {
+  components: {
-      chooseproducts,
+    chooseproducts
-    },
+  },
-    data() {
+  data() {
-      return {
+    return {
-        viewState: 1,
+      viewState: 1,
-        listLoading: false,
+      listLoading: false,
-        submitdisabled: false,
+      submitdisabled: false,
-
+
-        formobj: {
+      formobj: {
-          "sid": "",
+        "sid": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
+        "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
+        "createByName": window.sessionStorage.getItem('name'),
-          "sourceBillSid": "",
+        "sourceBillSid": "",
-          "warehouseManagerSid": "",
+        "warehouseManagerSid": "",
-          "warehouseManager": "",
+        "warehouseManager": "",
-          "useOrgSid": "",
+        "useOrgSid": "",
-          "createOrgSid": "",
+        "createOrgSid": "",
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+        "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+        "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
+        "createTime": getCurrentDate(),
-          "remarks": "",
+        "remarks": "",
-          "sourceBillNo": "",
+        "sourceBillNo": "",
-          "waitorName": "",
+        "waitorName": "",
-          "billDate": "",
+        "billDate": "",
-          "billType": "",
+        "billType": "",
-          "subject": "",
+        "subject": "",
-          "customerName": "",
+        "customerName": "",
-          "vehMark": "",
+        "vehMark": "",
-          "vinNo": "",
+        "vinNo": "",
-          "customerOrg": "",
+        "customerOrg": "",
-          "sitemVoList": [
+        "sitemVoList": [
-
+
-          ],
+        ],
-          "detailList": [
+        "detailList": [
-
+
-          ]
+        ]
-        },
+      },
-        receivePerList: [],
+      receivePerList: [],
-        // commodity商品
+      // commodity商品
-        commodityLoading: false,
+      commodityLoading: false,
-        commodityQuery: {
+      commodityQuery: {
-          current: 1,
+        current: 1,
-          size: 10,
+        size: 10,
-          total: 0,
+        total: 0,
-          params: {
+        params: {
-            name: '',
+          name: '',
-            useOrgSid: '',
+          useOrgSid: ''
-          }
-        },
-        commodityData: [],
-
-        rules: {
-          createByName: [{
-            required: true,
-            message: '制单人不能为空',
-            trigger: 'blur'
-          }],
-          deptName: [{
-            required: true,
-            message: '制单部门不能为空',
-            trigger: 'blur'
-          }],
-          createTime: [{
-            required: true,
-            message: '制单日期不能为空',
-            trigger: 'blur'
-          }],
-          warehouseManager: [{
-            required: true,
-            message: '请选择领料人',
-            trigger: 'change'
-          }],
-
         }
-      }
+      },
-    },
+      commodityData: [],
-    created() {
+
+      rules: {
+        createByName: [{
+          required: true,
+          message: '制单人不能为空',
+          trigger: 'blur'
+        }],
+        deptName: [{
+          required: true,
+          message: '制单部门不能为空',
+          trigger: 'blur'
+        }],
+        createTime: [{
+          required: true,
+          message: '制单日期不能为空',
+          trigger: 'blur'
+        }],
+        warehouseManager: [{
+          required: true,
+          message: '请选择领料人',
+          trigger: 'change'
+        }]
 
+      }
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    initData() {
+      selAllByOrgSidPath({
+        orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+      }).then((res) => {
+        if (res.success) {
+          this.receivePerList = res.data
+
+          console.log("aaaaaa", this.receivePerList)
+        }
+      })
     },
-    methods: {
-      initData() {
 
-        selAllByOrgSidPath({
+    showAdd(sid) {
-          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+      this.initData()
-        }).then((res) => {
+      this.$nextTick(() => {
-          if (res.success) {
+        this.$refs['form_obj'].clearValidate()
-            this.receivePerList = res.data
+      })
-
-            console.log("aaaaaa", this.receivePerList);
 
+      const params = {
+        sid: sid
+      }
+      req.initBill(params)
+        .then(resp => {
+          if (resp.success) {
+            console.log('>>>>>>>>>initBill', resp)
+
+            this.formobj = resp.data
+            this.formobj.detailList = []
+
+            this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+              .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+            this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+              .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+            this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+            this.formobj.createByName = window.sessionStorage.getItem('name')
+            this.formobj.createTime = getCurrentDate()
+
+            getOrgSidByPath({
+              orgPath: window.sessionStorage.getItem('defaultOrgPath')
+            }).then((res) => {
+              if (res.success) {
+                this.formobj.createOrgSid = res.data
+                this.formobj.useOrgSid = res.data
+                // this.commodityQuery.params.useOrgSid = res.data
+              }
+            })
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        })
+        .catch(() => {})
+    },
+    backData(value) {
+      this.viewState = 1
+      // 初始化
+      const params = {
+        sid: value
+      }
+      req.initBill(params)
+        .then(resp => {
+          if (resp.success) {
+            console.log('>>>>>>>>>initBill', resp)
+
+            this.formobj = resp.data
+            this.formobj.detailList = []
+
+            this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+              .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+            this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+              .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+            this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+            this.formobj.createByName = window.sessionStorage.getItem('name')
+            this.formobj.createTime = getCurrentDate()
+
+            getOrgSidByPath({
+              orgPath: window.sessionStorage.getItem('defaultOrgPath')
+            }).then((res) => {
+              if (res.success) {
+                this.formobj.createOrgSid = res.data
+                this.formobj.useOrgSid = res.data
+                // this.commodityQuery.params.useOrgSid = res.data
+              }
+            })
+          } else {
+            // 根据resp.code进行异常情况处理
           }
         })
+        .catch(() => {})
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    seleMaintenance() {
+      this.viewState = 2
+      const aa = []
+      this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+    },
 
-      },
+    saveOrUpdate() {
+      console.log('>>>>>>>>>saveOrUpdate', this.formobj)
 
-      showAdd(sid) {
+      if (this.formobj.detailList.length == 0) {
-        this.initData()
+        this.$message({
-        this.$nextTick(() => {
+          showClose: true,
-          this.$refs['form_obj'].clearValidate()
+          type: 'warning',
+          message: "商品不能为空"
         })
+        return
+      }
 
-        var params = {
+      for (let i = 0; i < this.formobj.detailList.length; i++) {
-          sid: sid
+        const item = this.formobj.detailList[i]
-        }
-        req.initBill(params)
-          .then(resp => {
-            if (resp.success) {
-              console.log('>>>>>>>>>initBill', resp)
-
-              this.formobj = resp.data
-              this.formobj.detailList = []
-
-              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
-                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
-              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
-              this.formobj.createBySid = window.sessionStorage.getItem('userSid')
-              this.formobj.createByName = window.sessionStorage.getItem('name')
-              this.formobj.createTime = getCurrentDate()
-
-              getOrgSidByPath({
-                orgPath: window.sessionStorage.getItem('defaultOrgPath')
-              }).then((res) => {
-                if (res.success) {
-                  this.formobj.createOrgSid = res.data
-                  this.formobj.useOrgSid = res.data
-                  // this.commodityQuery.params.useOrgSid = res.data
-                }
-              })
-
-            } else {
-              // 根据resp.code进行异常情况处理
-            }
-          })
-          .catch(() => {})
-
 
-      },
+        if (item.goodSpuSid == '') {
-      backData(value) {
+          this.$message({
-        this.viewState = 1
+            showClose: true,
-        // 初始化
+            type: 'warning',
-        var params = {
+            message: "请添加商品"
-          sid: value
-        }
-        req.initBill(params)
-          .then(resp => {
-            if (resp.success) {
-              console.log('>>>>>>>>>initBill', resp)
-
-              this.formobj = resp.data
-              this.formobj.detailList = []
-
-              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
-                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
-              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
-              this.formobj.createBySid = window.sessionStorage.getItem('userSid')
-              this.formobj.createByName = window.sessionStorage.getItem('name')
-              this.formobj.createTime = getCurrentDate()
-
-              getOrgSidByPath({
-                orgPath: window.sessionStorage.getItem('defaultOrgPath')
-              }).then((res) => {
-                if (res.success) {
-                  this.formobj.createOrgSid = res.data
-                  this.formobj.useOrgSid = res.data
-                  // this.commodityQuery.params.useOrgSid = res.data
-                }
-              })
-
-            } else {
-              // 根据resp.code进行异常情况处理
-            }
           })
-          .catch(() => {})
+          return
-
+        }
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      seleMaintenance() {
-        this.viewState = 2
-        const aa = []
-        this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
-      },
-
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
 
-        if (this.formobj.detailList.length == 0) {
+        if (Number(item.count) == 0) {
           this.$message({
             showClose: true,
             type: 'warning',
-            message: "商品不能为空"
+            message: "商品出库数量不能0"
           })
           return
         }
+      }
 
-        for (var i = 0; i < this.formobj.detailList.length; i++) {
+      this.$refs['form_obj'].validate((valid) => {
-          var item = this.formobj.detailList[i]
+        if (valid) {
-
+          req.saveOutBill(this.formobj)
-          if (item.goodSpuSid == '') {
+            .then(resp => {
-            this.$message({
+              if (resp.success) {
-              showClose: true,
+                this.$message({
-              type: 'warning',
+                  showClose: true,
-              message: "请添加商品"
+                  type: 'success',
-            })
+                  message: resp.msg
-            return
+                })
-          }
+                this.handleReturn('true')
-
+              } else {
-          if (Number(item.count) == 0) {
+                // 根据resp.code进行异常情况处理
-            this.$message({
+              }
-              showClose: true,
-              type: 'warning',
-              message: "商品出库数量不能0"
             })
-            return
+            .catch(() => {})
-          }
-        }
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            req.saveOutBill(this.formobj)
-              .then(resp => {
-                if (resp.success) {
-                  this.$message({
-                    showClose: true,
-                    type: 'success',
-                    message: resp.msg
-                  })
-                  this.handleReturn('true')
-                } else {
-                  // 根据resp.code进行异常情况处理
-                }
-              })
-              .catch(() => {})
-
-          }
-        })
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-          "sid": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "sourceBillSid": "",
-          "warehouseManagerSid": "",
-          "warehouseManager": "",
-          "useOrgSid": "",
-          "createOrgSid": "",
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-            'defaultOrgPath').lastIndexOf('/') + 1),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem(
-            'defaultOrgPathName').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "remarks": "",
-          "sourceBillNo": "",
-          "waitorName": "",
-          "billDate": "",
-          "billType": "",
-          "subject": "",
-          "customerName": "",
-          "vehMark": "",
-          "vinNo": "",
-          "customerOrg": "",
-          "sitemVoList": [
-
-          ],
-          "detailList": [
-
-          ]
         }
-        this.submitdisabled = false
+      })
-        this.$emit('doback')
+    },
-      },
+    handleReturn(isreload) {
-      indexMethod(index) {
+      if (isreload === 'true') this.$emit('reloadlist')
-        return index + 1
+      this.formobj = {
-      },
+        "sid": "",
-      receivePerSelect(val) {
+        "createBySid": window.sessionStorage.getItem('userSid'),
-        const choose = this.receivePerList.filter((item) => item.sid == val)
+        "createByName": window.sessionStorage.getItem('name'),
-        console.log('>>>>>>>>>receivePerSelect', choose)
+        "sourceBillSid": "",
-        this.formobj.warehouseManagerSid = choose[0].sid
+        "warehouseManagerSid": "",
-        this.formobj.warehouseManager = choose[0].name
+        "warehouseManager": "",
-      },
+        "useOrgSid": "",
-
+        "createOrgSid": "",
-      commodityInput(row) {
+        "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
-        console.log("commodityInput》》》》", row)
+          'defaultOrgPath').lastIndexOf('/') + 1),
-        this.commodityQuery.params.name = row.goodsSpuName
+        "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem(
-        this.commodityQuery.params.busrepairBillsid = row.sourceBillSid
+          'defaultOrgPathName').lastIndexOf('/') + 1),
-        this.commodityQuery.params.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window
+        "createTime": getCurrentDate(),
-          .sessionStorage
+        "remarks": "",
-          .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+        "sourceBillNo": "",
-        this.commodityLoading = true
+        "waitorName": "",
-        req.getGoodsListPage(this.commodityQuery).then((response) => {
+        "billDate": "",
-          if (response.success) {
+        "billType": "",
-            this.commodityLoading = false
+        "subject": "",
-            this.commodityData = response.data.records
+        "customerName": "",
-            this.commodityQuery.total = response.data.total
+        "vehMark": "",
-          } else {
+        "vinNo": "",
-            this.serviceLoading = false
+        "customerOrg": "",
-            this.commodityData = []
+        "sitemVoList": [
-            this.commodityQuery.total = 0
+
-          }
+        ],
-        })
+        "detailList": [
-      },
+
-      commodityCurrentChange(value, row) {
+        ]
-        console.log("commodityCurrentChange》》》》", value)
+      }
-        console.log("commodityCurrentChange》》》》", row)
+      this.submitdisabled = false
-
+      this.$emit('doback')
-        row.inventorySid = value.inventorySid
+    },
-        row.goodsID = value.goodsID
+    indexMethod(index) {
-        row.goodSpuSid = value.goodSpuSid
+      return index + 1
-        row.goodsSpuName = value.goodsSpuName
+    },
-        row.goodsSkuSid = value.goodsSkuSid
+    receivePerSelect(val) {
-        row.goodsSkuTitle = value.goodsSkuTitle
+      const choose = this.receivePerList.filter((item) => item.sid == val)
-        row.goodsSkuCode = value.goodsSkuCode
+      console.log('>>>>>>>>>receivePerSelect', choose)
-        row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
+      this.formobj.warehouseManagerSid = choose[0].sid
-        row.unit = value.unit
+      this.formobj.warehouseManager = choose[0].name
-        row.warehouseSid = value.warehouseSid
+    },
-        row.warehouseName = value.warehouseName
-        row.warehouseRackSid = value.warehouseRackSid
-        row.warehouseRackCode = value.warehouseRackCode
-        row.outboundCount = value.outboundCount // 已出库数量
-        row.inventoryNum = value.count // 库存数量
-        row.count = 0 //出库数量
-        row.amount = 0.00
-        row.price = value.price
-        row.remarks = ''
-        document.body.click()
-      },
-
 
-      addGoods(row) {
+    commodityInput(row) {
-
+      console.log("commodityInput》》》》", row)
-        var goods = {
+      this.commodityQuery.params.name = row.goodsSpuName
-          "sourceBillNo": this.formobj.sourceBillNo,
+      this.commodityQuery.params.busrepairBillsid = row.sourceBillSid
-          "sourceBillSid": this.formobj.sourceBillSid,
+      this.commodityQuery.params.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window
-          "sitemSid": row.serviceItemSid,
+        .sessionStorage
-          'serviceItem': row.serviceItem,
+        .getItem('defaultOrgPath').lastIndexOf('/') + 1)
-          "inventorySid": "",
+      this.commodityLoading = true
-          "goodsID": "",
+      req.getGoodsListPage(this.commodityQuery).then((response) => {
-          "goodSpuSid": "",
+        if (response.success) {
-          "goodsSpuName": "",
+          this.commodityLoading = false
-          "goodsSkuSid": "",
+          this.commodityData = response.data.records
-          "goodsSkuTitle": "",
+          this.commodityQuery.total = response.data.total
-          "goodsSkuCode": "",
+        } else {
-          "goodsSkuOwnSpec": "",
+          this.serviceLoading = false
-          "currentCount": "",
+          this.commodityData = []
-          "unit": "",
+          this.commodityQuery.total = 0
-          "warehouseSid": "",
-          "warehouseName": "",
-          "warehouseRackSid": "",
-          "warehouseRackCode": "",
-          "count": 0,
-          "price": '',
-          'amount': 0.00,
-          "outboundCount": 0,
-          "remarks": ""
         }
+      })
+    },
+    commodityCurrentChange(value, row) {
+      console.log("commodityCurrentChange》》》》", value)
+      console.log("commodityCurrentChange》》》》", row)
+
+      row.inventorySid = value.inventorySid
+      row.goodsID = value.goodsID
+      row.goodSpuSid = value.goodSpuSid
+      row.goodsSpuName = value.goodsSpuName
+      row.goodsSkuSid = value.goodsSkuSid
+      row.goodsSkuTitle = value.goodsSkuTitle
+      row.goodsSkuCode = value.goodsSkuCode
+      row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
+      row.unit = value.unit
+      row.warehouseSid = value.warehouseSid
+      row.warehouseName = value.warehouseName
+      row.warehouseRackSid = value.warehouseRackSid
+      row.warehouseRackCode = value.warehouseRackCode
+      row.outboundCount = value.outboundCount // 已出库数量
+      row.inventoryNum = value.count // 库存数量
+      row.count = 0 // 出库数量
+      row.amount = 0.00
+      row.price = value.price
+      row.remarks = ''
+      document.body.click()
+    },
 
-        this.formobj.detailList.push(goods)
+    addGoods(row) {
-
+      const goods = {
-      },
+        "sourceBillNo": this.formobj.sourceBillNo,
-      deleteGoods(row) {
+        "sourceBillSid": this.formobj.sourceBillSid,
-
+        "sitemSid": row.serviceItemSid,
-        const index = this.formobj.detailList.findIndex((item) => item.goodSpuSid == row.goodSpuSid)
+        'serviceItem': row.serviceItem,
-        console.log('>>>>>>>>>receivePerSelect', index)
+        "inventorySid": "",
-        this.formobj.detailList.splice(index, 1)
+        "goodsID": "",
-
+        "goodSpuSid": "",
-      },
+        "goodsSpuName": "",
-      commodityComputeYHAndXSJE(row, val) {
+        "goodsSkuSid": "",
-        console.log("aaa", row);
+        "goodsSkuTitle": "",
-        console.log("aaa", val);
+        "goodsSkuCode": "",
+        "goodsSkuOwnSpec": "",
+        "currentCount": "",
+        "unit": "",
+        "warehouseSid": "",
+        "warehouseName": "",
+        "warehouseRackSid": "",
+        "warehouseRackCode": "",
+        "count": 0,
+        "price": '',
+        'amount': 0.00,
+        "outboundCount": 0,
+        "remarks": ""
+      }
 
-        row.amount = (Number(row.count) * Number(row.price)).toFixed(2)
+      this.formobj.detailList.push(goods)
-      },
+    },
+    deleteGoods(row) {
+      const index = this.formobj.detailList.findIndex((item) => item.goodSpuSid == row.goodSpuSid)
+      console.log('>>>>>>>>>receivePerSelect', index)
+      this.formobj.detailList.splice(index, 1)
+    },
+    commodityComputeYHAndXSJE(row, val) {
+      console.log("aaa", row)
+      console.log("aaa", val)
 
+      row.amount = (Number(row.count) * Number(row.price)).toFixed(2)
     }
+
   }
+}
 </script>
 <style scoped>
   /deep/ .el-form-item__error {

yxt-as-ui/src/views/storage/stocktaking/index.vue

@@ -10,42 +10,28 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="部门名称">
-                <el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.deptNmae" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="盘点编号">
-                <el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="生成日期">
-                <el-date-picker
+                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
-                  v-model="queryParams.params.createDateStart"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
-                  type="date"
-                  placeholder="选择日期"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                  style="width: 200px;"
-                  @change="selectTime1"
-                />
                 至
-                <el-date-picker
+                <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
-                  v-model="queryParams.params.createDateEnd"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
-                  type="date"
-                  placeholder="选择日期"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                  style="width: 200px;"
-                  @change="selectTime2"
-                />
               </el-form-item>
               <el-form-item label="盘库状态">
-                <el-select v-model="queryParams.params.reviewStatus" placeholder="请选择">
+                <el-select v-model="queryParams.params.checkState" placeholder="请选择">
-                  <el-option v-for="item in stocktakTypeList" :key="item" :label="item.name" :value="item.name" />
+                  <el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.name" />
                 </el-select>
               </el-form-item>
               <el-form-item label="盘点人">
-                <el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="监盘人">
-                <el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.superviseName" placeholder="" clearable />
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -61,106 +47,102 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            v-loading="tableLoading"
+            @selection-change="selectionLineChangeHandle">
-            :data="dataList"
-            border
-            style="width: 100%"
-            @selection-change="selectionLineChangeHandle"
-          >
             <el-table-column fixed width="50" type="selection" align="center" />
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
             <el-table-column fixed label="操作" align="center" width="220">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
-                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" v-show="scope.row.state=='0'"
-                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">盘库报告</el-button>
+                  @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" v-show="scope.row.state=='0'"
+                  @click="toReport(scope.row)">盘库报告</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" label="流程状态" width="120" align="center" />
+            <el-table-column prop="nodeState" label="流程状态" width="120" align="center" />
-            <el-table-column prop="billNo" label="部门" width="120" align="center" />
+            <el-table-column prop="deptName" label="部门" width="120" align="center" />
             <el-table-column prop="billNo" label="盘点编号" width="120" align="center" />
-            <el-table-column prop="createDate" label="生成日期" width="120" align="center" />
+            <el-table-column prop="createTime" label="生成日期" width="120" align="center" />
             <el-table-column prop="createByName" label="盘点人" width="120" align="center" />
-            <el-table-column prop="checkStateName" label="监盘人" width="120" align="center" />
+            <el-table-column prop="superviseName" label="监盘人" width="120" align="center" />
-            <el-table-column prop="completeDate" label="盘库状态" width="120" align="center" />
+            <el-table-column prop="checkState" label="盘库状态" width="120" align="center" />
             <el-table-column label="应盘" align="center">
-              <el-table-column prop="completeDate" label="数量" align="center" width="100" />
+              <el-table-column prop="bookCount" label="数量" align="center" width="100" />
-              <el-table-column prop="completeDate" label="金额" align="center" width="100" />
+              <el-table-column prop="bookAmount" label="金额" align="center" width="100" />
             </el-table-column>
             <el-table-column label="实盘" align="center">
-              <el-table-column prop="completeDate" label="数量" align="center" width="100" />
+              <el-table-column prop="realCount" label="数量" align="center" width="100" />
-              <el-table-column prop="completeDate" label="金额" align="center" width="100" />
+              <el-table-column prop="realAmount" label="金额" align="center" width="100" />
             </el-table-column>
             <el-table-column label="未盘" align="center">
-              <el-table-column prop="completeDate" label="数量" align="center" width="100" />
+              <el-table-column prop="notCount" label="数量" align="center" width="100" />
-              <el-table-column prop="completeDate" label="金额" align="center" width="100" />
+              <el-table-column prop="notAmount" label="金额" align="center" width="100" />
             </el-table-column>
             <el-table-column label="盘盈" align="center">
-              <el-table-column prop="completeDate" label="数量" align="center" width="100" />
+              <el-table-column prop="profitCount" label="数量" align="center" width="100" />
-              <el-table-column prop="completeDate" label="金额" align="center" width="100" />
+              <el-table-column prop="profitAmount" label="金额" align="center" width="100" />
             </el-table-column>
             <el-table-column label="盘亏" align="center">
-              <el-table-column prop="completeDate" label="数量" align="center" width="100" />
+              <el-table-column prop="loseCount" label="数量" align="center" width="100" />
-              <el-table-column prop="completeDate" label="金额" align="center" width="100" />
+              <el-table-column prop="loseAmount" label="金额" align="center" width="100" />
             </el-table-column>
             <el-table-column label="盘损" align="center">
-              <el-table-column prop="completeDate" label="数量" align="center" width="100" />
+              <el-table-column prop="lossCount" label="数量" align="center" width="100" />
-              <el-table-column prop="completeDate" label="金额" align="center" width="100" />
+              <el-table-column prop="lossAmount" label="金额" align="center" width="100" />
             </el-table-column>
-            <el-table-column prop="lossAmount" label="备注" align="center" width="200" />
+            <el-table-column prop="remarks" label="备注" align="center" width="200" />
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
           <div class="tit" />
           <!--  翻页  -->
-          <pagination
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            v-show="dataList.length > 0"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
-            :total="queryParams.total"
-            :page.sync="queryParams.current"
-            :limit.sync="queryParams.size"
-            class="pagination"
-            @pagination="loadList"
-          />
         </div>
       </div>
     </div>
-    <!-- End 查询和其列表部分 -->
+
-    <!-- 新增修改部分组件 -->
+    <!-- 盘库 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <stocktakingRackCodeList v-show="viewState == 2 " ref="divstocktak" @doback="resetState" @reloadlist="loadList" />
+    <!-- 办理 -->
+    <stocktakingEditReport v-show="viewState == 3 " ref="divedit" @doback="resetState" @reloadlist="loadList" />
+    <!-- 盘库报告 -->
+    <stocktakingReportDetail v-show="viewState == 4 " ref="divreport" @doback="resetState" @reloadlist="loadList" />
+    <!--查看详情 -->
+    <stocktakingInfo v-show="viewState == 5" ref="divinfo" @doback="resetState" />
 
     <el-dialog title="新建盘点单" :visible.sync="dialogVisible" :before-close="handleClose">
-      <el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj">
+      <el-form ref="form_obj" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj">
         <el-row class="first_row">
           <el-col :span="6">
             <div class="span-sty">盘点人</div>
-            <el-form-item> <span class="addinputInfo addinputw">审核结果</span></el-form-item>
+            <el-form-item> <span class="addinputInfo addinputw">{{formobj.createByName}}</span></el-form-item>
           </el-col>
           <el-col :span="6">
             <div class="span-sty">生成日期</div>
-            <el-form-item> <span class="addinputInfo addinputw">审核结果</span></el-form-item>
+            <el-form-item> <span class="addinputInfo addinputw">{{formobj.createDate}}</span></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">监盘人</div>
+            <div class="span-sty"><span class="must">*</span> 监盘人</div>
-            <el-form-item><el-select
+            <el-form-item prop="superviseName">
-              v-model="queryParams.params.reviewStatus"
+              <el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw"
-              placeholder="请选择"
+                @change="selectFinance">
-              class="addinputInfo addinputw"
+                <el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid" />
-            >
+              </el-select>
-              <el-option v-for="item in stocktakTypeList" :key="item" :label="item.name" :value="item.name" />
+              <!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
-            </el-select></el-form-item>
+                multiple @change="selectFinance">
+                <el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
+              </el-select> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
-            <el-form-item><el-input
+            <el-form-item><el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw"
-              v-model="formobj.remarks"
+                clearable />
-              placeholder="请填写"
-              class="addinputInfo addinputw"
-              clearable
-            />
             </el-form-item>
           </el-col>
         </el-row>
@@ -181,13 +163,28 @@
   import ButtonBar from '@/components/ButtonBar'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
-  import divAdd from './stocktakingAdd.vue'
+  import stocktakingAdd from './stocktakingAdd.vue'
+  import stocktakingInfo from './stocktakingInfo.vue'
+  import stocktakingRackCodeList from './stocktakingRackCodeList.vue'
+  import stocktakingEditReport from './stocktakingEditReport.vue'
+  import stocktakingReportDetail from './stocktakingReportDetail.vue'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    selAllByOrgSidPath
+  } from '@/api/Common/dictcommons'
+
   export default {
     components: {
       ButtonBar,
       Pagination,
       pageye,
-      divAdd
+      stocktakingAdd,
+      stocktakingInfo,
+      stocktakingRackCodeList,
+      stocktakingEditReport,
+      stocktakingReportDetail
     },
     data() {
       return {
@@ -209,14 +206,14 @@
             type: 'primary',
             size: 'small',
             icon: 'edit',
-            btnKey: 'toEdit',
+            btnKey: 'toShowBill',
             btnLabel: '盘库'
           },
           {
             type: 'primary',
             size: 'small',
             icon: 'edit',
-            btnKey: 'toEdit',
+            btnKey: 'toStocktak',
             btnLabel: '生成盘库报告'
           },
           {
@@ -232,13 +229,18 @@
           size: 10,
           total: 0,
           params: {
-            'createDateStart': '',
+            "deptNmae": "",
-            'createDateEnd': ''
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "checkState": "",
+            "createByName": "",
+            "superviseName": ""
           }
         },
         sids: [],
         selectionList: [],
-        stocktakTypeList: [{
+        checkStateList: [{
             sid: '1',
             name: '未完成'
           },
@@ -247,22 +249,104 @@
             name: '已完成'
           }
         ],
-        formobj: {}
+        formobj: {
+          createByName: window.sessionStorage.getItem('name'),
+          createBySid: window.sessionStorage.getItem('userSid'),
+          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          createDate: getCurrentDate(),
+          superviseName: '',
+          superviseSid: '',
+          remarks: ""
+        },
+        financeList: [],
+        rules: {
+          superviseName: [{
+            required: true,
+            message: '监盘人不能为空',
+            trigger: 'change'
+          }],
+        }
       }
     },
     mounted() {
       this.$refs['btnbar'].setButtonList(this.btnList)
     },
     created() {
-      // this.loadList()
+      this.loadList()
+
+      selAllByOrgSidPath({
+        orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+      }).then((res) => {
+        if (res.success) {
+          this.financeList = res.data
+
+          console.log("aaaaaa", this.financeList);
+
+        }
+      })
+
     },
     methods: {
+      selectFinance(val) {
+
+        console.log('>>>>>>>>>selectFinance', val)
+
+        const choose = this.financeList.filter((item) => val.includes(item.sid))
+        console.log('>>>>>>>>>selectFinance', choose)
+        this.formobj.superviseName = choose[0].name
+        this.formobj.superviseSid = choose[0].sid
+
+        // this.formobj.finances = []
+        // for (var i = 0; i < choose.length; i++) {
 
+        //   this.formobj.finances.push({
+        //     name: choose[i].name,
+        //     sid: choose[i].sid
+        //   })
+
+        // }
+
+      },
       handleClose() {
         this.dialogVisible = false
+        this.formobj.superviseName = ''
+        this.formobj.superviseSid = ''
+        this.formobj.remarks = ''
       },
       saveExamine() {
-        this.dialogVisible = false
+
+        console.log('>>>>>>>>>saveExamine', this.formobj)
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.createBill(this.formobj).then((resp) => {
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: '操作成功',
+                  showClose: true
+                })
+
+                this.dialogVisible = false
+                this.formobj = {
+                  createByName: window.sessionStorage.getItem('name'),
+                  createBySid: window.sessionStorage.getItem('userSid'),
+                  deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                    .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+                  deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                    .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+                  createDate: getCurrentDate(),
+                  superviseName: '',
+                  superviseSid: '',
+                  remarks: ""
+                }
+                this.loadList()
+              }
+            }).catch(() => {})
+          }
+        })
       },
 
       // 搜索条件效果
@@ -279,8 +363,11 @@
           case 'toAdd':
             this.toAdd()
             break
-          case 'toEdit':
+          case 'toShowBill':
-            this.toEdit()
+            this.toShowBill()
+            break
+          case 'toStocktak':
+            this.toStocktak()
             break
           case 'doClose':
             this.doClose()
@@ -291,6 +378,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
@@ -305,6 +395,17 @@
         }).catch(() => {
           this.tableLoading = false
         })
+
+        // this.$http({
+        //   method: "post",
+        //   url: "http://127.0.0.1:4523/mock/430173/user/list",
+        //   params: this.queryParams,
+        // }).then((resp) => {
+        //   const data = resp.data
+        //   this.queryParams.total = data.total
+        //   this.dataList = data.records
+        // });
+
       },
 
       // 序号
@@ -323,8 +424,13 @@
           size: 10,
           total: 0,
           params: {
-            'createDateStart': '',
+            "deptNmae": "",
-            'createDateEnd': ''
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "checkState": "",
+            "createByName": "",
+            "superviseName": ""
           }
         }
         this.loadList()
@@ -333,14 +439,43 @@
         // this.viewState = 2
         // this.$refs['divadd'].showAdd()
 
+
         this.dialogVisible = true
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
       },
       selectionLineChangeHandle(val) {
         console.log('val', val)
 
         this.selectionList = val
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      toDetail(row) {
+        console.log('toDetail', row)
+
+        this.viewState = 5
+        this.$refs['divinfo'].showDetail(row.sid)
+      },
+      toShowBill() {
+
+        if (this.selectionList.length != 1) {
+          this.$message({
+            type: 'warning',
+            message: '请选择一条数据。',
+            showClose: true
+          })
+          return
+        }
+
+        this.viewState = 2
+        this.$refs['divstocktak'].showDetail(this.selectionList[0].sid)
       },
-      toEdit() {
+      toStocktak() {
         if (this.selectionList.length != 1) {
           this.$message({
             type: 'warning',
@@ -350,28 +485,46 @@
           return
         }
 
-        if (this.selectionList[0].checkState == 2) {
+
+        if (this.selectionList[0].state == '0') {
           this.$message({
             type: 'warning',
-            message: '此记录已完成,不可重复编辑。',
+            message: '所选记录已生成报告,不可重复生成。',
             showClose: true
           })
           return
         }
+        var params = {
+          sid: this.selectionList[0].sid
+        }
+
+        req.billCreateReport(params).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '操作成功',
+              showClose: true
+            })
+
+            this.loadList()
+          }
+        }).catch(() => {})
 
+      },
+      toEdit(row) {
         this.viewState = 3
-        this.$refs['divadd'].showEdit(this.selectionList[0])
+        this.$refs['divedit'].showEdit(row.sid)
+      },
+      toReport(row) {
+
+        this.viewState = 4
+        this.$refs['divreport'].showDetail(row.sid)
       },
       doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
       },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-
       resetState() {
         this.viewState = 1
       }

yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>编辑盘库报告</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="downLoadPDF()">下载pdf</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+
+          <el-row class="first_row">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">盘点人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">监盘人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.finances }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                  clearable /></el-form-item>
+            </el-col>
+          </el-row>
+
+          <div class="title titleOne">
+            <div>总体盘点情况</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="downLoadDetail()">明细下载</el-button>
+          </div>
+
+          <div style="display: flex;flex-direction: row;align-items: center;
+        border: 1px solid #E0E3EB;line-height: 30px;padding: 5px 10px;">
+
+            <div style="flex: 1;">
+              <span> 应盘数量:</span>
+              <span> {{formobj.ypNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 应盘金额:</span>
+              <span> {{formobj.ypMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 实盘数量:</span>
+              <span> {{formobj.spNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 实盘金额:</span>
+              <span> {{formobj.spMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘盈数量:</span>
+              <span> {{formobj.pyNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘盈金额:</span>
+              <span> {{formobj.pyMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘亏数量:</span>
+              <span> {{formobj.pkNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘亏金额:</span>
+              <span> {{formobj.pkMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘损数量:</span>
+              <span> {{formobj.psNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘损金额:</span>
+              <span> {{formobj.psMoney}}</span>
+            </div>
+
+          </div>
+
+          <div class="title titleOne">
+            <div>仓库盘点情况</div>
+          </div>
+          <el-table :data="formobj.warehouseStocktakList" :index="index" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="200" align="center" />
+            <el-table-column prop="ypNum" label="应盘" align="center" />
+            <el-table-column prop="ypMoney" label="应盘金额" align="center" />
+            <el-table-column prop="spNum" label="实盘" align="center" />
+            <el-table-column prop="spMoney" label="实盘金额" align="center" />
+            <el-table-column prop="pyNum" label="盘盈" align="center" />
+            <el-table-column prop="pyMoney" label="盘盈金额" align="center" />
+            <el-table-column prop="pkNum" label="盘亏" align="center" />
+            <el-table-column prop="pkMoney" label="盘亏金额" align="center" />
+            <el-table-column prop="psNum" label="盘损" align="center" />
+            <el-table-column prop="psMoney" label="盘损金额" align="center" />
+          </el-table>
+
+          <div class="title titleOne">
+            <div>库区盘点情况</div>
+          </div>
+          <el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="warehouseAreaeName" label="仓库-库区" width="200" align="center" />
+            <el-table-column prop="ypNum" label="应盘" align="center" />
+            <el-table-column prop="ypMoney" label="应盘金额" align="center" />
+            <el-table-column prop="spNum" label="实盘" align="center" />
+            <el-table-column prop="spMoney" label="实盘金额" align="center" />
+            <el-table-column prop="pyNum" label="盘盈" align="center" />
+            <el-table-column prop="pyMoney" label="盘盈金额" align="center" />
+            <el-table-column prop="pkNum" label="盘亏" align="center" />
+            <el-table-column prop="pkMoney" label="盘亏金额" align="center" />
+            <el-table-column prop="psNum" label="盘损" align="center" />
+            <el-table-column prop="psMoney" label="盘损金额" align="center" />
+          </el-table>
+
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/stocktaking.js'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    getOrgSidByPath,
+  } from '@/api/Common/dictcommons'
+  export default {
+    data() {
+      return {
+        viewState: 1,
+        submitdisabled: false,
+        index: 0,
+
+        formobj: {
+          "createByName": window.sessionStorage.getItem('name'),
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "createName": "",
+          "finances": "",
+          "remarks": "",
+          "ypNum": "",
+          "ypMoney": "",
+          "spNum": "",
+          "spMoney": "",
+          "pyNum": "",
+          "pyMoney": "",
+          "pkNum": "",
+          "pkMoney": "",
+          "psNum": "",
+          "psMoney": "",
+          "warehouseStocktakList": [],
+          "arehouseAreaeStocktakList": [],
+          "useOrgSid": '',
+          "createOrgSid": '',
+
+        },
+      }
+    },
+
+    created() {
+
+    },
+    methods: {
+
+      init() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+      },
+
+      showEdit(row) {
+
+        req.init(row.sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+
+            this.formobj.createByName = window.sessionStorage.getItem('name')
+            this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+            this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+              .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+            this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+              .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+            this.formobj.createTime = getCurrentDate()
+            this.init()
+          }
+        })
+      },
+
+      saveOrUpdate() {
+        this.submitdisabled = true
+        req.saveReport(this.formobj).then((res) => {
+          if (res.success) {
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: '保存成功'
+            })
+            this.handleReturn('true')
+          } else {
+            this.submitdisabled = false
+          }
+        }).catch(() => {
+          this.submitdisabled = false
+        })
+      },
+      submit() {
+
+        req.submitReport(this.formobj).then((res) => {
+          if (res.success) {
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: '操作成功'
+            })
+            this.handleReturn('true')
+          } else {
+            this.submitdisabled = false
+          }
+        }).catch(() => {
+          this.submitdisabled = false
+        })
+
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {}
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+      downLoadPDF() {
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.downloadPDF().then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel'
+          })
+          const fileName = '盘库报告' + '.pdf'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      },
+      downLoadDetail() {
+
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.downloadExcel().then((resp) => {
+          loading.close()
+          const blob = new Blob([resp], {
+            type: 'application/vnd.ms-excel'
+          })
+          const fileName = '总体盘库明细' + '.xls'
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'nonde'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href)
+          document.body.removeChild(elink)
+        }).catch(() => {
+          loading.close()
+        })
+
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>

yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue

@@ -0,0 +1,374 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="商品盘点明细" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="仓库">
+                <el-select v-model="queryParams.params.warehouseName" placeholder="请选择仓库"
+                  @change="selectWarehouseChange">
+                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
+                    :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="库区">
+                <el-select v-model="queryParams.params.warehouseAreaName" placeholder="请选择库区"
+                  @change="selectWarehouseAreaChange">
+                  <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName"
+                    :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="库位">
+                <el-select v-model="queryParams.params.warehouseRackName" placeholder="请选择库位">
+                  <el-option v-for="item in  warehouseRackList" :key="item.sid" :label="item.rackName"
+                    :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="商品ID">
+                <el-input v-model="queryParams.params.goodsID" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品名称">
+                <el-input v-model="queryParams.params.goodsSkuTitle" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品图号">
+                <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">商品盘点记录</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
+            <el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center" />
+            <el-table-column prop="goodsSkuCode" label="图号" width="120" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="120" align="center" />
+            <el-table-column prop="warehouseArea" label="库区" width="120" align="center" />
+            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center" />
+            <el-table-column prop="unit" label="单位" width="120" align="center" />
+            <el-table-column prop="cost" label="单价" width="120" align="center" />
+            <el-table-column prop="bookCount" label="库存数量" width="120" align="center" />
+            <el-table-column prop="bookAmount" label="库存金额" width="120" align="center" />
+            <el-table-column prop="realCount" label="实盘数量" width="120" align="center" />
+            <el-table-column prop="realCount" label="实盘金额" width="120" align="center" />
+            <el-table-column prop="state" label="状态" width="120" align="center" />
+            <el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center" />
+            <el-table-column prop="profitAndLoseAmount" label="盈亏金额" width="120" align="center" />
+            <el-table-column prop="lossCount" label="盘损数量" width="120" align="center" />
+            <el-table-column prop="lossAmount" label="盘损金额" width="120" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" width="200" />
+            <el-table-column label="附件" align="center">
+              <template slot-scope="scope">
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.fillPaths)">
+                  查看
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+
+    <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
+
+      <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
+
+        <el-row class="first_row">
+          <el-col :span="24" class="trightb">
+            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
+              v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item]">
+            </el-image>
+          </el-col>
+        </el-row>
+
+      </el-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/stocktaking.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import req2 from '@/api/warehouse/warehouse.js'
+  import req3 from '@/api/warehouse/warehouseArea.js'
+  import req4 from '@/api/warehouse/goodsShelves.js'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "billSid": "",
+            "warehouseSid": "",
+            "warehouseName": "",
+            "warehouseAreaSid": "",
+            "warehouseAreaName": "",
+            "warehouseRackSid": "",
+            "goodsID": "",
+            "goodsSkuTitle": "",
+            "goodsSkuCode": ""
+          }
+        },
+        billSid: "",
+        fileList: [],
+        warehouseList: [],
+        warehouseAreaList: [],
+        warehouseRackList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+
+    },
+    methods: {
+      initData() {
+
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+
+        req2.getAllWarehouse(parpams).then(resp => {
+          this.warehouseList = resp.data
+        })
+      },
+
+      getWarehouseArea(sid) {
+        this.queryParams.params.warehouseAreaSid = ''
+        this.queryParams.params.warehouseAreaName = ''
+
+        var params = {
+          ckSid: sid
+        }
+
+        req3.getAllWarehouseareaBysid(params).then(resp => {
+          console.log('>>>>>>>>>getAllWarehousearea', resp)
+          this.warehouseAreaList = resp.data
+        }).catch(() => {})
+      },
+
+      getAllTypeByAreaSid(sid) {
+        this.queryParams.params.warehouseRackSid = ''
+        this.queryParams.params.warehouseRackName = ''
+
+        var params = {
+          areaSid: sid
+        }
+
+        req4.getAllTypeByAreaSid(params).then(resp => {
+          console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
+          this.warehouseRackList = resp.data
+        }).catch(() => {})
+      },
+
+
+      selectWarehouseChange(val) {
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseChange', choose)
+        this.queryParams.params.warehouseSid = choose[0].sid
+        this.queryParams.params.warehouseName = choose[0].warehouseName
+
+        this.getWarehouseArea(choose[0].sid)
+
+      },
+
+      selectWarehouseAreaChange(val) {
+        const choose = this.warehouseAreaList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
+        this.queryParams.params.warehouseAreaSid = choose[0].sid
+        this.queryParams.params.warehouseAreaName = choose[0].areaName
+
+        this.getAllTypeByAreaSid(choose[0].sid)
+      },
+
+      selectWarehouseRackChange(val) {
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseRackChange', choose)
+        this.queryParams.params.warehouseRackSid = choose[0].sid
+        this.queryParams.params.warehouseRackName = choose[0].rackName
+
+      },
+
+
+      showImage(paths) {
+        this.fileList = paths
+        this.dialogVisible = true
+      },
+      handleClose() {
+        this.dialogVisible = false
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.close()
+            break
+          default:
+            break
+        }
+      },
+
+      showDetail(sid) {
+        this.initData()
+        this.billSid = sid
+        this.queryParams.params.billSid = sid
+        this.loadList()
+      },
+
+      loadList() {
+
+        this.tableLoading = true
+
+        req.billDetail(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "billSid": this.billSid,
+            "warehouseSid": "",
+            "warehouseName": "",
+            "warehouseAreaSid": "",
+            "warehouseAreaName": "",
+            "warehouseRackSid": "",
+            "goodsID": "",
+            "goodsSkuTitle": "",
+            "goodsSkuCode": ""
+          }
+        }
+        this.loadList()
+      },
+
+      close() {
+        this.$emit('doback')
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 90px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 80px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 80px !important;
+    width: calc(100% - 70px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 180px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>

yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="库位商品盘点明细" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="商品ID">
+                <el-input v-model="queryParams.params.goodsID" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品名称">
+                <el-input v-model="queryParams.params.goodsSkuTitle" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="商品图号">
+                <el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">商品盘点记录</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
+            <el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center" />
+            <el-table-column prop="goodsSkuCode" label="图号" width="120" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="120" align="center" />
+            <el-table-column prop="warehouseArea" label="库区" width="120" align="center" />
+            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center" />
+            <el-table-column prop="unit" label="单位" width="120" align="center" />
+            <el-table-column prop="cost" label="单价" width="120" align="center" />
+            <el-table-column prop="bookCount" label="库存数量" width="120" align="center" />
+            <el-table-column prop="bookAmount" label="库存金额" width="120" align="center" />
+            <el-table-column prop="realCount" label="实盘数量" width="120" align="center" />
+            <el-table-column prop="realCount" label="实盘金额" width="120" align="center" />
+            <el-table-column prop="state" label="状态" width="120" align="center" />
+            <el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center" />
+            <el-table-column prop="profitAndLoseAmount" label="盈亏金额" width="120" align="center" />
+            <el-table-column prop="lossCount" label="盘损数量" width="120" align="center" />
+            <el-table-column prop="lossAmount" label="盘损金额" width="120" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" width="200" />
+            <el-table-column label="附件" align="center">
+              <template slot-scope="scope">
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.fillPaths)">
+                  查看
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+
+    <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
+
+      <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
+
+        <el-row class="first_row">
+          <el-col :span="24" class="trightb">
+            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
+              v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item]">
+            </el-image>
+          </el-col>
+        </el-row>
+
+      </el-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/stocktaking.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "billSid": "",
+            "warehouseRackSid": "",
+            "goodsID": "",
+            "goodsSkuTitle": "",
+            "goodsSkuCode": ""
+          }
+        },
+        billSid: "",
+        warehouseRackSid: "",
+        fileList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+
+    },
+    methods: {
+      showImage(paths) {
+        this.fileList = paths
+        this.dialogVisible = true
+      },
+      handleClose() {
+        this.dialogVisible = false
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.close()
+            break
+          default:
+            break
+        }
+      },
+
+      showDetail(sid, warehouseRackSid) {
+        this.billSid = sid
+        this.warehouseRackSid = warehouseRackSid
+        this.queryParams.params.billSid = sid
+        this.queryParams.params.warehouseRackSid = warehouseRackSid
+        this.loadList()
+      },
+
+      loadList() {
+        this.tableLoading = true
+        req.billRackCodeDetail(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "billSid": this.billSid,
+            "warehouseRackSid": this.warehouseRackSid,
+            "goodsID": "",
+            "goodsSkuTitle": "",
+            "goodsSkuCode": ""
+          }
+        }
+        this.loadList()
+      },
+
+      close() {
+        this.$emit('doback')
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 90px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 80px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 80px !important;
+    width: calc(100% - 70px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 180px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>

yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue

@@ -0,0 +1,352 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="盘库明细" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="仓库">
+                <el-select v-model="queryParams.params.warehouseName" placeholder="请选择仓库"
+                  @change="selectWarehouseChange">
+                  <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
+                    :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="库区">
+                <el-select v-model="queryParams.params.warehouseAreaName" placeholder="请选择库区"
+                  @change="selectWarehouseAreaChange">
+                  <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName"
+                    :value="item.sid" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="库位">
+                <el-select v-model="queryParams.params.warehouseRackName" placeholder="请选择库位">
+                  <el-option v-for="item in  warehouseRackList" :key="item.sid" :label="item.rackName"
+                    :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">库位盘点列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="100">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="warehouseName" label="仓库" width="120" align="center" />
+            <el-table-column prop="warehouseArea" label="库区" width="120" align="center" />
+            <el-table-column prop="warehouseRackName" label="库位" width="120" align="center" />
+            <el-table-column label="应盘" align="center">
+              <el-table-column prop="bookCount" label="数量" align="center" width="100" />
+              <el-table-column prop="bookAmount" label="金额" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="实盘" align="center">
+              <el-table-column prop="realCount" label="数量" align="center" width="100" />
+              <el-table-column prop="realAmount" label="金额" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="未盘" align="center">
+              <el-table-column prop="notCount" label="数量" align="center" width="100" />
+              <el-table-column prop="notAmount" label="金额" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="盘盈" align="center">
+              <el-table-column prop="profitCount" label="数量" align="center" width="100" />
+              <el-table-column prop="profitAmount" label="金额" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="盘亏" align="center">
+              <el-table-column prop="loseCount" label="数量" align="center" width="100" />
+              <el-table-column prop="loseAmount" label="金额" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="盘损" align="center">
+              <el-table-column prop="lossCount" label="数量" align="center" width="100" />
+              <el-table-column prop="lossAmount" label="金额" align="center" width="100" />
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- 查看库位明细 -->
+    <stocktakingRackCodeDetail v-show="viewState == 2" ref="divSp" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/stocktaking.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import stocktakingRackCodeDetail from './stocktakingRackCodeDetail.vue'
+  import req2 from '@/api/warehouse/warehouse.js'
+  import req3 from '@/api/warehouse/warehouseArea.js'
+  import req4 from '@/api/warehouse/goodsShelves.js'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      stocktakingRackCodeDetail
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "billSid": "",
+            "warehouseSid": "",
+            "warehouseName": "",
+            "warehouseAreaSid": "",
+            "warehouseAreaName": "",
+            "warehouseRackSid": "",
+          }
+        },
+        billSid: "",
+        warehouseList: [],
+        warehouseAreaList: [],
+        warehouseRackList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+
+    },
+    methods: {
+
+      initData() {
+
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+
+        req2.getAllWarehouse(parpams).then(resp => {
+          this.warehouseList = resp.data
+        })
+      },
+
+      getWarehouseArea(sid) {
+        this.queryParams.params.warehouseAreaSid = ''
+        this.queryParams.params.warehouseAreaName = ''
+
+        var params = {
+          ckSid: sid
+        }
+
+        req3.getAllWarehouseareaBysid(params).then(resp => {
+          console.log('>>>>>>>>>getAllWarehousearea', resp)
+          this.warehouseAreaList = resp.data
+        }).catch(() => {})
+      },
+
+      getAllTypeByAreaSid(sid) {
+        this.queryParams.params.warehouseRackSid = ''
+        this.queryParams.params.warehouseRackName = ''
+
+        var params = {
+          areaSid: sid
+        }
+
+        req4.getAllTypeByAreaSid(params).then(resp => {
+          console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
+          this.warehouseRackList = resp.data
+        }).catch(() => {})
+      },
+
+
+      selectWarehouseChange(val) {
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseChange', choose)
+        this.queryParams.params.warehouseSid = choose[0].sid
+        this.queryParams.params.warehouseName = choose[0].warehouseName
+
+        this.getWarehouseArea(choose[0].sid)
+
+      },
+
+      selectWarehouseAreaChange(val) {
+        const choose = this.warehouseAreaList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
+        this.queryParams.params.warehouseAreaSid = choose[0].sid
+        this.queryParams.params.warehouseAreaName = choose[0].areaName
+
+        this.getAllTypeByAreaSid(choose[0].sid)
+      },
+
+      selectWarehouseRackChange(val) {
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseRackChange', choose)
+        this.queryParams.params.warehouseRackSid = choose[0].sid
+        this.queryParams.params.warehouseRackName = choose[0].rackName
+
+      },
+
+
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.close()
+            break
+          default:
+            break
+        }
+      },
+      showDetail(sid) {
+        this.initData()
+        this.billSid = sid
+        this.queryParams.params.billSid = sid
+        this.loadList()
+      },
+
+      loadList() {
+        this.tableLoading = true
+        req.billStocktak(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "billSid": this.billSid,
+            "warehouseSid": "",
+            "warehouseName": "",
+            "warehouseAreaSid": "",
+            "warehouseAreaName": "",
+            "warehouseRackSid": "",
+          }
+        }
+        this.loadList()
+      },
+
+      toDetail(row) {
+
+        this.viewState = 2
+        this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid)
+      },
+      close() {
+        this.$emit('doback')
+      },
+
+      resetState() {
+        this.viewState = 1
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 90px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 80px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 80px !important;
+    width: calc(100% - 70px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 180px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>

yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>盘库报告</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="settle()">下载pdf</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+
+          <el-row class="first_row">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">盘点人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">监盘人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.finances }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+
+          <div class="title titleOne">
+            <div>总体盘点情况</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="seleMaintenance()">明细下载</el-button>
+          </div>
+
+          <div style="display: flex;flex-direction: row;align-items: center;
+       border: 1px solid #E0E3EB;line-height: 30px;padding: 5px 10px;">
+
+            <div style="flex: 1;">
+              <span> 应盘数量:</span>
+              <span> {{formobj.ypNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 应盘金额:</span>
+              <span> {{formobj.ypMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 实盘数量:</span>
+              <span> {{formobj.spNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 实盘金额:</span>
+              <span> {{formobj.spMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘盈数量:</span>
+              <span> {{formobj.pyNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘盈金额:</span>
+              <span> {{formobj.pyMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘亏数量:</span>
+              <span> {{formobj.pkNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘亏金额:</span>
+              <span> {{formobj.pkMoney}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘损数量:</span>
+              <span> {{formobj.psNum}}</span>
+            </div>
+
+            <div style="flex: 1;">
+              <span> 盘损金额:</span>
+              <span> {{formobj.psMoney}}</span>
+            </div>
+
+          </div>
+
+          <div class="title titleOne">
+            <div>仓库盘点情况</div>
+          </div>
+          <el-table :data="formobj.warehouseStocktakList" :index="index" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" align="center" />
+            <el-table-column prop="ypNum" label="应盘" align="center" />
+            <el-table-column prop="ypMoney" label="应盘金额" width="70" align="center" />
+            <el-table-column prop="spNum" label="实盘" width="150" align="center" />
+            <el-table-column prop="spMoney" label="实盘金额" align="center" />
+            <el-table-column prop="pyNum" label="盘盈" align="center" />
+            <el-table-column prop="pyMoney" label="盘盈金额" align="center" />
+            <el-table-column prop="pkNum" label="盘亏" align="center" width="100" />
+            <el-table-column prop="pkMoney" label="盘亏金额" align="center" width="100" />
+            <el-table-column prop="psNum" label="盘损" align="center" width="100" />
+            <el-table-column prop="psMoney" label="盘损金额" align="center" width="100" />
+          </el-table>
+
+          <div class="title titleOne">
+            <div>库区盘点情况</div>
+          </div>
+          <el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="warehouseAreaeName" label="仓库-库区" align="center" />
+            <el-table-column prop="ypNum" label="应盘" align="center" />
+            <el-table-column prop="ypMoney" label="应盘金额" width="70" align="center" />
+            <el-table-column prop="spNum" label="实盘" width="150" align="center" />
+            <el-table-column prop="spMoney" label="实盘金额" align="center" />
+            <el-table-column prop="pyNum" label="盘盈" align="center" />
+            <el-table-column prop="pyMoney" label="盘盈金额" align="center" />
+            <el-table-column prop="pkNum" label="盘亏" align="center" width="100" />
+            <el-table-column prop="pkMoney" label="盘亏金额" align="center" width="100" />
+            <el-table-column prop="psNum" label="盘损" align="center" width="100" />
+            <el-table-column prop="psMoney" label="盘损金额" align="center" width="100" />
+          </el-table>
+
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/stocktaking.js'
+  export default {
+    data() {
+      return {
+        viewState: 1,
+        submitdisabled: false,
+        index: 0,
+
+        formobj: {},
+      }
+    },
+
+    created() {
+
+    },
+    methods: {
+      showDetail(sid) {
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {}
+        this.submitdisabled = false
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>

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
+}

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<AsCustomerVehicle> {
 	void delBySid(@Param("sid") String sid);
 
     IPage<AsCustomerCrmVehVo> customerList(IPage<AsCustomerVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<AsCustomerVehicle> qw);
+
+    List<CarListVo> getVehListByCustomerSid(@Param("customerSid") String customerSid);
+
+	int getVehListCountsByCustomerSid(@Param("customerSid") String customerSid);
 }

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
 		<where> ${ew.sqlSegment} </where>
 	</select>
+    <select id="getVehListByCustomerSid" resultType="com.yxt.anrui.as.api.ascustomervehicle.CarListVo">
+		SELECT
+			sid as asVinSid,
+			vinNo,
+			vehMark,
+			DATE_FORMAT( buyDate, '%Y-%m-%d' ) buyDate
+		FROM
+			as_customer_vehicle
+		WHERE
+			customerSid = #{customerSid}
+	</select>
+	<select id="getVehListCountsByCustomerSid" resultType="java.lang.Integer">
+		SELECT COUNT(*) FROM as_customer_vehicle WHERE customerSid = #{customerSid}
+	</select>
 </mapper>

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<List<CarListVo>> getVehListByCustomerSid(@RequestParam("customerSid") String customerSid){
+		ResultBean rb = ResultBean.fireFail();
+		List<CarListVo> 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;
+	}
+
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -263,4 +263,12 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         }
         return rb.success();
     }
+
+    public List<CarListVo> getVehListByCustomerSid(String customerSid) {
+        return baseMapper.getVehListByCustomerSid(customerSid);
+    }
+
+    public int getVehListCountsByCustomerSid(String customerSid) {
+        return baseMapper.getVehListCountsByCustomerSid(customerSid);
+    }
 }

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<List<WmsWarehouseRackVo>> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) {
+        return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid);
+    }
+
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
     public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) {

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<WmsInventoryCheckbillReportDetailsVo> 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<String> 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<WmsInventoryCheckbillDetailGoodPageListVo> pv = wmsInventoryCheckbillService.detailGoodPageList(pq);
 		return rb.success().setData(pv);
 	}
+
+	@ApiOperation("查看库区商品盘点列表")
+	@PostMapping("/detailRackGoodPageList")
+	public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq);
+		return rb.success().setData(pv);
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java

@@ -25,4 +25,6 @@ public interface WmsWarehouseRackMapper extends BaseMapper<WmsWarehouseRack> {
     WmsWarehouseRack checkForUpdate(@Param("rackCode")String rackCode,@Param("locationSid") String locationSid, @Param("sid")String sid);
 
     WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode);
+
+    List<WmsWarehouseRackVo> getAllTypeByAreaSid(String areaSid);
 }

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
         </foreach>
 
     </update>
+
+    <select id="getAllTypeByAreaSid" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo">
+        SELECT
+                sid,
+                rackName
+        FROM wms_warehouse_rack
+        WHERE locationSid = #{areaSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java

@@ -209,4 +209,10 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         }
         return rb.success().setData(info);
     }
+
+    public ResultBean<List<WmsWarehouseRackVo>> getAllTypeByAreaSid(String areaSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<WmsWarehouseRackVo> wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid);
+        return rb.success().setData(wmsWarehouseRackVos);
+    }
 }

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;
 
@@ -60,6 +62,8 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
 
 	IPage<WmsInventoryCheckbillDetailGoodPageListVo> detailGoodPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
 
+	IPage<WmsInventoryCheckbillDetailRackGoodPageListVo> detailRackGoodPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryCheckbill> qw);
+	
 	List<WmsInventoryCheckbillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
 	
 	@Select("select * from wms_inventory_checkbill")
@@ -68,4 +72,11 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
     String selectNum(String billNo);
 
 	int selectBySid(String join);
+
+	@Update("update wms_inventory_checkbill set state = 0 where sid = #{sid}")
+	void createReport(String sid);
+
+	String checkState(String deptSid);
+
+
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@@ -5,6 +5,8 @@
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillVo">
 		SELECT
+		wic.sid,
+		wic.state,
 		wic.`remarks`,
 		wic.`nodeState`,
 		wic.`deptName`,
@@ -45,8 +47,10 @@
 	<select id="detailRackPageList"
 			resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo">
 		SELECT
+				billSid,
 				warehouseName,
 				warehouseArea,
+				warehouseRackSid,
 				warehouseRackName,
 				SUM(bookCount) AS bookCount,
 				SUM(bookCount) * cost AS bookAmount,
@@ -115,6 +119,56 @@
 		<where> ${ew.sqlSegment} </where>
 	</select>
 
+	<select id="detailRackGoodPageList"
+			resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo">
+		SELECT
+		goodsID,
+		goodsSkuTitle,
+		goodsSkuCode,
+		warehouseName,
+		warehouseArea,
+		warehouseRackName,
+		unit,
+		cost,
+		bookCount,
+		bookCount * cost AS bookAmount,
+		realCount,
+		realCount * cost AS realAmount,
+		CASE
+		state
+		WHEN 0
+		THEN '正常'
+		WHEN 1
+		THEN '盘盈'
+		WHEN 2
+		THEN '盘亏'
+		END AS state,
+		CASE
+		state
+		WHEN 0
+		THEN 0
+		WHEN 1
+		THEN profitCount
+		WHEN 2
+		THEN loseCount
+		END AS profitAndLoseCount,
+		CASE
+		state
+		WHEN 0
+		THEN 0
+		WHEN 1
+		THEN profitCount * cost
+		WHEN 2
+		THEN loseCount * cost
+		END AS profitAndLoseAmount,
+		lossCount,
+		lossCount * cost AS lossAmount,
+		remarks
+		FROM
+		wms_inventory_checkbill_detail
+		<where> ${ew.sqlSegment} </where>
+	</select>
+
 	<select id="selectListAllVo" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillVo">
 		SELECT * FROM wms_inventory_checkbill <where> ${ew.sqlSegment} </where>
 	</select>
@@ -133,4 +187,14 @@
 		WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
 	</select>
+
+	<select id="checkState" resultType="java.lang.String">
+		SELECT
+				nodeState
+		FROM
+				wms_inventory_checkbill
+		WHERE deptSid = #{deptSid}
+		ORDER BY createTime DESC
+				LIMIT 1
+	</select>
 </mapper>