From d0af5a3ef606af6f06ec4e9971762fca2c3d861d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 31 Jul 2024 18:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8A=80=E5=B8=88=E8=81=8C?= =?UTF-8?q?=E7=A7=B0=E5=A4=87=E6=A1=88=E9=80=89=E6=8B=A9=E6=9C=AC=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=B8=8B=E8=A7=92=E8=89=B2=E4=B8=BA=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E6=8A=80=E5=B8=88=E8=A7=92=E8=89=B2=E4=BA=BA=E5=91=98=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=85=B6?= =?UTF-8?q?=E4=B8=AD=E4=B8=8A=E8=A3=85=E4=BB=B7=E6=A0=BC=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?= =?UTF-8?q?=20=E4=B8=8A=E8=A3=85=E5=8D=95=E7=8B=AC=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehinstall/BaseVehinstallService.java | 2 +- .../bussalesorder/BusSalesOrderService.java | 2 +- .../portal/api/sysuser/SysUserFeign.java | 4 + .../api/sysuser/SysUserFeignFallback.java | 5 + .../portal/biz/sysuser/SysUserMapper.java | 2 + .../portal/biz/sysuser/SysUserMapper.xml | 26 ++ .../anrui/portal/biz/sysuser/SysUserRest.java | 5 + .../portal/biz/sysuser/SysUserService.java | 16 + .../anrui/as/api/astechtitle/AsTechTitle.java | 70 ++++ .../api/astechtitle/AsTechTitleDetailsVo.java | 75 +++++ .../as/api/astechtitle/AsTechTitleDto.java | 76 +++++ .../as/api/astechtitle/AsTechTitleQuery.java | 60 ++++ .../as/api/astechtitle/AsTechTitleVo.java | 66 ++++ .../astechtitleapply/AsTechTitleApply.java | 81 +++++ .../AsTechTitleApplyDetailsVo.java | 98 ++++++ .../astechtitleapply/AsTechTitleApplyDto.java | 95 ++++++ .../AsTechTitleApplyFile.java | 55 +++ .../AsTechTitleApplyQuery.java | 75 +++++ .../astechtitleapply/AsTechTitleApplyVo.java | 76 +++++ .../astechtitledetail/AsTechTitleDetail.java | 68 ++++ .../AsTechTitleDetailDetailsVo.java | 72 ++++ .../AsTechTitleDetailDto.java | 72 ++++ .../as/biz/astechtitle/AsTechTitleMapper.java | 71 ++++ .../as/biz/astechtitle/AsTechTitleMapper.xml | 18 + .../as/biz/astechtitle/AsTechTitleRest.java | 91 +++++ .../biz/astechtitle/AsTechTitleService.java | 207 ++++++++++++ .../AsTechTitleApplyMapper.java | 61 ++++ .../AsTechTitleApplyMapper.xml | 26 ++ .../AsTechTitleApplyRest.java | 97 ++++++ .../AsTechTitleApplyService.java | 313 ++++++++++++++++++ .../AsTechTitleDetailMapper.java | 61 ++++ .../AsTechTitleDetailMapper.xml | 6 + .../AsTechTitleDetailRest.java | 57 ++++ .../AsTechTitleDetailService.java | 88 +++++ .../yxt/anrui/as/feign/file/AsFileEnum.java | 3 +- 35 files changed, 2197 insertions(+), 3 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitle.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDetailsVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDto.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDetailsVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDto.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyFile.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetail.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDetailsVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDto.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailService.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index 3a3739ec3e..80b38a3148 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java @@ -469,7 +469,7 @@ public class BaseVehinstallService extends MybatisBaseService stringList = Arrays.asList(topInfo.getContractPath().split(",")); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index f53f689a17..65c158c001 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -235,6 +235,10 @@ public interface SysUserFeign { @GetMapping(value = "getUserByOrgSid") ResultBean>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid); + @ApiOperation(value = "获取本部门下分公司维修技师人员") + @GetMapping(value = "getUserByDeptSid") + ResultBean>> getUserByDeptSid(@RequestParam("deptSid") String deptSid); + @ApiOperation(value = "根据用户sid获取用户id") @PostMapping(value = "selectIdBySid") ResultBean selectIdBySid(@RequestBody List stringList); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index 7b1a034c89..d66671ed7b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -216,6 +216,11 @@ public class SysUserFeignFallback implements SysUserFeign { return null; } + @Override + public ResultBean>> getUserByDeptSid(String deptSid) { + return null; + } + @Override public ResultBean selectIdBySid(List stringList) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index 3f091fd812..5b88f7d69b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -206,4 +206,6 @@ public interface SysUserMapper extends BaseMapper { SysUser selectByUserNameWx(String userName); SysUser selectByMobileWx(String userName); + + List> getUserByDeptSid(String deptSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 82d7316ff9..4a8fc29d52 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -438,4 +438,30 @@ and su.isDelete = 0 and su.userType = 2 + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index d98d1177f9..b4871a9bc2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -659,6 +659,11 @@ public class SysUserRest implements SysUserFeign { return sysUserService.getUserByOrgSid(orgSid, userSid); } + @Override + public ResultBean>> getUserByDeptSid(String deptSid) { + return sysUserService.getUserByDeptSid(deptSid); + } + @Override public ResultBean selectIdBySid(List stringList) { return sysUserService.selectIdBySid(stringList); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index c0a871b3a2..79013ad90d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1218,6 +1218,20 @@ public class SysUserService extends MybatisBaseService { return rb.success().setData(user); } + public ResultBean>> getUserByDeptSid(String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List> user = baseMapper.getUserByDeptSid(deptSid); + for (Map map : user) { + StringBuilder namePath = new StringBuilder(); + String name = map.get("name"); + String orgName = map.get("orgName"); + String postName = map.get("postName"); + namePath.append(name).append("(").append(orgName).append(" ").append(postName).append(")"); + map.put("namePath", namePath.toString()); + } + return rb.success().setData(user); + } + public List fetchBySidSVo(String sids) { List list = Arrays.asList(sids.split(",")); List entity = baseMapper.fetchBySids(list); @@ -1667,4 +1681,6 @@ public class SysUserService extends MybatisBaseService { } return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); } + + } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitle.java new file mode 100644 index 0000000000..dae3d3dae6 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitle.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitle; + +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: AsTechTitle.java
+ * Class: com.yxt.anrui.as.api.astechtitle.AsTechTitle
+ * Description: 维修技师职称.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称", description = "维修技师职称") +@TableName("as_tech_title") +public class AsTechTitle extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("职称名称key") + private String titleNameKey; + @ApiModelProperty("职称名称value") + private String titleNameValue; + @ApiModelProperty("权重") + private String weight; // 权重 + @ApiModelProperty("排序") + private Integer sortNo; // 排序 + @ApiModelProperty("部门sid") + private String useOrgSid; // 部门sid + @ApiModelProperty("部门名称") + private String useOrgName; // 部门名称 + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDetailsVo.java new file mode 100644 index 0000000000..65cb59fc03 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDetailsVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitle; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleVo.java
+ * Class: com.yxt.anrui.as.api.astechtitle.AsTechTitleVo
+ * Description: 维修技师职称 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称 视图数据详情", description = "维修技师职称 视图数据详情") +public class AsTechTitleDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("职称名称key") + private String titleNameKey; + @ApiModelProperty("职称名称value") + private String titleNameValue; + @ApiModelProperty("权重") + private String weight; // 权重 + @ApiModelProperty("排序") + private Integer sortNo; // 排序 + @ApiModelProperty("部门sid") + private String useOrgSid; // 部门sid + @ApiModelProperty("部门名称") + private String useOrgName; // 部门名称 + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDto.java new file mode 100644 index 0000000000..2e0c9589a9 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDto.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitle; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleDto.java
+ * Class: com.yxt.anrui.as.api.astechtitle.AsTechTitleDto
+ * Description: 维修技师职称 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称 数据传输对象", description = "维修技师职称 数据传输对象") +public class AsTechTitleDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("职称名称key") + private String titleNameKey; + @ApiModelProperty("职称名称value") + private String titleNameValue; + @ApiModelProperty("权重") + private String weight; // 权重 + @ApiModelProperty("排序") + private Integer sortNo; // 排序 + @ApiModelProperty("部门sid") + private String useOrgSid; // 部门sid + @ApiModelProperty("部门名称") + private String useOrgName; // 部门名称 + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("组织全路径") + private String orgPath; +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleQuery.java new file mode 100644 index 0000000000..17acc072b1 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleQuery.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitle; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleQuery.java
+ * Class: com.yxt.anrui.as.api.astechtitle.AsTechTitleQuery
+ * Description: 维修技师职称 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称 查询条件", description = "维修技师职称 查询条件") +public class AsTechTitleQuery implements Query { + + @ApiModelProperty("职称名称") + private String titleNameKey; + + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单url") + private String menuUrl; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java new file mode 100644 index 0000000000..0f861fc1d8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitle; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleVo.java
+ * Class: com.yxt.anrui.as.api.astechtitle.AsTechTitleVo
+ * Description: 维修技师职称 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称 视图数据对象", description = "维修技师职称 视图数据对象") +public class AsTechTitleVo implements Vo { + + private String sid; + + @ApiModelProperty("职称名称") + private String titleNameValue; + @ApiModelProperty("权重") + private String weight; + @ApiModelProperty("服务站") + private String useOrgName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("维修技师") + private String techName; + @ApiModelProperty("排序") + private Integer sortNo; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java new file mode 100644 index 0000000000..96ced41e5b --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApply.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitleapply; + +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: AsTechTitleApply.java
+ * Class: com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApply
+ * Description: 维修技师职称备案申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案申请", description = "维修技师职称备案申请") +@TableName("as_tech_title_apply") +public class AsTechTitleApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; // 申请部门名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; // 办结日期 + @ApiModelProperty("实例id") + private String procInstId; // 实例id + @ApiModelProperty("流程定义id") + private String procDefId; // 流程定义id + @ApiModelProperty("任务id") + private String taskId; // 任务id + @ApiModelProperty("环节id") + private String nodeId; // 环节id + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDetailsVo.java new file mode 100644 index 0000000000..76061dede8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDetailsVo.java @@ -0,0 +1,98 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitleapply; + + +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDetailsVo; +import com.yxt.common.core.vo.Vo; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleApplyVo.java
+ * Class: com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo
+ * Description: 维修技师职称备案申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案申请 视图数据详情", description = "维修技师职称备案申请 视图数据详情") +public class AsTechTitleApplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("申请日期") + private Date createTime; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; // 申请部门名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; // 办结日期 + @ApiModelProperty("实例id") + private String procInstId; // 实例id + @ApiModelProperty("流程定义id") + private String procDefId; // 流程定义id + @ApiModelProperty("任务id") + private String taskId; // 任务id + @ApiModelProperty("环节id") + private String nodeId; // 环节id + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty + private List asTechTitleDetailDetailsList; + @ApiModelProperty + private List asTechTitleApplyFileList = new ArrayList<>(); + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDto.java new file mode 100644 index 0000000000..c2bc3b0337 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyDto.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitleapply; + + +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDetailsVo; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDto; +import com.yxt.common.core.dto.Dto; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleApplyDto.java
+ * Class: com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyDto
+ * Description: 维修技师职称备案申请 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案申请 数据传输对象", description = "维修技师职称备案申请 数据传输对象") +public class AsTechTitleApplyDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("申请人") + private String createByName; // 申请人 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; // 申请部门名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; // 办结日期 + @ApiModelProperty("实例id") + private String procInstId; // 实例id + @ApiModelProperty("流程定义id") + private String procDefId; // 流程定义id + @ApiModelProperty("任务id") + private String taskId; // 任务id + @ApiModelProperty("环节id") + private String nodeId; // 环节id + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty + private List asTechTitleDetailDetailsList; + @ApiModelProperty + private List asTechTitleApplyFileList = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyFile.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyFile.java new file mode 100644 index 0000000000..72d7ea1f35 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyFile.java @@ -0,0 +1,55 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitleapply; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleApplyVo.java
+ * Class: com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo
+ * Description: 维修技师职称备案申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案申请 视图数据对象", description = "维修技师职称备案申请 视图数据对象") +public class AsTechTitleApplyFile implements Vo { + + private String url; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyQuery.java new file mode 100644 index 0000000000..5a33d29de6 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyQuery.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitleapply; + + +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: AsTechTitleApplyQuery.java
+ * Class: com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyQuery
+ * Description: 维修技师职称备案申请 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案申请 查询条件", description = "维修技师职称备案申请 查询条件") +public class AsTechTitleApplyQuery implements Query { + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("申请日期") + private String createTimeStart; + private String createTimeEnd; + @ApiModelProperty("办结日期") + private String finishTimeStart; + private String finishTimeEnd; + + private String userSid; + private String orgPath; + private String menuUrl; + private String menuSid; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyVo.java new file mode 100644 index 0000000000..a14cc12f64 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitleapply/AsTechTitleApplyVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitleapply; + + +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: AsTechTitleApplyVo.java
+ * Class: com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo
+ * Description: 维修技师职称备案申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案申请 视图数据对象", description = "维修技师职称备案申请 视图数据对象") +public class AsTechTitleApplyVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("申请日期") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetail.java new file mode 100644 index 0000000000..5ff5d27576 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetail.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitledetail; + +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: AsTechTitleDetail.java
+ * Class: com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetail
+ * Description: 维修技师职称备案列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案列表", description = "维修技师职称备案列表") +@TableName("as_tech_title_detail") +public class AsTechTitleDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("职称sid") + private String titleSid; // 职称sid + @ApiModelProperty("职称名称key") + private String titleNameKey; // 职称名称key + @ApiModelProperty("职称名称value") + private String titleNameValue; // 职称名称value + @ApiModelProperty("权重") + private String weight; // 权重 + @ApiModelProperty("维修技师sid") + private String techSid; // 维修技师sid + @ApiModelProperty("维修技师姓名") + private String techName; // 维修技师姓名 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDetailsVo.java new file mode 100644 index 0000000000..8703ea0eab --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDetailsVo.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitledetail; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleDetailVo.java
+ * Class: com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailVo
+ * Description: 维修技师职称备案列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案列表 视图数据详情", description = "维修技师职称备案列表 视图数据详情") +public class AsTechTitleDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("职称sid") + private String titleSid; // 职称sid + @ApiModelProperty("职称名称key") + private String titleNameKey; // 职称名称key + @ApiModelProperty("职称名称value") + private String titleNameValue; // 职称名称value + @ApiModelProperty("权重") + private String weight; // 权重 + @ApiModelProperty("维修技师sid") + private List techSids = new ArrayList<>(); // 维修技师sid + @ApiModelProperty("维修技师姓名") + private List techNames = new ArrayList<>(); // 维修技师姓名 + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDto.java new file mode 100644 index 0000000000..b8d5205195 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitledetail/AsTechTitleDetailDto.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.api.astechtitledetail; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleDetailDto.java
+ * Class: com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDto
+ * Description: 维修技师职称备案列表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "维修技师职称备案列表 数据传输对象", description = "维修技师职称备案列表 数据传输对象") +public class AsTechTitleDetailDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("主表sid") + private String mainSid; // 主表sid + @ApiModelProperty("职称sid") + private String titleSid; // 职称sid + @ApiModelProperty("职称名称key") + private String titleNameKey; // 职称名称key + @ApiModelProperty("职称名称value") + private String titleNameValue; // 职称名称value + @ApiModelProperty("权重") + private String weight; // 权重 + @ApiModelProperty("维修技师sid") + private List techSids = new ArrayList<>(); // 维修技师sid + @ApiModelProperty("维修技师姓名") + private List techNames = new ArrayList<>(); // 维修技师姓名 + +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java new file mode 100644 index 0000000000..59d28e2cfc --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitle; + +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.as.api.asservicegroup.AsServiceGroup; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.as.api.astechtitle.AsTechTitle; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleVo; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleMapper.java
+ * Class: com.yxt.anrui.as.biz.astechtitle.AsTechTitleMapper
+ * Description: 维修技师职称.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsTechTitleMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select count(*) from as_tech_title where titleNameKey = #{titleNameKey} and useOrgSid = #{useOrgSid} and isDelete = '0'") + int checkByNameAndUseOrgSid(@Param("titleNameKey") String titleNameKey,@Param("useOrgSid") String useOrgSid); + + @Select("select count(*) from as_tech_title where titleNameKey = #{titleNameKey} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'") + int checkSidByNameAndUseOrgSid(@Param("titleNameKey") String titleNameKey,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); + + @Update("update as_tech_title set isDelete = '1' where sid = #{sid}") + void updateIsDeleteBySid(String sid); + + @Select("select * from as_tech_title where sid = #{sid} and isDelete = '0'") + AsTechTitle fetchIsDeleteBySid(String sid); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.xml new file mode 100644 index 0000000000..05ed131e0d --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java new file mode 100644 index 0000000000..21f1d2e6ea --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleRest.java @@ -0,0 +1,91 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitle; + +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.astechtitle.AsTechTitleQuery; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleVo; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleDetailsVo; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleDto; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.astechtitle.AsTechTitleRest
+ * Description: 维修技师职称.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修技师职称") +@RestController +@RequestMapping("v1/astechtitle") +public class AsTechTitleRest { + + @Autowired + private AsTechTitleService asTechTitleService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asTechTitleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AsTechTitleDto dto){ + return asTechTitleService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + asTechTitleService.delete(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + AsTechTitleDetailsVo vo = asTechTitleService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java new file mode 100644 index 0000000000..649e8f66ac --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java @@ -0,0 +1,207 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitle; + +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.as.api.asservicegroup.AsServiceGroup; +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.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +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 com.yxt.anrui.as.api.astechtitle.AsTechTitle; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleQuery; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleVo; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleDetailsVo; +import com.yxt.anrui.as.api.astechtitle.AsTechTitleDto; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * Project: yxt-as(维修技师职称)
+ * File: AsTechTitleService.java
+ * Class: com.yxt.anrui.as.biz.astechtitle.AsTechTitleService
+ * Description: 维修技师职称 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 10:21:31
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsTechTitleService extends MybatisBaseService { + + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysUserFeign sysUserFeign; + + public PagerVo listPageVo(PagerQuery pq) { + AsTechTitleQuery 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("att.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getTitleNameKey())){ + qw.like("att.titleNameKey", query.getTitleNameKey()); + } + qw.orderByAsc("att.sortNo"); + qw.eq("att.isDelete",0); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(AsTechTitleDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + String orgPath = dto.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName (); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + dto.setUseOrgName(deptName); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationResultBean.getData().getName()); + } + } + int i = baseMapper.checkByNameAndUseOrgSid(dto.getTitleNameKey(), dto.getUseOrgSid()); + if (i > 0) { + return rb.setMsg("维修技师职称已存在"); + } + this.insertByDto(dto); + return rb.success(); + } + int i = baseMapper.checkSidByNameAndUseOrgSid(dto.getTitleNameKey(), dto.getUseOrgSid(), dtoSid); + if (i > 0) { + return rb.setMsg("维修技师职称已存在"); + } + this.updateByDto(dto); + return rb.success(); + } + + public void insertByDto(AsTechTitleDto dto){ + AsTechTitle entity = new AsTechTitle(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(AsTechTitleDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + AsTechTitle entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public AsTechTitleDetailsVo fetchDetailsVoBySid(String sid){ + AsTechTitle entity = baseMapper.fetchIsDeleteBySid(sid); + AsTechTitleDetailsVo vo = new AsTechTitleDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delete(String[] sids) { + for (String sid : sids) { + baseMapper.updateIsDeleteBySid(sid); + } + } +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.java new file mode 100644 index 0000000000..604dbee210 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitleapply; + +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.astechtitleapply.AsTechTitleApply; +import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo; + +import java.util.List; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleApplyMapper.java
+ * Class: com.yxt.anrui.as.biz.astechtitleapply.AsTechTitleApplyMapper
+ * Description: 维修技师职称备案申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsTechTitleApplyMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + int selectBySid(String join); + + String selectNum(String billNo); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.xml new file mode 100644 index 0000000000..f6fcb29098 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyRest.java new file mode 100644 index 0000000000..9a0db6c487 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyRest.java @@ -0,0 +1,97 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitleapply; + +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.astechtitleapply.AsTechTitleApplyQuery; +import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyVo; +import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyDetailsVo; +import com.yxt.anrui.as.api.astechtitleapply.AsTechTitleApplyDto; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleApplyFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.astechtitleapply.AsTechTitleApplyRest
+ * Description: 维修技师职称备案申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修技师职称备案申请") +@RestController +@RequestMapping("v1/astechtitleapply") +public class AsTechTitleApplyRest { + + @Autowired + private AsTechTitleApplyService asTechTitleApplyService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = asTechTitleApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AsTechTitleApplyDto dto){ + return asTechTitleApplyService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + return asTechTitleApplyService.delAll(sids); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + AsTechTitleApplyDetailsVo vo = asTechTitleApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @ApiOperation("初始化") + @PostMapping("/init") + public ResultBean init(@RequestBody String[] techSids){ + ResultBean rb = ResultBean.fireFail(); + AsTechTitleApplyDetailsVo vo = asTechTitleApplyService.init(techSids); + return rb.success().setData(vo); + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java new file mode 100644 index 0000000000..7cc0b2c82e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java @@ -0,0 +1,313 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitleapply; + +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.AsBwdiffapplyFile; +import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo; +import com.yxt.anrui.as.api.astechtitle.AsTechTitle; +import com.yxt.anrui.as.api.astechtitleapply.*; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetail; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDetailsVo; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDto; +import com.yxt.anrui.as.biz.asappendix.AsAppendixService; +import com.yxt.anrui.as.biz.astechtitle.AsTechTitleService; +import com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailService; +import com.yxt.anrui.as.feign.base.billno.Rule; +import com.yxt.anrui.as.feign.file.AsFileEnum; +import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign; +import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign; +import com.yxt.anrui.as.feign.flowable.flowtask.FlowTaskFeign; +import com.yxt.anrui.as.feign.message.MessageFeign; +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.sysstafforg.SysStaffOrgFeign; +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.Arrays; +import java.util.List; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleApplyService.java
+ * Class: com.yxt.anrui.as.biz.astechtitleapply.AsTechTitleApplyService
+ * Description: 维修技师职称备案申请 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsTechTitleApplyService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private FlowableFeign flowableFeign; + @Autowired + private FlowTaskFeign flowTaskFeign; + @Autowired + private FlowFeign flowFeign; + @Autowired + private MessageFeign messageFeign; + @Autowired + private AsTechTitleDetailService asTechTitleDetailService; + @Autowired + private AsTechTitleService asTechTitleService; + @Autowired + private AsAppendixService asAppendixService; + + public PagerVo listPageVo(PagerQuery pq) { + AsTechTitleApplyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("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("tta.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())){ + qw.like("tta.useOrgName",query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getDeptName())){ + qw.like("tta.deptName",query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getCreateByName())){ + qw.like("tta.createByName",query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBillNo())){ + qw.like("tta.billNo",query.getBillNo()); + } + String createStartTime = query.getCreateTimeStart(); + String createEndTime = query.getCreateTimeEnd(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (tta.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (tta.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String finishStartTime = query.getFinishTimeStart(); + String finishEndTime = query.getFinishTimeEnd(); + qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (tta.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishEndTime), "date_format (tta.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(AsTechTitleApplyDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List asTechTitleDetailDetailsList = dto.getAsTechTitleDetailDetailsList(); + List asTechTitleApplyFileList = dto.getAsTechTitleApplyFileList(); + String deptSid = dto.getDeptSid(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + dto.setUseOrgSid(useOrgSid); + dto.setUseOrgName(organizationVo.getName()); + if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "WXJSBA" + organizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); + String sid = this.insertByDto(dto); + for (AsTechTitleDetailDto asTechTitleDetailDto : asTechTitleDetailDetailsList) { + asTechTitleDetailDto.setMainSid(sid); + asTechTitleDetailService.insertByDto(asTechTitleDetailDto); + } + for (AsTechTitleApplyFile asTechTitleApplyFile : asTechTitleApplyFileList) { + String filePath = asTechTitleApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + AsAppendix asAppendix = new AsAppendix(); + asAppendix.setLinkSid(sid); + asAppendix.setAttachType(AsFileEnum.ASTECHTITLEAPPLY.getAttachType()); + asAppendix.setFilePath(filePath); + asAppendixService.save(asAppendix); + } + return rb.success().setData(sid); + } + this.updateByDto(dto); + asTechTitleDetailService.delByMainSid(dtoSid); + asAppendixService.delByLinkSid(dtoSid); + for (AsTechTitleDetailDto asTechTitleDetailDto : asTechTitleDetailDetailsList) { + asTechTitleDetailDto.setMainSid(dtoSid); + asTechTitleDetailService.insertByDto(asTechTitleDetailDto); + } + for (AsTechTitleApplyFile asTechTitleApplyFile : asTechTitleApplyFileList) { + String filePath = asTechTitleApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + AsAppendix asAppendix = new AsAppendix(); + asAppendix.setLinkSid(dtoSid); + asAppendix.setAttachType(AsFileEnum.ASTECHTITLEAPPLY.getAttachType()); + asAppendix.setFilePath(filePath); + asAppendixService.save(asAppendix); + } + return rb.success().setData(dtoSid); + } + + public String insertByDto(AsTechTitleApplyDto dto){ + AsTechTitleApply entity = new AsTechTitleApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(AsTechTitleApplyDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + AsTechTitleApply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public AsTechTitleApplyDetailsVo fetchDetailsVoBySid(String sid){ + AsTechTitleApply entity = fetchBySid(sid); + AsTechTitleApplyDetailsVo vo = new AsTechTitleApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + List asTechTitleDetailDetailsVos = asTechTitleDetailService.selByMainSid(sid); + for (AsTechTitleDetailDetailsVo asTechTitleDetailDetailsVo : asTechTitleDetailDetailsVos) { + AsTechTitleDetail asTechTitleDetail = asTechTitleDetailService.fetchBySid(asTechTitleDetailDetailsVo.getSid()); + String techSid = asTechTitleDetail.getTechSid(); + String techName = asTechTitleDetail.getTechName(); + asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(techSid.split(","))); + asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(techName.split(","))); + } + vo.setAsTechTitleDetailDetailsList(asTechTitleDetailDetailsVos); + List asAppendices = asAppendixService.fetchByLinkSid(sid); + List asTechTitleApplyFiles = new ArrayList<>(); + for (AsAppendix asAppendix : asAppendices) { + AsTechTitleApplyFile asTechTitleApplyFile = new AsTechTitleApplyFile(); + String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath(); + asTechTitleApplyFile.setUrl(url); + asTechTitleApplyFiles.add(asTechTitleApplyFile); + } + vo.setAsTechTitleApplyFileList(asTechTitleApplyFiles); + return vo; + } + + public ResultBean delAll(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) { + asTechTitleDetailService.delByMainSid(sid); + asAppendixService.delByLinkSid(sid); + } + return rb.success(); + } + + public AsTechTitleApplyDetailsVo init(String[] techSids) { + AsTechTitleApplyDetailsVo asTechTitleApplyDetailsVo = new AsTechTitleApplyDetailsVo(); + List asTechTitleDetailDetailsVos = new ArrayList<>(); + for (String techSid : techSids) { + AsTechTitleDetailDetailsVo asTechTitleDetailDetailsVo = new AsTechTitleDetailDetailsVo(); + AsTechTitle asTechTitle = asTechTitleService.fetchBySid(techSid); + asTechTitleDetailDetailsVo.setTitleSid(techSid); + asTechTitleDetailDetailsVo.setTitleNameKey(asTechTitle.getTitleNameKey()); + asTechTitleDetailDetailsVo.setTitleNameValue(asTechTitle.getTitleNameValue()); + asTechTitleDetailDetailsVo.setWeight(asTechTitle.getWeight()); + AsTechTitleDetail asTechTitleDetail = asTechTitleDetailService.selByTechSid(techSid); + if (asTechTitleDetail != null){ + asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(asTechTitleDetail.getTechSid().split(","))); + asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(asTechTitleDetail.getTechName().split(","))); + } + asTechTitleDetailDetailsVos.add(asTechTitleDetailDetailsVo); + } + asTechTitleApplyDetailsVo.setAsTechTitleDetailDetailsList(asTechTitleDetailDetailsVos); + return asTechTitleApplyDetailsVo; + } +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.java new file mode 100644 index 0000000000..cbf504257e --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitledetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetail; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleDetailMapper.java
+ * Class: com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailMapper
+ * Description: 维修技师职称备案列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsTechTitleDetailMapper extends BaseMapper { + + @Delete("delete from as_tech_title_detail where mainSid = #{mainSid}") + void delByMainSid(String mainSid); + + @Select("select * from as_tech_title_detail where mainSid = #{mainSid}") + List selByMainSid(String mainSid); + + @Select("select * from as_tech_title_detail where titleSid = #{techSid}") + AsTechTitleDetail selByTechSid(String techSid); +} \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.xml new file mode 100644 index 0000000000..d8ee1cc408 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailRest.java new file mode 100644 index 0000000000..9019653a88 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailRest.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitledetail; + +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.astechtitledetail.AsTechTitleDetailDetailsVo; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDto; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleDetailFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailRest
+ * Description: 维修技师职称备案列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修技师职称备案列表") +@RestController +@RequestMapping("v1/astechtitledetail") +public class AsTechTitleDetailRest { + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailService.java new file mode 100644 index 0000000000..ef72eebe44 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailService.java @@ -0,0 +1,88 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.astechtitledetail; + +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.astechtitledetail.AsTechTitleDetail; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDetailsVo; +import com.yxt.anrui.as.api.astechtitledetail.AsTechTitleDetailDto; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: yxt-as(维修技师职称备案申请)
+ * File: AsTechTitleDetailService.java
+ * Class: com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailService
+ * Description: 维修技师职称备案列表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-30 14:26:33
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsTechTitleDetailService extends MybatisBaseService { + + public void insertByDto(AsTechTitleDetailDto dto){ + AsTechTitleDetail entity = new AsTechTitleDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + List techSids = dto.getTechSids(); + List techNames = dto.getTechNames(); + entity.setTechSid(String.join(",",techSids)); + entity.setTechName(String.join(",",techNames)); + baseMapper.insert(entity); + } + + public AsTechTitleDetailDetailsVo fetchDetailsVoBySid(String sid){ + AsTechTitleDetail entity = fetchBySid(sid); + AsTechTitleDetailDetailsVo vo = new AsTechTitleDetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String mainSid) { + baseMapper.delByMainSid(mainSid); + } + + public List selByMainSid(String mainSid) { + return baseMapper.selByMainSid(mainSid); + } + + public AsTechTitleDetail selByTechSid(String techSid) { + return baseMapper.selByTechSid(techSid); + } +} \ No newline at end of file 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 a4a5cca141..8d7edafd0e 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 @@ -11,7 +11,8 @@ public enum AsFileEnum { ASBWDIFFAPPLY("002", "保外工单应收调差附件"), ASBWDIFFAPPLYDETAIL("003", "保外工单应收调差工单附件"), ASWXXMBA("004", "维修项目备案附件"), - WXGD("005", "维修工单附件") + WXGD("005", "维修工单附件"), + ASTECHTITLEAPPLY("006", "维修技师职称备案附件"), ;