车型标签和公告型号接口开发。

调车表字段补充完善。
调车开票接口对接及完善。

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodel.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+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-base(公告型号) <br/>
+ * File: BaseAnnouncementmodel.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodel <br/>
+ * Description: 公告型号. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号", description = "公告型号")
+@TableName("base_announcementmodel")
+public class BaseAnnouncementmodel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("公告型号名称")
+    private String announcementmodelName; // 公告型号名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDetailsVo;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDto;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo <br/>
+ * Description: 公告型号 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号 视图数据详情", description = "公告型号 视图数据详情")
+public class BaseAnnouncementmodelDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("公告型号名称")
+    private String announcementmodelName; // 公告型号名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("公告型号参数")
+    private List<BaseAnnouncementmodelParamDetailsVo> baseAnnouncementmodelParams; // 公告型号参数
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelDto.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelDto <br/>
+ * Description: 公告型号 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号 数据传输对象", description = "公告型号 数据传输对象")
+public class BaseAnnouncementmodelDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("公告型号名称")
+    private String announcementmodelName; // 公告型号名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("公告型号参数")
+    private List<BaseAnnouncementmodelParamDto> baseAnnouncementmodelParams; // 公告型号参数
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+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-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelFeign <br/>
+ * Description: 公告型号. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "公告型号")
+@FeignClient(
+        contextId = "anrui-base-BaseAnnouncementmodel",
+        name = "anrui-base",
+        path = "v1/baseannouncementmodel",
+        fallback = BaseAnnouncementmodelFeignFallback.class)
+public interface BaseAnnouncementmodelFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseAnnouncementmodelVo>> listPage(@RequestBody PagerQuery<BaseAnnouncementmodelQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseAnnouncementmodelDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseAnnouncementmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+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-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelFeignFallback <br/>
+ * Description: 公告型号. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseAnnouncementmodelFeignFallback implements BaseAnnouncementmodelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseAnnouncementmodelVo>> listPage(PagerQuery<BaseAnnouncementmodelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseannouncementmodel/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseAnnouncementmodelDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseannouncementmodel/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseannouncementmodel/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseAnnouncementmodelDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseannouncementmodel/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelQuery <br/>
+ * Description: 公告型号 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号 查询条件", description = "公告型号 查询条件")
+public class BaseAnnouncementmodelQuery implements Query {
+
+	@ApiModelProperty("公告型号名称")
+    private String announcementmodelName; // 公告型号名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodel/BaseAnnouncementmodelVo.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo <br/>
+ * Description: 公告型号 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号 视图数据对象", description = "公告型号 视图数据对象")
+public class BaseAnnouncementmodelVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("公告型号名称")
+    private String announcementmodelName; // 公告型号名称
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParam.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+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-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParam.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParam <br/>
+ * Description: 公告型号参数. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号参数", description = "公告型号参数")
+@TableName("base_announcementmodel_param")
+public class BaseAnnouncementmodelParam extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("公告型号sid")
+    private String mainSid; // 公告型号sid
+	@ApiModelProperty("准牵引总质量")
+    private String accTowTotalMass; // 准牵引总质量
+	@ApiModelProperty("整备质量（Kg）")
+    private String preparationMass; // 整备质量（Kg）
+	@ApiModelProperty("板簧片数（10/10/12）")
+    private String plateReedNum; // 板簧片数（10/10/12）
+	@ApiModelProperty("轮胎")
+    private String tyre; // 轮胎
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo <br/>
+ * Description: 公告型号参数 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号参数 视图数据详情", description = "公告型号参数 视图数据详情")
+public class BaseAnnouncementmodelParamDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("公告型号sid")
+    private String mainSid; // 公告型号sid
+	@ApiModelProperty("准牵引总质量")
+    private String accTowTotalMass; // 准牵引总质量
+	@ApiModelProperty("整备质量（Kg）")
+    private String preparationMass; // 整备质量（Kg）
+	@ApiModelProperty("板簧片数（10/10/12）")
+    private String plateReedNum; // 板簧片数（10/10/12）
+	@ApiModelProperty("轮胎")
+    private String tyre; // 轮胎
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamDto.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDto <br/>
+ * Description: 公告型号参数 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号参数 数据传输对象", description = "公告型号参数 数据传输对象")
+public class BaseAnnouncementmodelParamDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("公告型号sid")
+    private String mainSid; // 公告型号sid
+	@ApiModelProperty("准牵引总质量")
+    private String accTowTotalMass; // 准牵引总质量
+	@ApiModelProperty("整备质量（Kg）")
+    private String preparationMass; // 整备质量（Kg）
+	@ApiModelProperty("板簧片数（10/10/12）")
+    private String plateReedNum; // 板簧片数（10/10/12）
+	@ApiModelProperty("轮胎")
+    private String tyre; // 轮胎
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+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-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamFeign <br/>
+ * Description: 公告型号参数. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "公告型号参数")
+@FeignClient(
+        contextId = "anrui-base-BaseAnnouncementmodelParam",
+        name = "anrui-base",
+        path = "v1/baseannouncementmodelparam",
+        fallback = BaseAnnouncementmodelParamFeignFallback.class)
+public interface BaseAnnouncementmodelParamFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseAnnouncementmodelParamVo>> listPage(@RequestBody PagerQuery<BaseAnnouncementmodelParamQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseAnnouncementmodelParamDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseAnnouncementmodelParamDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+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-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamFeignFallback <br/>
+ * Description: 公告型号参数. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseAnnouncementmodelParamFeignFallback implements BaseAnnouncementmodelParamFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseAnnouncementmodelParamVo>> listPage(PagerQuery<BaseAnnouncementmodelParamQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseannouncementmodelparam/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseAnnouncementmodelParamDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseannouncementmodelparam/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseannouncementmodelparam/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseAnnouncementmodelParamDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseannouncementmodelparam/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamQuery <br/>
+ * Description: 公告型号参数 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号参数 查询条件", description = "公告型号参数 查询条件")
+public class BaseAnnouncementmodelParamQuery implements Query {
+
+	@ApiModelProperty("公告型号sid")
+    private String mainSid; // 公告型号sid
+	@ApiModelProperty("准牵引总质量")
+    private String accTowTotalMass; // 准牵引总质量
+	@ApiModelProperty("整备质量（Kg）")
+    private String preparationMass; // 整备质量（Kg）
+	@ApiModelProperty("板簧片数（10/10/12）")
+    private String plateReedNum; // 板簧片数（10/10/12）
+	@ApiModelProperty("轮胎")
+    private String tyre; // 轮胎
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseannouncementmodelparam/BaseAnnouncementmodelParamVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseannouncementmodelparam;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo <br/>
+ * Description: 公告型号参数 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "公告型号参数 视图数据对象", description = "公告型号参数 视图数据对象")
+public class BaseAnnouncementmodelParamVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("公告型号sid")
+    private String mainSid; // 公告型号sid
+	@ApiModelProperty("准牵引总质量")
+    private String accTowTotalMass; // 准牵引总质量
+	@ApiModelProperty("整备质量（Kg）")
+    private String preparationMass; // 整备质量（Kg）
+	@ApiModelProperty("板簧片数（10/10/12）")
+    private String plateReedNum; // 板簧片数（10/10/12）
+	@ApiModelProperty("轮胎")
+    private String tyre; // 轮胎
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java

@@ -62,8 +62,10 @@ public class BaseInternalPurchase extends BaseEntity {
     private String sellerOrgSid; // 调出分公司sid
 	@ApiModelProperty("调出分公司名称")
     private String sellerOrgName; // 调出分公司名称
-    @ApiModelProperty("调车类型（0调入，1调出）")
-    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("调车类型key")
+    private String shuntingTypeKey; // 调车类型key
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
     @ApiModelProperty("车辆数量")
     private String num; // 车辆数量
 	@ApiModelProperty("使用组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java

@@ -74,8 +74,10 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
     private String sellerOrgSid; // 调出分公司sid
     @ApiModelProperty("调出分公司名称")
     private String sellerOrgName; // 调出分公司名称
-    @ApiModelProperty("调车类型（0调入，1调出）")
-    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("调车类型key")
+    private String shuntingTypeKey; // 调车类型key
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
     @ApiModelProperty("车辆数量")
     private String num; // 车辆数量
 	@ApiModelProperty("使用组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java

@@ -68,8 +68,10 @@ public class BaseInternalPurchaseDto implements Dto {
     private String sellerOrgSid; // 调出分公司sid
     @ApiModelProperty("调出分公司名称")
     private String sellerOrgName; // 调出分公司名称
-    @ApiModelProperty("调车类型（0调入，1调出）")
-    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("调车类型key")
+    private String shuntingTypeKey; // 调车类型key
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
     @ApiModelProperty("车辆数量")
     private String num; // 车辆数量
 	@ApiModelProperty("使用组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseVo.java

@@ -69,6 +69,6 @@ public class BaseInternalPurchaseVo implements Vo {
     private String buyerOrgName; // 调入分公司名称
     @ApiModelProperty("调出分公司名称")
     private String sellerOrgName; // 调出分公司名称
-    @ApiModelProperty("调车类型（0调入，1调出）")
-    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehFeign.java

@@ -26,12 +26,14 @@
 package com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 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 org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -75,4 +77,15 @@ public interface BaseShuntingInvoicinApplyeVehFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseShuntingInvoicinApplyeVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**
+     * 调车开票图片上传
+     *
+     * @return
+     */
+    @ApiOperation("调车开票图片上传")
+    @ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class)
+    @PostMapping("/pictureUpload")
+    public ResultBean pictureUpload(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehFeignFallback.java

@@ -29,6 +29,7 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -69,4 +70,9 @@ public class BaseShuntingInvoicinApplyeVehFeignFallback implements BaseShuntingI
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/baseshuntinginvoicinapplyeveh/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean pictureUpload(String sid, MultipartFile file) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApply.java

@@ -52,10 +52,10 @@ public class BaseShuntingInvoicingApply extends BaseEntity {
 
 	@ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("调账类型key")
-    private String accadjTypeKey; // 调账类型key
-	@ApiModelProperty("调账类型value")
-    private String accadjTypeValue; // 调账类型value
+    @ApiModelProperty("调车类型key")
+    private String shuntingTypeKey; // 调车类型key
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
 	@ApiModelProperty("调出分公司sid")
     private String callOutOrgSid; // 调出分公司sid
 	@ApiModelProperty("调出分公司名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyDto.java

@@ -58,10 +58,10 @@ public class BaseShuntingInvoicingApplyDto implements Dto {
     private String createBySid; // 创建人sid
 	@ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("调账类型key")
-    private String accadjTypeKey; // 调账类型key
-	@ApiModelProperty("调账类型value")
-    private String accadjTypeValue; // 调账类型value
+    @ApiModelProperty("调车类型key")
+    private String shuntingTypeKey; // 调车类型key
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
 	@ApiModelProperty("调出分公司sid")
     private String callOutOrgSid; // 调出分公司sid
 	@ApiModelProperty("调出分公司名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyVo.java

@@ -53,8 +53,8 @@ public class BaseShuntingInvoicingApplyVo implements Vo {
 
 	@ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("调账类型value")
-    private String accadjTypeValue; // 调账类型value
+    @ApiModelProperty("调车类型value")
+    private String shuntingTypeValue; // 调车类型value
 	@ApiModelProperty("调出分公司名称")
     private String callOutOrgName; // 调出分公司名称
 	@ApiModelProperty("调入分公司名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabel.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+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-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabel.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabel <br/>
+ * Description: 车型及配置与标签关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型及配置与标签关联表", description = "车型及配置与标签关联表")
+@TableName("base_vehmodelconfig_label")
+public class BaseVehmodelconfigLabel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("标签sid")
+    private String labelSid; // 标签sid
+	@ApiModelProperty("车型及配置关联表sid")
+    private String vehmodelConfigSid; // 车型及配置关联表sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabelDetailsVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo <br/>
+ * Description: 车型及配置与标签关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型及配置与标签关联表 视图数据详情", description = "车型及配置与标签关联表 视图数据详情")
+public class BaseVehmodelconfigLabelDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("标签sid")
+    private String labelSid; // 标签sid
+	@ApiModelProperty("车型及配置关联表sid")
+    private String vehmodelConfigSid; // 车型及配置关联表sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabelDto.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelDto <br/>
+ * Description: 车型及配置与标签关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型及配置与标签关联表 数据传输对象", description = "车型及配置与标签关联表 数据传输对象")
+public class BaseVehmodelconfigLabelDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("标签sid")
+    private String labelSid; // 标签sid
+	@ApiModelProperty("车型及配置关联表sid")
+    private String vehmodelConfigSid; // 车型及配置关联表sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabelFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+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-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelFeign <br/>
+ * Description: 车型及配置与标签关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型及配置与标签关联表")
+@FeignClient(
+        contextId = "anrui-base-BaseVehmodelconfigLabel",
+        name = "anrui-base",
+        path = "v1/basevehmodelconfiglabel",
+        fallback = BaseVehmodelconfigLabelFeignFallback.class)
+public interface BaseVehmodelconfigLabelFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehmodelconfigLabelVo>> listPage(@RequestBody PagerQuery<BaseVehmodelconfigLabelQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseVehmodelconfigLabelDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseVehmodelconfigLabelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabelFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+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-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelFeignFallback <br/>
+ * Description: 车型及配置与标签关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseVehmodelconfigLabelFeignFallback implements BaseVehmodelconfigLabelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseVehmodelconfigLabelVo>> listPage(PagerQuery<BaseVehmodelconfigLabelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehmodelconfiglabel/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseVehmodelconfigLabelDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfiglabel/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfiglabel/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseVehmodelconfigLabelDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehmodelconfiglabel/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabelQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelQuery <br/>
+ * Description: 车型及配置与标签关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型及配置与标签关联表 查询条件", description = "车型及配置与标签关联表 查询条件")
+public class BaseVehmodelconfigLabelQuery implements Query {
+
+	@ApiModelProperty("标签sid")
+    private String labelSid; // 标签sid
+	@ApiModelProperty("车型及配置关联表sid")
+    private String vehmodelConfigSid; // 车型及配置关联表sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfiglabel/BaseVehmodelconfigLabelVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfiglabel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo <br/>
+ * Description: 车型及配置与标签关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型及配置与标签关联表 视图数据对象", description = "车型及配置与标签关联表 视图数据对象")
+public class BaseVehmodelconfigLabelVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("标签sid")
+    private String labelSid; // 标签sid
+	@ApiModelProperty("车型及配置关联表sid")
+    private String vehmodelConfigSid; // 车型及配置关联表sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabel.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+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-base(车型标签) <br/>
+ * File: BaseVehmodelLabel.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabel <br/>
+ * Description: 车型标签. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型标签", description = "车型标签")
+@TableName("base_vehmodel_label")
+public class BaseVehmodelLabel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("标签名称")
+    private String labelName; // 标签名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabelDetailsVo.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo <br/>
+ * Description: 车型标签 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型标签 视图数据详情", description = "车型标签 视图数据详情")
+public class BaseVehmodelLabelDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("标签名称")
+    private String labelName; // 标签名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabelDto.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDto <br/>
+ * Description: 车型标签 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型标签 数据传输对象", description = "车型标签 数据传输对象")
+public class BaseVehmodelLabelDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("标签名称")
+    private String labelName; // 标签名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabelFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+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-base(车型标签) <br/>
+ * File: BaseVehmodelLabelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelFeign <br/>
+ * Description: 车型标签. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型标签")
+@FeignClient(
+        contextId = "anrui-base-BaseVehmodelLabel",
+        name = "anrui-base",
+        path = "v1/basevehmodellabel",
+        fallback = BaseVehmodelLabelFeignFallback.class)
+public interface BaseVehmodelLabelFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseVehmodelLabelVo>> listPage(@RequestBody PagerQuery<BaseVehmodelLabelQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseVehmodelLabelDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseVehmodelLabelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabelFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+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-base(车型标签) <br/>
+ * File: BaseVehmodelLabelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelFeignFallback <br/>
+ * Description: 车型标签. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseVehmodelLabelFeignFallback implements BaseVehmodelLabelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseVehmodelLabelVo>> listPage(PagerQuery<BaseVehmodelLabelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehmodellabel/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseVehmodelLabelDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodellabel/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodellabel/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseVehmodelLabelDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basevehmodellabel/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabelQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelQuery <br/>
+ * Description: 车型标签 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型标签 查询条件", description = "车型标签 查询条件")
+public class BaseVehmodelLabelQuery implements Query {
+
+	@ApiModelProperty("标签名称")
+    private String labelName; // 标签名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodellabel/BaseVehmodelLabelVo.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodellabel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo <br/>
+ * Description: 车型标签 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "车型标签 视图数据对象", description = "车型标签 视图数据对象")
+public class BaseVehmodelLabelVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("标签名称")
+    private String labelName; // 标签名称
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@@ -48,7 +48,8 @@ public enum CommonAttachTypeEnum {
     SEAL_APPLY("0011", "盖章附件"),
     BILL_APPLICAYION("0012", "开票申请附件"),
     MANUFACTOR_SUB("0013", "厂商认款附件"),
-    MANUFACTOR_RETWARE("0014", "厂家退库车辆附件");
+    MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"),
+    SHUNTINGINVOICINAPPLY("0015", "调车开票附件");
     /**
      * 附件类型
      */

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodel/BaseAnnouncementmodelMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseannouncementmodel;
+
+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.base.api.baseannouncementmodel.BaseAnnouncementmodel;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseannouncementmodel.BaseAnnouncementmodelMapper <br/>
+ * Description: 公告型号. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseAnnouncementmodelMapper extends BaseMapper<BaseAnnouncementmodel> {
+
+	//@Update("update base_announcementmodel set name=#{msg} where id=#{id}")
+	//IPage<BaseAnnouncementmodelVo> voPage(IPage<BaseAnnouncementmodel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseAnnouncementmodel> qw);
+	
+	IPage<BaseAnnouncementmodelVo> selectPageVo(IPage<BaseAnnouncementmodel> page, @Param(Constants.WRAPPER) Wrapper<BaseAnnouncementmodel> qw);
+	
+	List<BaseAnnouncementmodelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseAnnouncementmodel> qw);
+	
+	@Select("select * from base_announcementmodel")
+	List<BaseAnnouncementmodelVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodel/BaseAnnouncementmodelMapper.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.base.biz.baseannouncementmodel.BaseAnnouncementmodelMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo">
+		SELECT * FROM base_announcementmodel <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo">
+		SELECT * FROM base_announcementmodel <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodel/BaseAnnouncementmodelRest.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseannouncementmodel;
+
+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.base.api.baseannouncementmodel.BaseAnnouncementmodel;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelQuery;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelDetailsVo;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelDto;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelFeign;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseannouncementmodel.BaseAnnouncementmodelRest <br/>
+ * Description: 公告型号. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "公告型号")
+@RestController("com.yxt.anrui.base.biz.baseannouncementmodel.BaseAnnouncementmodelRest")
+@RequestMapping("v1/baseannouncementmodel")
+public class BaseAnnouncementmodelRest implements BaseAnnouncementmodelFeign {
+
+	@Autowired
+	private BaseAnnouncementmodelService baseAnnouncementmodelService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseAnnouncementmodelVo>> listPage(@RequestBody PagerQuery<BaseAnnouncementmodelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseAnnouncementmodelVo> pv = baseAnnouncementmodelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseAnnouncementmodelDto dto){
+		return baseAnnouncementmodelService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return baseAnnouncementmodelService.delAll(sids);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseAnnouncementmodelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return baseAnnouncementmodelService.fetchDetailsVoBySid(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodel/BaseAnnouncementmodelService.java

@@ -0,0 +1,151 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseannouncementmodel;
+
+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.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDetailsVo;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDto;
+import com.yxt.anrui.base.biz.baseannouncementmodelparam.BaseAnnouncementmodelParamService;
+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.base.api.baseannouncementmodel.BaseAnnouncementmodel;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelQuery;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelVo;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelDetailsVo;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelDto;
+import com.yxt.anrui.base.api.baseannouncementmodel.BaseAnnouncementmodelFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelService.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseannouncementmodel.BaseAnnouncementmodelService <br/>
+ * Description: 公告型号 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseAnnouncementmodelService extends MybatisBaseService<BaseAnnouncementmodelMapper, BaseAnnouncementmodel> {
+
+    @Autowired
+    private BaseAnnouncementmodelParamService baseAnnouncementmodelParamService;
+
+    private QueryWrapper<BaseAnnouncementmodel> createQueryWrapper(BaseAnnouncementmodelQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseAnnouncementmodel> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseAnnouncementmodelVo> listPageVo(PagerQuery<BaseAnnouncementmodelQuery> pq) {
+        BaseAnnouncementmodelQuery query = pq.getParams();
+        QueryWrapper<BaseAnnouncementmodel> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getAnnouncementmodelName())) {
+            qw.like("announcementmodelName", query.getAnnouncementmodelName());
+        }
+        IPage<BaseAnnouncementmodel> page = PagerUtil.queryToPage(pq);
+        IPage<BaseAnnouncementmodelVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseAnnouncementmodelVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(BaseAnnouncementmodelDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<BaseAnnouncementmodelParamDto> baseAnnouncementmodelParams = dto.getBaseAnnouncementmodelParams();
+        if (StringUtils.isBlank(dtoSid)) {//新增
+            String s = this.insertByDto(dto);
+            for (BaseAnnouncementmodelParamDto baseAnnouncementmodelParam : baseAnnouncementmodelParams) {
+                baseAnnouncementmodelParam.setMainSid(s);
+                baseAnnouncementmodelParamService.insertByDto(baseAnnouncementmodelParam);
+            }
+            return rb.success().setMsg("保存成功");
+        }
+        BaseAnnouncementmodel baseAnnouncementmodel = fetchBySid(dtoSid);
+        if (baseAnnouncementmodel == null){
+            return rb.setMsg("该公告型号不存在");
+        }
+        this.updateByDto(dto);
+        baseAnnouncementmodelParamService.delByMainSid(dtoSid);
+        for (BaseAnnouncementmodelParamDto baseAnnouncementmodelParam : baseAnnouncementmodelParams) {
+            baseAnnouncementmodelParam.setMainSid(dtoSid);
+            baseAnnouncementmodelParamService.insertByDto(baseAnnouncementmodelParam);
+        }
+        return rb.success().setMsg("修改成功");
+    }
+
+    public String insertByDto(BaseAnnouncementmodelDto dto) {
+        BaseAnnouncementmodel entity = new BaseAnnouncementmodel();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public void updateByDto(BaseAnnouncementmodelDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BaseAnnouncementmodel entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ResultBean<BaseAnnouncementmodelDetailsVo> fetchDetailsVoBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAnnouncementmodel entity = fetchBySid(sid);
+        BaseAnnouncementmodelDetailsVo vo = new BaseAnnouncementmodelDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        List<BaseAnnouncementmodelParamDetailsVo> baseAnnouncementmodelParamDetailsVos = baseAnnouncementmodelParamService.fetchByMainSid(sid);
+        vo.setBaseAnnouncementmodelParams(baseAnnouncementmodelParamDetailsVos);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        delBySids(sids);
+        for (String sid : sids) {
+            baseAnnouncementmodelParamService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodelparam/BaseAnnouncementmodelParamMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseannouncementmodelparam;
+
+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.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDetailsVo;
+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.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParam;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseannouncementmodelparam.BaseAnnouncementmodelParamMapper <br/>
+ * Description: 公告型号参数. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseAnnouncementmodelParamMapper extends BaseMapper<BaseAnnouncementmodelParam> {
+
+	//@Update("update base_announcementmodel_param set name=#{msg} where id=#{id}")
+	//IPage<BaseAnnouncementmodelParamVo> voPage(IPage<BaseAnnouncementmodelParam> page, @Param(Constants.WRAPPER) QueryWrapper<BaseAnnouncementmodelParam> qw);
+	
+	IPage<BaseAnnouncementmodelParamVo> selectPageVo(IPage<BaseAnnouncementmodelParam> page, @Param(Constants.WRAPPER) Wrapper<BaseAnnouncementmodelParam> qw);
+	
+	List<BaseAnnouncementmodelParamVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseAnnouncementmodelParam> qw);
+	
+	@Select("select * from base_announcementmodel_param")
+	List<BaseAnnouncementmodelParamVo> selectListVo();
+
+	@Delete("delete from base_announcementmodel_param where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+	@Select("select * from base_announcementmodel_param where mainSid = #{sid}")
+	List<BaseAnnouncementmodelParamDetailsVo> fetchByMainSid(String sid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodelparam/BaseAnnouncementmodelParamMapper.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.base.biz.baseannouncementmodelparam.BaseAnnouncementmodelParamMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo">
+		SELECT * FROM base_announcementmodel_param <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo">
+		SELECT * FROM base_announcementmodel_param <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodelparam/BaseAnnouncementmodelParamRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseannouncementmodelparam;
+
+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.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParam;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamQuery;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDetailsVo;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDto;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamFeign;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseannouncementmodelparam.BaseAnnouncementmodelParamRest <br/>
+ * Description: 公告型号参数. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "公告型号参数")
+@RestController("com.yxt.anrui.base.biz.baseannouncementmodelparam.BaseAnnouncementmodelParamRest")
+@RequestMapping("v1/baseannouncementmodelparam")
+public class BaseAnnouncementmodelParamRest implements BaseAnnouncementmodelParamFeign {
+
+	@Autowired
+	private BaseAnnouncementmodelParamService baseAnnouncementmodelParamService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseAnnouncementmodelParamVo>> listPage(@RequestBody PagerQuery<BaseAnnouncementmodelParamQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseAnnouncementmodelParamVo> pv = baseAnnouncementmodelParamService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseAnnouncementmodelParamDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseAnnouncementmodelParamService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseAnnouncementmodelParamService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseAnnouncementmodelParamDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseAnnouncementmodelParamDetailsVo vo = baseAnnouncementmodelParamService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseannouncementmodelparam/BaseAnnouncementmodelParamService.java

@@ -0,0 +1,118 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseannouncementmodelparam;
+
+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.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParam;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamQuery;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamVo;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDetailsVo;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamDto;
+import com.yxt.anrui.base.api.baseannouncementmodelparam.BaseAnnouncementmodelParamFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(公告型号) <br/>
+ * File: BaseAnnouncementmodelParamService.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseannouncementmodelparam.BaseAnnouncementmodelParamService <br/>
+ * Description: 公告型号参数 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 14:23:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseAnnouncementmodelParamService extends MybatisBaseService<BaseAnnouncementmodelParamMapper, BaseAnnouncementmodelParam> {
+	private QueryWrapper<BaseAnnouncementmodelParam> createQueryWrapper(BaseAnnouncementmodelParamQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseAnnouncementmodelParam> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseAnnouncementmodelParamVo> listPageVo(PagerQuery<BaseAnnouncementmodelParamQuery> pq) {
+		BaseAnnouncementmodelParamQuery query = pq.getParams();
+		QueryWrapper<BaseAnnouncementmodelParam> qw = createQueryWrapper(query);
+		IPage<BaseAnnouncementmodelParam> page = PagerUtil.queryToPage(pq);
+		IPage<BaseAnnouncementmodelParamVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseAnnouncementmodelParamVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseAnnouncementmodelParamDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseAnnouncementmodelParamDto dto){
+		BaseAnnouncementmodelParam entity = new BaseAnnouncementmodelParam();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseAnnouncementmodelParamDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseAnnouncementmodelParam entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseAnnouncementmodelParamDetailsVo fetchDetailsVoBySid(String sid){
+		BaseAnnouncementmodelParam entity = fetchBySid(sid);
+		BaseAnnouncementmodelParamDetailsVo vo = new BaseAnnouncementmodelParamDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<BaseAnnouncementmodelParamDetailsVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -102,6 +102,15 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
                 );
         IPage<BaseManufacturerRetware> page = PagerUtil.queryToPage(pq);
         IPage<BaseManufacturerRetwareVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<BaseManufacturerRetwareVo> records = pagging.getRecords();
+        for (BaseManufacturerRetwareVo record : records) {
+            String state = record.getState();
+            if (state.equals("0")) {
+                record.setState("待办理");
+            } else if (state.equals("1")) {
+                record.setState("已办理");
+            }
+        }
         PagerVo<BaseManufacturerRetwareVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -124,7 +133,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
             for (BaseManufacturerRetwareVehDto baseManufacturerRetwareVeh : baseManufacturerRetwareVehs) {
                 BaseManufacturerRetwareVeh baseManufacturerRetwareVeh1 = new BaseManufacturerRetwareVeh();
                 String sid1 = baseManufacturerRetwareVeh1.getSid();
-                BeanUtil.copyProperties(baseManufacturerRetware, baseManufacturerRetwareVeh1);
+                BeanUtil.copyProperties(baseManufacturerRetwareVeh, baseManufacturerRetwareVeh1);
                 baseManufacturerRetwareVeh1.setSid(sid1);
                 baseManufacturerRetwareVeh1.setMainSid(sid);
                 baseManufacturerRetwareVehService.save(baseManufacturerRetwareVeh1);
@@ -136,14 +145,16 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
             return rb.setMsg("该厂家退库单不存在");
         }
         this.updateByDto(dto);
+        List<BaseManufacturerRetwareVehDetailsVo> baseManufacturerRetwareVehDetailsVos = baseManufacturerRetwareVehService.fetchByMainSid(dtoSid);
         baseManufacturerRetwareVehService.delByMainSid(dtoSid);
-        for (BaseManufacturerRetwareVehDto baseManufacturerRetwareVeh : baseManufacturerRetwareVehs) {
-            BaseManufacturerRetwareVeh baseManufacturerRetwareVeh1 = new BaseManufacturerRetwareVeh();
-            String sid1 = baseManufacturerRetwareVeh1.getSid();
-            BeanUtil.copyProperties(baseManufacturerRetwareVeh, baseManufacturerRetwareVeh1);
-            baseManufacturerRetwareVeh1.setSid(sid1);
-            baseManufacturerRetwareVeh1.setMainSid(dtoSid);
-            baseManufacturerRetwareVehService.save(baseManufacturerRetwareVeh1);
+        for (BaseManufacturerRetwareVehDetailsVo baseManufacturerRetwareVehDetailsVo : baseManufacturerRetwareVehDetailsVos) {
+            for (BaseManufacturerRetwareVehDto baseManufacturerRetwareVeh : baseManufacturerRetwareVehs) {
+                BaseManufacturerRetwareVeh baseManufacturerRetwareVeh1 = new BaseManufacturerRetwareVeh();
+                BeanUtil.copyProperties(baseManufacturerRetwareVeh, baseManufacturerRetwareVeh1);
+                baseManufacturerRetwareVeh1.setSid(baseManufacturerRetwareVehDetailsVo.getSid());
+                baseManufacturerRetwareVeh1.setMainSid(dtoSid);
+                baseManufacturerRetwareVehService.save(baseManufacturerRetwareVeh1);
+            }
         }
         return rb.success().setMsg("修改成功");
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehMapper.xml

@@ -34,10 +34,11 @@
                bsiav.invoicinMoney,
                bsiav.invoicinCompanySid,
                bsiav.invoicinCompanyName,
-               bsiav.`remarks`
+               bsiav.`remarks`,
+               bsiav.purchaseSid
         FROM base_shunting_invoicin_applye_veh bsiav
                      LEFT JOIN base_internal_purchase_vehicle bipv
                 ON bsiav.`purchaseSid` = bipv.`sid`
-        WHERE mainSid = #{sid}
+        WHERE bsiav.mainSid = #{sid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicinapplyeveh/BaseShuntingInvoicinApplyeVehRest.java

@@ -25,7 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh;
 
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
@@ -40,6 +45,7 @@ import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin
 import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
 import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
 import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehFeign;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Project: anrui-base(调车开票) <br/>
@@ -61,6 +67,10 @@ public class BaseShuntingInvoicinApplyeVehRest implements BaseShuntingInvoicinAp
 
 	@Autowired
 	private BaseShuntingInvoicinApplyeVehService baseShuntingInvoicinApplyeVehService;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private CommonAppendixService commonAppendixService;
 
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
@@ -97,4 +107,23 @@ public class BaseShuntingInvoicinApplyeVehRest implements BaseShuntingInvoicinAp
 		BaseShuntingInvoicinApplyeVehDetailsVo vo = baseShuntingInvoicinApplyeVehService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean pictureUpload(String sid, MultipartFile file) {
+		ResultBean rb = ResultBean.fireFail();
+		if (file == null || file.isEmpty()) {
+			return rb.setMsg("文件为空");
+		}
+		rb = fileUploadComponent.uploadFile(file);
+		FileUploadResult data = (FileUploadResult) rb.getData();
+		CommonAppendix commonAppendix = new CommonAppendix();
+		commonAppendix.setLinkSid(sid);
+		commonAppendix.setFilePath(data.getFilePath());
+		commonAppendix.setFileName(data.getSourceFileName());
+		commonAppendix.setFileSize(data.getSize());
+		commonAppendix.setFileType(data.getSourceFileName().substring(data.getSourceFileName().lastIndexOf(".")));
+		commonAppendix.setAttachType(CommonAttachTypeEnum.SHUNTINGINVOICINAPPLY.getAttachType());
+		commonAppendixService.save(commonAppendix);
+		return rb.success().setMsg("上传成功");
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyMapper.xml

@@ -15,7 +15,8 @@
 			resultType="com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo">
 		SELECT
 		bipv.*,
-		bip.`shuntingType`,
+		bip.`shuntingTypeKey`,
+		bip.`shuntingTypeValue`,
 		bip.`buyerOrgName`,
 		bip.`buyerOrgSid`,
 		bip.`sellerOrgName`,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyRest.java

@@ -84,7 +84,7 @@ public class BaseShuntingInvoicingApplyRest implements BaseShuntingInvoicingAppl
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return baseShuntingInvoicingApplyService.delAll(sids);
 	}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
+import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh;
 import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo;
 import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDto;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*;
@@ -137,10 +138,16 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
             return rb.setMsg("该调车申请单不存在");
         }
         this.updateByDto(dto);
+        List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(dtoSid);
         baseShuntingInvoicinApplyeVehService.delByMainSid(dtoSid);
-        for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
-            baseShuntingInvoicinApplyeVeh.setMainSid(dtoSid);
-            baseShuntingInvoicinApplyeVehService.insertByDto(baseShuntingInvoicinApplyeVeh);
+        for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) {
+            for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
+                BaseShuntingInvoicinApplyeVeh baseShuntingInvoicinApplyeVeh1 = new BaseShuntingInvoicinApplyeVeh();
+                BeanUtil.copyProperties(baseShuntingInvoicinApplyeVeh,baseShuntingInvoicinApplyeVeh1);
+                baseShuntingInvoicinApplyeVeh1.setSid(baseShuntingInvoicinApplyeVehDetailsVo.getSid());
+                baseShuntingInvoicinApplyeVeh1.setMainSid(dtoSid);
+                baseShuntingInvoicinApplyeVehService.save(baseShuntingInvoicinApplyeVeh1);
+            }
         }
         return rb.success().setMsg("修改成功");
     }
@@ -184,7 +191,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
         if (StringUtils.isBlank(callOutOrgSid)) {
             return rb.setMsg("请选择调出分公司");
         }
-        qw.eq("bip.shuntingType", "调入");
+        qw.eq("bip.shuntingType", "0");
         qw.eq("bip.buyerOrgSid", callInOrgSid);
         qw.eq("bip.sellerOrgSid", callOutOrgSid);
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfiglabel/BaseVehmodelconfigLabelMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehmodelconfiglabel;
+
+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.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabel;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehmodelconfiglabel.BaseVehmodelconfigLabelMapper <br/>
+ * Description: 车型及配置与标签关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseVehmodelconfigLabelMapper extends BaseMapper<BaseVehmodelconfigLabel> {
+
+	//@Update("update base_vehmodelconfig_label set name=#{msg} where id=#{id}")
+	//IPage<BaseVehmodelconfigLabelVo> voPage(IPage<BaseVehmodelconfigLabel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelconfigLabel> qw);
+	
+	IPage<BaseVehmodelconfigLabelVo> selectPageVo(IPage<BaseVehmodelconfigLabel> page, @Param(Constants.WRAPPER) Wrapper<BaseVehmodelconfigLabel> qw);
+	
+	List<BaseVehmodelconfigLabelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehmodelconfigLabel> qw);
+	
+	@Select("select * from base_vehmodelconfig_label")
+	List<BaseVehmodelconfigLabelVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfiglabel/BaseVehmodelconfigLabelMapper.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.base.biz.basevehmodelconfiglabel.BaseVehmodelconfigLabelMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo">
+		SELECT * FROM base_vehmodelconfig_label <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo">
+		SELECT * FROM base_vehmodelconfig_label <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfiglabel/BaseVehmodelconfigLabelRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehmodelconfiglabel;
+
+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.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabel;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelQuery;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelDetailsVo;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelDto;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelFeign;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehmodelconfiglabel.BaseVehmodelconfigLabelRest <br/>
+ * Description: 车型及配置与标签关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型及配置与标签关联表")
+@RestController("com.yxt.anrui.base.biz.basevehmodelconfiglabel.BaseVehmodelconfigLabelRest")
+@RequestMapping("v1/basevehmodelconfiglabel")
+public class BaseVehmodelconfigLabelRest implements BaseVehmodelconfigLabelFeign {
+
+	@Autowired
+	private BaseVehmodelconfigLabelService baseVehmodelconfigLabelService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseVehmodelconfigLabelVo>> listPage(@RequestBody PagerQuery<BaseVehmodelconfigLabelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehmodelconfigLabelVo> pv = baseVehmodelconfigLabelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseVehmodelconfigLabelDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehmodelconfigLabelService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehmodelconfigLabelService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseVehmodelconfigLabelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehmodelconfigLabelDetailsVo vo = baseVehmodelconfigLabelService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfiglabel/BaseVehmodelconfigLabelService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehmodelconfiglabel;
+
+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.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabel;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelQuery;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelVo;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelDetailsVo;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelDto;
+import com.yxt.anrui.base.api.basevehmodelconfiglabel.BaseVehmodelconfigLabelFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelconfigLabelService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehmodelconfiglabel.BaseVehmodelconfigLabelService <br/>
+ * Description: 车型及配置与标签关联表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseVehmodelconfigLabelService extends MybatisBaseService<BaseVehmodelconfigLabelMapper, BaseVehmodelconfigLabel> {
+	private QueryWrapper<BaseVehmodelconfigLabel> createQueryWrapper(BaseVehmodelconfigLabelQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseVehmodelconfigLabel> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseVehmodelconfigLabelVo> listPageVo(PagerQuery<BaseVehmodelconfigLabelQuery> pq) {
+		BaseVehmodelconfigLabelQuery query = pq.getParams();
+		QueryWrapper<BaseVehmodelconfigLabel> qw = createQueryWrapper(query);
+		IPage<BaseVehmodelconfigLabel> page = PagerUtil.queryToPage(pq);
+		IPage<BaseVehmodelconfigLabelVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseVehmodelconfigLabelVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseVehmodelconfigLabelDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseVehmodelconfigLabelDto dto){
+		BaseVehmodelconfigLabel entity = new BaseVehmodelconfigLabel();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseVehmodelconfigLabelDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseVehmodelconfigLabel entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseVehmodelconfigLabelDetailsVo fetchDetailsVoBySid(String sid){
+		BaseVehmodelconfigLabel entity = fetchBySid(sid);
+		BaseVehmodelconfigLabelDetailsVo vo = new BaseVehmodelconfigLabelDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehmodellabel;
+
+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.base.api.basevehmodellabel.BaseVehmodelLabel;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelMapper <br/>
+ * Description: 车型标签. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseVehmodelLabelMapper extends BaseMapper<BaseVehmodelLabel> {
+
+	//@Update("update base_vehmodel_label set name=#{msg} where id=#{id}")
+	//IPage<BaseVehmodelLabelVo> voPage(IPage<BaseVehmodelLabel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelLabel> qw);
+	
+	IPage<BaseVehmodelLabelVo> selectPageVo(IPage<BaseVehmodelLabel> page, @Param(Constants.WRAPPER) Wrapper<BaseVehmodelLabel> qw);
+	
+	List<BaseVehmodelLabelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehmodelLabel> qw);
+	
+	@Select("select * from base_vehmodel_label")
+	List<BaseVehmodelLabelVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelMapper.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.base.biz.basevehmodellabel.BaseVehmodelLabelMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo">
+		SELECT * FROM base_vehmodel_label <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo">
+		SELECT * FROM base_vehmodel_label <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehmodellabel;
+
+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.base.api.basevehmodellabel.BaseVehmodelLabel;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelQuery;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDetailsVo;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDto;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelFeign;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelRest <br/>
+ * Description: 车型标签. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型标签")
+@RestController("com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelRest")
+@RequestMapping("v1/basevehmodellabel")
+public class BaseVehmodelLabelRest implements BaseVehmodelLabelFeign {
+
+	@Autowired
+	private BaseVehmodelLabelService baseVehmodelLabelService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseVehmodelLabelVo>> listPage(@RequestBody PagerQuery<BaseVehmodelLabelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseVehmodelLabelVo> pv = baseVehmodelLabelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseVehmodelLabelDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehmodelLabelService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseVehmodelLabelService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseVehmodelLabelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseVehmodelLabelDetailsVo vo = baseVehmodelLabelService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelService.java

@@ -0,0 +1,114 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basevehmodellabel;
+
+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.base.api.basevehmodellabel.BaseVehmodelLabel;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelQuery;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelVo;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDetailsVo;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDto;
+import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型标签) <br/>
+ * File: BaseVehmodelLabelService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelService <br/>
+ * Description: 车型标签 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-07-15 11:02:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseVehmodelLabelService extends MybatisBaseService<BaseVehmodelLabelMapper, BaseVehmodelLabel> {
+    private QueryWrapper<BaseVehmodelLabel> createQueryWrapper(BaseVehmodelLabelQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseVehmodelLabel> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseVehmodelLabelVo> listPageVo(PagerQuery<BaseVehmodelLabelQuery> pq) {
+        BaseVehmodelLabelQuery query = pq.getParams();
+        QueryWrapper<BaseVehmodelLabel> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getLabelName())) {
+            qw.like("labelName", query.getLabelName());
+        }
+        IPage<BaseVehmodelLabel> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehmodelLabelVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseVehmodelLabelVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public void saveOrUpdateDto(BaseVehmodelLabelDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return;
+        }
+        this.updateByDto(dto);
+    }
+
+    public void insertByDto(BaseVehmodelLabelDto dto) {
+        BaseVehmodelLabel entity = new BaseVehmodelLabel();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BaseVehmodelLabelDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BaseVehmodelLabel entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BaseVehmodelLabelDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseVehmodelLabel entity = fetchBySid(sid);
+        BaseVehmodelLabelDetailsVo vo = new BaseVehmodelLabelDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+}