diff --git a/anrui-crm/anrui-crm-biz/pom.xml b/anrui-crm/anrui-crm-biz/pom.xml
index b19e56980d..4d80363a9e 100644
--- a/anrui-crm/anrui-crm-biz/pom.xml
+++ b/anrui-crm/anrui-crm-biz/pom.xml
@@ -96,7 +96,16 @@
0.0.1-SNAPSHOT
compile
-
+
+ io.springfox
+ springfox-swagger2
+ 2.9.2
+
+
+ io.springfox
+ springfox-swagger-ui
+ 2.8.0
+
@@ -132,4 +141,4 @@
-
\ No newline at end of file
+
diff --git a/yxt-as/pom.xml b/yxt-as/pom.xml
index ffb23379e8..135c29ca40 100644
--- a/yxt-as/pom.xml
+++ b/yxt-as/pom.xml
@@ -53,7 +53,16 @@
true
-
+
+ io.springfox
+ springfox-swagger2
+ 2.9.2
+
+
+ io.springfox
+ springfox-swagger-ui
+ 2.8.0
+
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
index 916b321bf7..19b1c73815 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java
@@ -60,7 +60,10 @@ public class AsServiceItemQuery implements Query {
private String type; //0查预约项目 1查所有
-
+ @ApiModelProperty("使用状态 (1使用0禁用)")
+ private String isEnable;
+ @ApiModelProperty("备案状态(1未备案,0备案中,2已备案)")
+ private String state;
private String userSid;
@ApiModelProperty("菜单url")
private String menuUrl;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
index 631cd34264..3c2bfe253a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemVo.java
@@ -53,6 +53,10 @@ public class AsServiceItemVo implements Vo {
private String sid;
@ApiModelProperty("项目名称")
private String sitemName;
+ @ApiModelProperty("使用状态 (1使用0禁用)")
+ private String isEnable;
+ @ApiModelProperty("备案状态(1未备案,0备案中,2已备案)")
+ private String state;
@ApiModelProperty("项目编码")
private String sitemCode;
@ApiModelProperty("工种(分类)")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApply.java
new file mode 100644
index 0000000000..716912d5bf
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApply.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApply.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApply
+ * Description: 维修项目备案申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案申请", description = "维修项目备案申请")
+@TableName("as_service_item_apply")
+public class AsServiceItemApply extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("部门sid")
+ private String deptSid; // 部门sid
+ @ApiModelProperty("部门")
+ private String deptName; // 部门
+ @ApiModelProperty("申请人")
+ private String createByName; // 申请人
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("环节定义的sid")
+ private String nodeSid; // 环节定义的sid
+ @ApiModelProperty("流程实例的sid")
+ private String procInstId; // 流程实例的sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("taskId")
+ private String taskId; // taskId
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("办结日期")
+ private Date closingDate; // 办结日期
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java
new file mode 100644
index 0000000000..497c5762b9
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapply;
+
+
+import com.yxt.anrui.as.api.utils.FileUrlQuery;
+import com.yxt.common.core.vo.Vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyVo.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyVo
+ * Description: 维修项目备案申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案申请 视图数据详情", description = "维修项目备案申请 视图数据详情")
+public class AsServiceItemApplyDetailsVo implements Vo {
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("申请人sid")
+ private String createBySid; // 申请人sid
+ @ApiModelProperty("申请日期")
+ private String createTime; // 申请日期
+ @ApiModelProperty("部门sid")
+ private String deptSid; // 部门sid
+ @ApiModelProperty("部门")
+ private String deptName; // 部门
+ @ApiModelProperty("申请人")
+ private String createByName; // 申请人
+ @ApiModelProperty("任务id")
+ private String taskId;
+ @ApiModelProperty("实例id")
+ private String instanceId;
+ @ApiModelProperty("创建组织sid分公司")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("使用组织sid分公司")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("附件")
+ private List file = new ArrayList<>(); // 附件
+ @ApiModelProperty("维修项目列表")
+ private List sitemsVos; // 维修项目列表
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDto.java
new file mode 100644
index 0000000000..a5f6fa6490
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDto.java
@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapply;
+
+
+import com.yxt.anrui.as.api.utils.FileUrlQuery;
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyDto.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyDto
+ * Description: 维修项目备案申请 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案申请 数据传输对象", description = "维修项目备案申请 数据传输对象")
+public class AsServiceItemApplyDto implements Dto {
+
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("申请人sid")
+ private String createBySid; // 申请人sid
+ @ApiModelProperty("申请日期")
+ private String createTime; // 申请日期
+ @ApiModelProperty("部门sid")
+ private String deptSid; // 部门sid
+ @ApiModelProperty("部门")
+ private String deptName; // 部门
+ @ApiModelProperty("申请人")
+ private String createByName; // 申请人
+ @ApiModelProperty("任务id")
+ private String taskId;
+ @ApiModelProperty("实例id")
+ private String instanceId;
+ @ApiModelProperty("创建组织sid分公司")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("使用组织sid分公司")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("附件")
+ private List file; // 附件
+ @ApiModelProperty("维修项目列表")
+ private List sitemsVos; // 维修项目列表
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyQuery.java
new file mode 100644
index 0000000000..90f24215ec
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyQuery.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyQuery.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyQuery
+ * Description: 维修项目备案申请 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案申请 查询条件", description = "维修项目备案申请 查询条件")
+public class AsServiceItemApplyQuery implements Query {
+
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("部门")
+ private String deptName; // 部门
+ @ApiModelProperty("申请人")
+ private String createByName; // 申请人
+ @ApiModelProperty("分公司")
+ private String useOrgName; // 分公司
+ @ApiModelProperty("办结开始日期")
+ private String closingDateStart; // 办结日期
+ @ApiModelProperty("办结结束日期")
+ private String closingDateEnd; // 办结日期
+ @ApiModelProperty("申请开始日期")
+ private String createDateStart; // 办结日期
+ @ApiModelProperty("申请结束日期")
+ private String createDateEnd; // 办结日期
+
+ @ApiModelProperty("使用组织全路径")
+ private String orgPath;
+ @ApiModelProperty("登录用户sid")
+ private String userSid;
+ @ApiModelProperty("菜单url")
+ private String menuUrl;
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyVo.java
new file mode 100644
index 0000000000..18358b2632
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyVo.java
@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyVo.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyVo
+ * Description: 维修项目备案申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案申请 视图数据对象", description = "维修项目备案申请 视图数据对象")
+public class AsServiceItemApplyVo implements Vo {
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("分公司")
+ private String useOrgName; // 分公司
+ @ApiModelProperty("部门")
+ private String deptName; // 部门
+ @ApiModelProperty("申请人")
+ private String createByName; // 申请人
+ @ApiModelProperty("申请日期")
+ private String createTime; // 申请日期
+ @ApiModelProperty("办结日期")
+ private String closingDate; // 办结日期
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("流程实例的sid")
+ private String procInstId; // 流程实例的sid
+
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java
new file mode 100644
index 0000000000..aaf9416b03
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.as.api.asserviceitemapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/12 9:24
+ */
+@Data
+public class SitemsVo {
+
+
+ @ApiModelProperty("维修项目sid")
+ private String sitemSid; // 维修项目sid
+ @ApiModelProperty("项目名称")
+ private String sitemName;
+ @ApiModelProperty("销售价")
+ private String price;
+ @ApiModelProperty("工种")
+ private String serviceType;
+ @ApiModelProperty("科目")
+ private String subjectName;
+ @ApiModelProperty("工时单价")
+ private String hourPrice;
+ @ApiModelProperty("工时数")
+ private String hours;
+ @ApiModelProperty("外协成本")
+ private String cost;
+ @ApiModelProperty("工时提成")
+ private String examineHourPrice;
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("是否为预约项目,直接返回是否无需转换")
+ private String isReserve;
+ @ApiModelProperty("是否为洗车项目,直接返回是否无需转换")
+ private String isClean;
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecord.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecord.java
new file mode 100644
index 0000000000..05cee67fa2
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecord.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapplyrecord;
+
+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: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecord.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecord
+ * Description: 维修项目备案-记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案-记录", description = "维修项目备案-记录")
+@TableName("as_service_item_apply_record")
+public class AsServiceItemApplyRecord extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("维修项目备案申请sid")
+ private String mainSid; // 维修项目备案申请sid
+ @ApiModelProperty("维修项目sid")
+ private String sitemSid; // 维修项目sid
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordDetailsVo.java
new file mode 100644
index 0000000000..a38a71d969
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordDetailsVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapplyrecord;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordVo.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordVo
+ * Description: 维修项目备案-记录 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案-记录 视图数据详情", description = "维修项目备案-记录 视图数据详情")
+public class AsServiceItemApplyRecordDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("维修项目备案申请sid")
+ private String mainSid; // 维修项目备案申请sid
+ @ApiModelProperty("维修项目sid")
+ private String sitemSid; // 维修项目sid
+
+}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordDto.java
new file mode 100644
index 0000000000..045cad37bf
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordDto.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapplyrecord;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordDto.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordDto
+ * Description: 维修项目备案-记录 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案-记录 数据传输对象", description = "维修项目备案-记录 数据传输对象")
+public class AsServiceItemApplyRecordDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("维修项目备案申请sid")
+ private String mainSid; // 维修项目备案申请sid
+ @ApiModelProperty("维修项目sid")
+ private String sitemSid; // 维修项目sid
+
+}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordQuery.java
new file mode 100644
index 0000000000..9f3eb65db4
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordQuery.java
@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapplyrecord;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordQuery.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordQuery
+ * Description: 维修项目备案-记录 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案-记录 查询条件", description = "维修项目备案-记录 查询条件")
+public class AsServiceItemApplyRecordQuery implements Query {
+
+ @ApiModelProperty("维修项目备案申请sid")
+ private String mainSid; // 维修项目备案申请sid
+ @ApiModelProperty("维修项目sid")
+ private String sitemSid; // 维修项目sid
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordVo.java
new file mode 100644
index 0000000000..786ba0e6d6
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapplyrecord/AsServiceItemApplyRecordVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.asserviceitemapplyrecord;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordVo.java
+ * Class: com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordVo
+ * Description: 维修项目备案-记录 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "维修项目备案-记录 视图数据对象", description = "维修项目备案-记录 视图数据对象")
+public class AsServiceItemApplyRecordVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("维修项目备案申请sid")
+ private String mainSid; // 维修项目备案申请sid
+ @ApiModelProperty("维修项目sid")
+ private String sitemSid; // 维修项目sid
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java
index e52af3359e..a15de7e02f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/enums/AsBillTypeEnum.java
@@ -9,7 +9,8 @@ public enum AsBillTypeEnum {
WXGD("WXD", "维修工单"),
YYD("YYD", "预约单"),
- FJS("FJS", "反结算");
+ FJS("FJS", "反结算"),
+ WXBA("WXBA", "维修项目备案");
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
new file mode 100644
index 0000000000..a89e6dac3e
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/utils/FileUrlQuery.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.as.api.utils;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/12 9:10
+ */
+@Data
+public class FileUrlQuery {
+ @ApiModelProperty("附件路径")
+ private String url; // 附件路径
+}
+
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
index 325121e1e3..cff6e76573 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java
@@ -28,4 +28,6 @@ public interface AsServiceItemMapper extends BaseMapper {
AsServiceItem checkForInsert(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("subjectSid") String subjectSid);
AsServiceItem checkForUpdate(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid, @Param("subjectSid") String subjectSid);
+
+ int updateIsEnable(@Param("list") List list, @Param("s") String s);
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
index 747e49c33c..8969f253c2 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml
@@ -9,6 +9,14 @@
#{item}
+
+ update as_service_item
+ set isEnable = #{s}
+ where sid in
+
+ #{item}
+
+
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
index fef19d496c..7779e8b174 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemRest.java
@@ -34,12 +34,21 @@ public class AsServiceItemRest {
return rb.success().setData(pv);
}
+ @ApiOperation("禁用")
+ @PostMapping("/disableState")
+ public ResultBean disableState(@RequestBody String[] sids) {
+ return asServiceItemService.disableState(sids);
+ }
+ @ApiOperation("启用")
+ @PostMapping("/enable")
+ public ResultBean enable(@RequestBody String[] sids) {
+ return asServiceItemService.enable(sids);
+ }
@ApiOperation("修改保存")
@PostMapping("/saveServiceItem")
public ResultBean saveServiceItem(@RequestBody AsServiceItemDto dto) {
return asServiceItemService.saveServiceItem(dto);
}
-
@ApiOperation("详情查看")
@GetMapping("/fetchDetails/{sid}")
public ResultBean fetchDetails(@PathVariable("sid") String sid) {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
index cc69e0bed4..43cee797cb 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
@@ -2,6 +2,7 @@ package com.yxt.anrui.as.biz.asserviceitem;
import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asserviceitem.*;
@@ -134,6 +135,12 @@ public class AsServiceItemService extends MybatisBaseService list = Arrays.asList(sids);
+ int i = baseMapper.updateIsEnable(list,"0");
+ return rb.success();
+ }
+
+ public ResultBean enable(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = Arrays.asList(sids);
+ int i = baseMapper.updateIsEnable(list,"1");
+ return rb.success();
+ }
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.java
new file mode 100644
index 0000000000..45ebceb4f3
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.java
@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asserviceitemapply;
+
+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.as.api.asserviceitemapply.AsServiceItemApply;
+import com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyMapper.java
+ * Class: com.yxt.anrui.as.biz.asserviceitemapply.AsServiceItemApplyMapper
+ * Description: 维修项目备案申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServiceItemApplyMapper extends BaseMapper {
+
+ //@Update("update as_service_item_apply set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from as_service_item_apply")
+ List selectListVo();
+
+ int selectNum(String bill);
+
+ int selectBySid(String join);
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml
new file mode 100644
index 0000000000..ef3a458da8
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyMapper.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java
new file mode 100644
index 0000000000..6e8a45e4d0
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java
@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asserviceitemapply;
+
+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 com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyQuery;
+import com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyVo;
+import com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyDetailsVo;
+import com.yxt.anrui.as.api.asserviceitemapply.AsServiceItemApplyDto;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.asserviceitemapply.AsServiceItemApplyRest
+ * Description: 维修项目备案申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "维修项目备案申请")
+@RestController("com.yxt.anrui.as.biz.asserviceitemapply.AsServiceItemApplyRest")
+@RequestMapping("v1/asserviceitemapply")
+public class AsServiceItemApplyRest {
+
+ @Autowired
+ private AsServiceItemApplyService asServiceItemApplyService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = asServiceItemApplyService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody AsServiceItemApplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ asServiceItemApplyService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ return asServiceItemApplyService.deleteBySids(sids);
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ AsServiceItemApplyDetailsVo vo = asServiceItemApplyService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("新增初始化")
+ @PostMapping("/applyInit")
+ public ResultBean applyInit(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ AsServiceItemApplyDetailsVo vo = asServiceItemApplyService.applyInit(sids);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java
new file mode 100644
index 0000000000..850083f25a
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java
@@ -0,0 +1,312 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asserviceitemapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asappendix.AsAppendix;
+import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapply;
+import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapplyFile;
+import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapplyVo;
+import com.yxt.anrui.as.api.asbwdiffapplydetail.AsBwdiffapplyDetailFile;
+import com.yxt.anrui.as.api.asserviceitem.AsServiceItem;
+import com.yxt.anrui.as.api.asserviceitemapply.*;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecord;
+import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
+import com.yxt.anrui.as.api.utils.AsRule;
+import com.yxt.anrui.as.api.utils.FileUrlQuery;
+import com.yxt.anrui.as.api.utils.domain.AsBillNo;
+import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
+import com.yxt.anrui.as.biz.asserviceitem.AsServiceItemService;
+import com.yxt.anrui.as.biz.asserviceitemapplyrecord.AsServiceItemApplyRecordService;
+import com.yxt.anrui.as.feign.file.AsFileEnum;
+import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.core.result.ResultBean;
+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.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyService.java
+ * Class: com.yxt.anrui.as.biz.asserviceitemapply.AsServiceItemApplyService
+ * Description: 维修项目备案申请 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServiceItemApplyService extends MybatisBaseService {
+ @Autowired
+ private AsServiceItemService asServiceItemService;
+ @Autowired
+ private SysOrganizationFeign sysOrganizationFeign;
+ @Autowired
+ private AsServiceItemApplyRecordService asServiceItemApplyRecordService;
+ @Autowired
+ private FileUploadComponent fileUploadComponent;
+ @Autowired
+ private AsAppendixService asAppendixService;
+ @Autowired
+ private SysUserFeign sysUserFeign;
+
+ private QueryWrapper createQueryWrapper(AsServiceItemApplyQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ AsServiceItemApplyQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("ab.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ if (StringUtils.isNotBlank(query.getUseOrgName())) {
+ qw.like("ab.useOrgName", query.getUseOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getDeptName())) {
+ qw.like("ab.deptName", query.getDeptName());
+ }
+ if (StringUtils.isNotBlank(query.getCreateByName())) {
+ qw.like("ab.createByName", query.getCreateByName());
+ }
+ if (StringUtils.isNotBlank(query.getBillNo())) {
+ qw.like("ab.billNo", query.getBillNo());
+ }
+ String createTimeStart = query.getCreateDateStart();
+ String createTimeEnd = query.getCreateDateEnd();
+ qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (ab.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (ab.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
+ );
+ String finishTimeStart = query.getClosingDateStart();
+ String finishTimeEnd = query.getClosingDateEnd();
+ qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (ab.closingDate,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (ab.closingDate,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
+ );
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ /**
+ * 生成单据编号
+ *
+ * @param orgSid
+ * @return
+ */
+ public String getApplyCode(String orgSid) {
+ //获取分公司sid
+ ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
+ String orgCode = resultBean1.getData().getOrgCode();
+ AsBillNo b = new AsBillNo();
+ b.setOrgCode(orgCode);
+ b.setBillType(AsBillTypeEnum.WXBA.getBillType());
+ String bill = AsRule.getBill(b);
+ int i = baseMapper.selectNum(bill);
+ String billNo = AsRule.getBillNo(bill, i);
+ return billNo;
+ }
+
+ public String saveOrUpdateDto(AsServiceItemApplyDto dto) {
+ String sid = "";
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ AsServiceItemApply entity = new AsServiceItemApply();
+ sid = entity.getSid();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ String code = getApplyCode(dto.getCreateOrgSid());
+ entity.setBillNo(code);
+ entity.setNodeState("待提交");
+ baseMapper.insert(entity);
+ } else {
+ sid = dtoSid;
+ asServiceItemApplyRecordService.delByMainSid(sid);
+ asAppendixService.delByLinkSid(sid);
+ AsServiceItemApply entity = fetchBySid(sid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+ List sitemsVos = dto.getSitemsVos();
+ if (!sitemsVos.isEmpty()) {
+ for (SitemsVo sitemsVo : sitemsVos) {
+ AsServiceItemApplyRecord record = new AsServiceItemApplyRecord();
+ record.setMainSid(sid);
+ record.setSitemSid(sitemsVo.getSitemSid());
+ asServiceItemApplyRecordService.insert(record);
+ }
+ }
+ List fileList = dto.getFile();
+ if (!fileList.isEmpty()) {
+ for (FileUrlQuery query : fileList) {
+ String filePath = query.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+ AsAppendix asAppendix = new AsAppendix();
+ asAppendix.setLinkSid(sid);
+ asAppendix.setAttachType(AsFileEnum.ASWXXMBA.getAttachType());
+ asAppendix.setFilePath(filePath);
+ asAppendixService.save(asAppendix);
+ }
+ }
+ return sid;
+ }
+
+ public void insertByDto(AsServiceItemApplyDto dto) {
+ AsServiceItemApply entity = new AsServiceItemApply();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(AsServiceItemApplyDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ AsServiceItemApply entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public AsServiceItemApplyDetailsVo fetchDetailsVoBySid(String sid) {
+ AsServiceItemApply entity = fetchBySid(sid);
+ AsServiceItemApplyDetailsVo vo = new AsServiceItemApplyDetailsVo();
+ if (entity != null) {
+ BeanUtil.copyProperties(entity, vo);
+ if (StringUtils.isNotBlank(entity.getProcInstId())) {
+ vo.setInstanceId(entity.getProcInstId());
+ }
+ vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
+ List records = asServiceItemApplyRecordService.selByMainSid(sid);
+ List sitemsVos = new ArrayList<>();
+ if (!records.isEmpty()) {
+ for (AsServiceItemApplyRecord record : records) {
+ SitemsVo s = new SitemsVo();
+ AsServiceItem item = asServiceItemService.fetchBySid(record.getSitemSid());
+ BeanUtil.copyProperties(item, s, "id", "sid");
+ s.setSitemSid(item.getSid());
+ sitemsVos.add(s);
+ }
+ }
+ vo.setSitemsVos(sitemsVos);
+ List file = new ArrayList<>();
+ List asAppendices = asAppendixService.fetchByLinkSid(sid);
+ if (!asAppendices.isEmpty()) {
+ for (AsAppendix asAppendix : asAppendices) {
+ FileUrlQuery fileUrlQuery = new FileUrlQuery();
+ String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
+ fileUrlQuery.setUrl(url);
+ file.add(fileUrlQuery);
+ }
+ }
+ vo.setFile(file);
+ }
+ return vo;
+ }
+
+ public AsServiceItemApplyDetailsVo applyInit(String[] sids) {
+ AsServiceItemApplyDetailsVo vo = new AsServiceItemApplyDetailsVo();
+ List sitemsVos = new ArrayList<>();
+ for (String sid : sids) {
+ AsServiceItem item = asServiceItemService.fetchBySid(sid);
+ SitemsVo sitemsVo = new SitemsVo();
+ BeanUtil.copyProperties(item, sitemsVo, "id", "sid");
+ sitemsVo.setSitemSid(item.getSid());
+ sitemsVos.add(sitemsVo);
+ }
+ vo.setSitemsVos(sitemsVos);
+ return vo;
+ }
+
+ public ResultBean deleteBySids(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ //查询该sid中是否有不是待提交状态的
+ int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+ if (count > 0) {
+ return rb.setMsg("删除的数据中包含已提交的数据,删除失败");
+ }
+ delBySids(sids);
+ for (String sid : sids) {
+ asServiceItemApplyRecordService.delByMainSid(sid);
+ asAppendixService.delByLinkSid(sid);
+ }
+
+ return rb.success();
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordMapper.java
new file mode 100644
index 0000000000..4a2ae8c49f
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordMapper.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asserviceitemapplyrecord;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecord;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordMapper.java
+ * Class: com.yxt.anrui.as.biz.asserviceitemapplyrecord.AsServiceItemApplyRecordMapper
+ * Description: 维修项目备案-记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsServiceItemApplyRecordMapper extends BaseMapper {
+
+ //@Update("update as_service_item_apply_record set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from as_service_item_apply_record")
+ List selectListVo();
+
+ @Delete("delete from as_service_item_apply_record where mainSid = #{mainSid}")
+ void delByMainSid(@Param("mainSid") String mainSid);
+
+ @Select("select * from as_service_item_apply_record where mainSid = #{mainSid}")
+ List selByMainSid(@Param("mainSid") String mainSid);
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordMapper.xml
new file mode 100644
index 0000000000..5cac9dcba7
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordRest.java
new file mode 100644
index 0000000000..d2006d8169
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordRest.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asserviceitemapplyrecord;
+
+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 com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordQuery;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordVo;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordDetailsVo;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordDto;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.asserviceitemapplyrecord.AsServiceItemApplyRecordRest
+ * Description: 维修项目备案-记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "维修项目备案-记录")
+@RestController("com.yxt.anrui.as.biz.asserviceitemapplyrecord.AsServiceItemApplyRecordRest")
+@RequestMapping("v1/asserviceitemapplyrecord")
+public class AsServiceItemApplyRecordRest {
+
+ @Autowired
+ private AsServiceItemApplyRecordService asServiceItemApplyRecordService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = asServiceItemApplyRecordService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody AsServiceItemApplyRecordDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ asServiceItemApplyRecordService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ asServiceItemApplyRecordService.delBySids(sids);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ AsServiceItemApplyRecordDetailsVo vo = asServiceItemApplyRecordService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordService.java
new file mode 100644
index 0000000000..191549b55e
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapplyrecord/AsServiceItemApplyRecordService.java
@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.asserviceitemapplyrecord;
+
+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.vo.PagerVo;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecord;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordQuery;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordVo;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordDetailsVo;
+import com.yxt.anrui.as.api.asserviceitemapplyrecord.AsServiceItemApplyRecordDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-as(维修项目备案)
+ * File: AsServiceItemApplyRecordService.java
+ * Class: com.yxt.anrui.as.biz.asserviceitemapplyrecord.AsServiceItemApplyRecordService
+ * Description: 维修项目备案-记录 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-12 09:16:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsServiceItemApplyRecordService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(AsServiceItemApplyRecordQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public void delByMainSid(String mainSid) {
+ baseMapper.delByMainSid(mainSid);
+ }
+
+ public List selByMainSid(String mainSid) {
+ return baseMapper.selByMainSid(mainSid);
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ AsServiceItemApplyRecordQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(AsServiceItemApplyRecordDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(AsServiceItemApplyRecordDto dto) {
+ AsServiceItemApplyRecord entity = new AsServiceItemApplyRecord();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(AsServiceItemApplyRecordDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ AsServiceItemApplyRecord entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public AsServiceItemApplyRecordDetailsVo fetchDetailsVoBySid(String sid) {
+ AsServiceItemApplyRecord entity = fetchBySid(sid);
+ AsServiceItemApplyRecordDetailsVo vo = new AsServiceItemApplyRecordDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/config/Swagger2Config.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/config/Swagger2Config.java
new file mode 100644
index 0000000000..00183702f5
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/config/Swagger2Config.java
@@ -0,0 +1,36 @@
+package com.yxt.anrui.as.biz.config;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @author dimengzhe
+ * @date 2020/9/9 16:42
+ * @description
+ */
+@Configuration
+@EnableSwagger2
+@EnableKnife4j
+public class Swagger2Config {
+
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo()).select()
+ .apis(RequestHandlerSelectors.basePackage("com.yxt"))
+ .paths(PathSelectors.any()).build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder().title("安瑞/售后管理").description("售后管理接口").version("1.0")
+ .build();
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
index bcdb8bf633..cd46831931 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java
@@ -10,6 +10,7 @@ public enum AsFileEnum {
ASBWINVOICEAPPLY("001", "保外工单开票附件"),
ASBWDIFFAPPLY("002", "保外工单应收调差附件"),
ASBWDIFFAPPLYDETAIL("003", "保外工单应收调差工单附件"),
+ ASWXXMBA("004", "维修项目备案附件"),
;