From 3ab083743d1157db6c301fe2abe6a6ec90111ab1 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 20 Feb 2025 11:34:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/api/basefiles/BaseFiles.java | 13 - .../BasePurchaseSystemFeign.java | 11 +- .../BaseVehicleBrandFeign.java | 6 +- .../BasePurchaseSystemMapper.java | 37 +- .../BasePurchaseSystemRest.java | 120 +++--- .../BasePurchaseSystemService.java | 204 +++++----- .../BaseVehicleBrandMapper.java | 3 + .../BaseVehicleBrandRest.java | 5 + .../BaseVehicleBrandService.java | 7 + .../api/scmspecialrebate/DownloadExcelVo.java | 29 ++ .../scm/api/scmspecialrebate/ExcelInfo.java | 33 ++ .../scmspecialrebate/ScmSpecialRebateDto.java | 58 ++- .../ScmSpecialRebateFeign.java | 9 + .../ScmSpecialRebateFeignFallback.java | 10 + .../SpecialRebateExcelInfo.java | 12 + .../scm/api/scmwarehouse/ScmWarehouse.java | 13 - .../ScmSpecialRebateRest.java | 20 + .../ScmSpecialRebateService.java | 373 +++++++++++++++--- .../biz/scmvehrebate/ScmVehRebateService.java | 40 +- .../oa/leaveapply/AppLeaveApplyDetailsVo.java | 13 - .../api/oa/leaveapply/AppLeaveApplyDto.java | 14 +- .../oa/leaveapply/AppLeaveApplyInitVo.java | 15 - .../oa/mendapply/AppMendApplyDetailsVo.java | 14 +- .../api/oa/mendapply/AppMendApplyDto.java | 14 +- .../api/oa/mendapply/AppMendApplyInitVo.java | 14 +- .../oaleaveapply/OaLeaveApplyDetailsVo.java | 14 +- .../fegin/oaleaveapply/OaLeaveApplyDto.java | 13 - .../oaleaveapply/OaLeaveApplyInitVo.java | 14 +- .../fegin/oamendapply/OaMendApply.java | 14 +- .../oamendapply/OaMendApplyDetailsVo.java | 14 +- .../fegin/oamendapply/OaMendApplyDto.java | 14 +- .../fegin/oamendapply/OaMendApplyInitVo.java | 14 +- .../anrui/oa/api/AdFrockallotApplyRest.java | 118 ++++++ .../anrui/oa/api/AdFrockallotDetailRest.java | 51 +++ .../anrui/oa/api/AdPircarpulApplyRest.java | 111 ++++++ .../anrui/oa/api/AdPircarpulDetailRest.java | 36 ++ .../AdAllocateAssetDetailsDto.java | 14 +- .../AdAllocateAssetDetailsVo.java | 14 +- .../AdAllocateAssetListDetailsVo.java | 14 +- .../AdBeverageAcceptanceDetail.java | 14 +- .../AdBeverageAcceptanceDetailDto.java | 14 +- ...dBeverageAcceptanceDetailListDetailVo.java | 14 +- .../AdBeverageAcceptanceDetailVo.java | 14 +- .../AdDisposalAssetDetailsDto.java | 14 +- .../AdDisposalAssetDetailsVo.java | 14 +- .../AdDisposalAssetListDetailsVo.java | 14 +- .../AdExpatriatesDetail.java | 14 +- .../AdExpatriatesDetailDto.java | 14 +- .../AdExpatriatesDetailVo.java | 14 +- .../AdExpatriatesListDetailVo.java | 14 +- .../adfrockallotapply/AdFrockallotApply.java | 45 +++ .../AdFrockallotApplyDetailsVo.java | 49 +++ .../AdFrockallotApplyDto.java | 70 ++++ .../AdFrockallotApplyMapper.java | 35 ++ .../AdFrockallotApplyMapper.xml | 26 ++ .../AdFrockallotApplyService.java | 300 ++++++++++++++ .../AdFrockallotApplyVo.java | 65 +++ .../AdFrockallotDetail.java | 48 +++ .../AdFrockallotDetailDto.java | 46 +++ .../AdFrockallotDetailMapper.java | 50 +++ .../AdFrockallotDetailMapper.xml | 13 + .../AdFrockallotDetailService.java | 79 ++++ .../AdFrockallotDetailVo.java | 48 +++ .../AdFrockallotListDetailVo.java | 44 +++ .../adleasehostapply/AdLeasehostApply.java | 17 +- .../AdOfficeSuppliesDetail.java | 14 +- .../AdOfficeSuppliesDetailDto.java | 14 +- .../AdOfficeSuppliesDetailVo.java | 14 +- .../biz/adoffspaceapply/AdOffspaceApply.java | 14 +- .../AdOffspaceApplyDetailsVo.java | 14 +- .../adoffspacedetail/AdOffspaceDetailDto.java | 14 +- .../AdOffspaceListDetailVo.java | 14 +- .../adpircarpulapply/AdPircarpulApply.java | 58 +++ .../AdPircarpulApplyDetailsVo.java | 65 +++ .../adpircarpulapply/AdPircarpulApplyDto.java | 70 ++++ .../AdPircarpulApplyMapper.java | 58 +++ .../AdPircarpulApplyMapper.xml | 38 ++ .../AdPircarpulApplyService.java | 311 +++++++++++++++ .../adpircarpulapply/AdPircarpulApplyVo.java | 77 ++++ .../adpircarpuldetail/AdPircarpulDetail.java | 72 ++++ .../AdPircarpulDetailDto.java | 83 ++++ .../AdPircarpulDetailMapper.java | 62 +++ .../AdPircarpulDetailMapper.xml | 25 ++ .../AdPircarpulDetailService.java | 91 +++++ .../AdPircarpulDetailVo.java | 85 ++++ .../AdPircarpulListDetailVo.java | 78 ++++ .../AdPurchaseAssetDetailsVo.java | 14 +- .../AdPurchaseAssetListDetailsVo.java | 14 +- .../AdReimbursedAssetListDetailsVo.java | 14 +- .../oa/biz/oahireapply/OaHireApplyMapper.java | 14 +- .../oa/biz/oahireapply/OaHireApplyQuery.java | 14 +- .../oa/biz/oahiredetails/OaHireDetails.java | 14 +- .../oahiredetails/OaHireDetailsDetailsVo.java | 14 +- .../biz/oahiredetails/OaHireDetailsFeign.java | 14 +- .../biz/oahiredetails/OaHireDetailsQuery.java | 14 +- .../oa/biz/oahiredetails/OaHireDetailsVo.java | 14 +- .../oaleaveapply/OaLeaveApplyDetailsVo.java | 14 +- .../oa/biz/oaleaveapply/OaLeaveApplyDto.java | 14 +- .../biz/oaleaveapply/OaLeaveApplyInitVo.java | 14 +- .../oa/biz/oaleaveapply/OaLeaveApplyVo.java | 14 +- .../anrui/oa/biz/oamendapply/OaMendApply.java | 14 +- .../oa/biz/oamendapply/OaMendApplyDto.java | 14 +- .../oa/biz/oamendapply/OaMendApplyVo.java | 14 +- 103 files changed, 3138 insertions(+), 1002 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/DownloadExcelVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ExcelInfo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/SpecialRebateExcelInfo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulDetailRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApply.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApply.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDetailsVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulListDetailVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java index 99106b9bc0..7e3972ac3c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefiles/BaseFiles.java @@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-base(安瑞基础信息)
- * File: BaseDataList.java
- * Class: com.yxt.anrui.base.api.basedatalist.BaseDataList
- * Description: 资料清单.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-02-26 09:59:29
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "附件清单", description = "附件清单") @TableName("base_files") @Data diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java index bdbad2a44a..d91d49c53e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java @@ -69,13 +69,13 @@ public interface BasePurchaseSystemFeign { @ApiOperation("维护分摊比例") @PostMapping("/maintenance") @ResponseBody - public ResultBean maintenance(@RequestParam("sid") String sid,@RequestParam("shareProportion") String shareProportion); - + public ResultBean maintenance(@RequestParam("sid") String sid, @RequestParam("shareProportion") String shareProportion); + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -100,4 +100,9 @@ public interface BasePurchaseSystemFeign { @GetMapping("/fetchDetailsByUseOrgPath") @ResponseBody public ResultBean> fetchDetailsByUseOrgPath(@RequestParam("orgPath") String orgPath); + + @ApiOperation("根据采购系统名称查询采购系统sid") + @GetMapping("/selByPurchaseSystemName") + @ResponseBody + public ResultBean selByPurchaseSystemName(@RequestParam("purchaseSystemName") String purchaseSystemName, @RequestParam("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java index 2869935ca2..58176c4248 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java @@ -108,7 +108,7 @@ public interface BaseVehicleBrandFeign { @ApiOperation("手机端根据厂商sid查询品牌列表") @GetMapping("/selectAppListByManufacturerSid") - ResultBean> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid",required = false) String manufacturerSid); + ResultBean> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid", required = false) String manufacturerSid); @ApiOperation("手机端-获取品牌数据字典") @GetMapping("/selectAppListByUserSid/{userSid}") @@ -121,4 +121,8 @@ public interface BaseVehicleBrandFeign { @ApiOperation("根据品牌sid获取品牌信息") @GetMapping("/fetchBySid/{sid}") BaseVehicleBrand fetchBySid(@RequestParam("sid") String sid); + + @ApiOperation("根据品牌名称获取品牌sid") + @GetMapping("/selByBrandName") + ResultBean selByBrandName(@RequestParam("brandName") String brandName); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java index 4810bdeb28..8c7a21b326 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java @@ -56,24 +56,24 @@ import java.util.List; @Mapper public interface BasePurchaseSystemMapper extends BaseMapper { - //@Update("update base_purchase_system 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 base_purchase_system") - List selectListVo(); + //@Update("update base_purchase_system set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}") - List fetchDetailsByUseOrgSid(String useOrgSid); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from base_purchase_system where deptSid = #{deptSid}") - BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(String deptSid); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}") - BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid,@Param("sid") String sid); + @Select("select * from base_purchase_system") + List selectListVo(); + + @Select("select * from base_purchase_system where useOrgSid = #{useOrgSid}") + List fetchDetailsByUseOrgSid(String useOrgSid); + + @Select("select * from base_purchase_system where deptSid = #{deptSid}") + BasePurchaseSystemDetailsVo fetchDetailsByDeptSid(String deptSid); + + @Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}") + BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid, @Param("sid") String sid); List fetchOrgCodeByUseOrgSid(String useOrgSid); @@ -81,6 +81,9 @@ public interface BasePurchaseSystemMapper extends BaseMapper List selectByUseOrgSid(String useOrgSid); - @Update("update base_purchase_system set shareProportion = #{shareProportion} where sid = #{sid}") - void maintenance(@Param("sid") String sid,@Param("shareProportion") String shareProportion); + @Update("update base_purchase_system set shareProportion = #{shareProportion} where sid = #{sid}") + void maintenance(@Param("sid") String sid, @Param("shareProportion") String shareProportion); + + @Select("select deptSid from base_purchase_system where purchaseSystemName = #{purchaseSystemName} and useOrgSid = #{useOrgSid}") + String selByPurchaseSystemName(@Param("purchaseSystemName") String purchaseSystemName, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java index 191f9e2aa9..05e5b55ae8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java @@ -36,83 +36,75 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-base(采购系统管理)
- * File: BasePurchaseSystemFeignFallback.java
- * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest
- * Description: 采购系统管理表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-01-06 09:27:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "采购系统管理表") -@RestController("com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest") +@RestController @RequestMapping("v1/basepurchasesystem") public class BasePurchaseSystemRest implements BasePurchaseSystemFeign { - @Autowired - private BasePurchaseSystemService basePurchaseSystemService; + @Autowired + private BasePurchaseSystemService basePurchaseSystemService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = basePurchaseSystemService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = basePurchaseSystemService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody BasePurchaseSystemDto dto){ - return basePurchaseSystemService.saveOrUpdateDto(dto); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BasePurchaseSystemDto dto) { + return basePurchaseSystemService.saveOrUpdateDto(dto); + } - @Override - public ResultBean maintenance(String sid, String shareProportion) { - return basePurchaseSystemService.maintenance(sid,shareProportion); - } + @Override + public ResultBean maintenance(String sid, String shareProportion) { + return basePurchaseSystemService.maintenance(sid, shareProportion); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - basePurchaseSystemService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + basePurchaseSystemService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + BasePurchaseSystemDetailsVo vo = basePurchaseSystemService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) { - return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid); - } + @Override + public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) { + return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid); + } - @Override - public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) { - return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid); - } + @Override + public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) { + return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid); + } - @Override - public ResultBean fetchDetailsByDeptSid(String deptSid) { - return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid); - } + @Override + public ResultBean fetchDetailsByDeptSid(String deptSid) { + return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid); + } - @Override - public ResultBean> fetchDetailsByUseOrgPath(String orgPath) { - return basePurchaseSystemService.fetchDetailsByUseOrgPath(orgPath); - } + @Override + public ResultBean> fetchDetailsByUseOrgPath(String orgPath) { + return basePurchaseSystemService.fetchDetailsByUseOrgPath(orgPath); + } + + @Override + public ResultBean selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) { + return basePurchaseSystemService.selByPurchaseSystemName(purchaseSystemName, useOrgSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java index 916c217a20..0f37f382fd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java @@ -57,109 +57,115 @@ import java.util.List; @Service public class BasePurchaseSystemService extends MybatisBaseService { - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; - - private QueryWrapper createQueryWrapper(BasePurchaseSystemQuery 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) { - BasePurchaseSystemQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())){ - qw.eq("useOrgSid",query.getUseOrgSid()); - } - if (StringUtils.isNotBlank(query.getPurchaseSystemName())){ - qw.like("purchaseSystemName",query.getPurchaseSystemName()); - } - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean saveOrUpdateDto(BasePurchaseSystemDto dto){ - ResultBean rb = ResultBean.fireFail(); + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + + private QueryWrapper createQueryWrapper(BasePurchaseSystemQuery 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) { + BasePurchaseSystemQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("useOrgSid", query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("purchaseSystemName", query.getPurchaseSystemName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(BasePurchaseSystemDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid()); - if (basePurchaseSystemDetailsVo == null){ - this.insertByDto(dto); - return rb.success().setMsg("添加成功"); - } + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(dto.getDeptSid()); + if (basePurchaseSystemDetailsVo == null) { + this.insertByDto(dto); + return rb.success().setMsg("添加成功"); + } return rb.setMsg("该部门下已存在采购系统，请重新选择"); } - BasePurchaseSystem basePurchaseSystem = fetchBySid(dtoSid); - if (basePurchaseSystem == null){ - return rb.setMsg("该采购系统信息不存在"); - } - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSidAndSid(dto.getDeptSid(), dtoSid); - if (basePurchaseSystemDetailsVo == null){ - this.updateByDto(dto); - return rb.success().setMsg("修改成功"); - } - return rb.setMsg("该部门下已存在采购系统，请重新选择"); - } - - public void insertByDto(BasePurchaseSystemDto dto){ - BasePurchaseSystem entity = new BasePurchaseSystem(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(BasePurchaseSystemDto dto){ - String dtoSid = dto.getSid(); + BasePurchaseSystem basePurchaseSystem = fetchBySid(dtoSid); + if (basePurchaseSystem == null) { + return rb.setMsg("该采购系统信息不存在"); + } + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSidAndSid(dto.getDeptSid(), dtoSid); + if (basePurchaseSystemDetailsVo == null) { + this.updateByDto(dto); + return rb.success().setMsg("修改成功"); + } + return rb.setMsg("该部门下已存在采购系统，请重新选择"); + } + + public void insertByDto(BasePurchaseSystemDto dto) { + BasePurchaseSystem entity = new BasePurchaseSystem(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BasePurchaseSystemDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - BasePurchaseSystem entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public BasePurchaseSystemDetailsVo fetchDetailsVoBySid(String sid){ - BasePurchaseSystem entity = fetchBySid(sid); - BasePurchaseSystemDetailsVo vo = new BasePurchaseSystemDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) { - ResultBean rb = ResultBean.fireFail(); - List basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid); - return rb.success().setData(basePurchaseSystemDetailsVos); - } - - public ResultBean fetchDetailsByDeptSid(String deptSid) { - ResultBean rb = ResultBean.fireFail(); - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid); - return rb.success().setData(basePurchaseSystemDetailsVo); - } - - public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) { - ResultBean rb = ResultBean.fireFail(); - List basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid); - return rb.success().setData(basePurchaseSystemDetailsVos); - } - - public ResultBean> fetchDetailsByUseOrgPath(String orgPath) { - ResultBean rb = ResultBean.fireFail(); - String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - List basePurchSystemVoList = baseMapper.fetchDetailsByUseOrgPath(orgSid); - return rb.success().setData(basePurchSystemVoList); - } - - public List selectByUseOrgSid(String useOrgSid) { - return baseMapper.selectByUseOrgSid(useOrgSid); - } - - public ResultBean maintenance(String sid, String shareProportion) { - ResultBean rb = ResultBean.fireFail(); - baseMapper.maintenance(sid,shareProportion); - return rb.success(); - } + } + BasePurchaseSystem entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BasePurchaseSystemDetailsVo fetchDetailsVoBySid(String sid) { + BasePurchaseSystem entity = fetchBySid(sid); + BasePurchaseSystemDetailsVo vo = new BasePurchaseSystemDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean> fetchDetailsByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List basePurchaseSystemDetailsVos = baseMapper.fetchDetailsByUseOrgSid(useOrgSid); + return rb.success().setData(basePurchaseSystemDetailsVos); + } + + public ResultBean fetchDetailsByDeptSid(String deptSid) { + ResultBean rb = ResultBean.fireFail(); + BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid); + return rb.success().setData(basePurchaseSystemDetailsVo); + } + + public ResultBean> fetchOrgCodeByUseOrgSid(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid); + return rb.success().setData(basePurchaseSystemDetailsVos); + } + + public ResultBean> fetchDetailsByUseOrgPath(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List basePurchSystemVoList = baseMapper.fetchDetailsByUseOrgPath(orgSid); + return rb.success().setData(basePurchSystemVoList); + } + + public List selectByUseOrgSid(String useOrgSid) { + return baseMapper.selectByUseOrgSid(useOrgSid); + } + + public ResultBean maintenance(String sid, String shareProportion) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.maintenance(sid, shareProportion); + return rb.success(); + } + + public ResultBean selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + String purchaseSystemSid = baseMapper.selByPurchaseSystemName(purchaseSystemName, useOrgSid); + return rb.success().setData(purchaseSystemSid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index dbdd32de0e..15d4541c83 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -138,4 +138,7 @@ public interface BaseVehicleBrandMapper extends BaseMapper { String selectByManufacturerSid(@Param("carBrandSid") String carBrandSid); List selectByUseOrgSid(String sid); + + @Select("select sid from base_vehicle_brand where brandName=#{brandName}") + String selByBrandName(String brandName); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java index 7c24b31e80..b8e3f77a29 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java @@ -189,4 +189,9 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { public BaseVehicleBrand fetchBySid(String sid) { return baseVehicleBrandService.fetchBySid(sid); } + + @Override + public ResultBean selByBrandName(String brandName) { + return baseVehicleBrandService.selByBrandName(brandName); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index 3a0450cc77..c15dead2f9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -10,6 +10,7 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.AppResultData; +import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -256,4 +257,10 @@ public class BaseVehicleBrandService extends MybatisBaseService selectByUseOrgSid(String sid) { return baseMapper.selectByUseOrgSid(sid); } + + public ResultBean selByBrandName(String brandName) { + ResultBean rb = ResultBean.fireFail(); + String sid = baseMapper.selByBrandName(brandName); + return rb.success().setData(sid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/DownloadExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/DownloadExcelVo.java new file mode 100644 index 0000000000..91fd2960e6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/DownloadExcelVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.scm.api.scmspecialrebate; + +import com.yxt.common.core.utils.ExportEntityMap; +import lombok.Data; + +@Data +public class DownloadExcelVo { + + @ExportEntityMap(CnName = "采购系统*", EnName = "purchaseSystemName") + private String purchaseSystemName; + @ExportEntityMap(CnName = "品牌名称*", EnName = "brandName") + private String brandName; + @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") + private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") + private String estimateRebate; + @ExportEntityMap(CnName = "其中支出费用*", EnName = "expectItureCost") + private String expectItureCost; + @ExportEntityMap(CnName = "其中待支付费用*", EnName = "expectTreatCost") + private String expectTreatCost; + @ExportEntityMap(CnName = "其中抵顶费用*", EnName = "expectSuppCost") + private String expectSuppCost; + @ExportEntityMap(CnName = "所属年月*", EnName = "palceGenDate") + private String palceGenDate; + @ExportEntityMap(CnName = "备注", EnName = "remarks") + private String remarks; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ExcelInfo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ExcelInfo.java new file mode 100644 index 0000000000..0694de0be1 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ExcelInfo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.scm.api.scmspecialrebate; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/28 + **/ +@Data +public class ExcelInfo { + + //采购系统 + private String purchaseSystemName; + //品牌名称 + private String brandName; + //返利类型 + private String rebateTypeValue; + //返利名称 + private String rebateName; + //预提返利 + private String estimateRebate; + //其中支出费用 + private String expectItureCost; + //其中待支付费用 + private String expectTreatCost; + //其中抵顶费用 + private String expectSuppCost; + //所属年月 + private String palceGenDate; + //备注 + private String remarks; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java index c32359bcd3..b79af8a332 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java @@ -25,28 +25,12 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmspecialrebate; - import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; -/** - * Project: anrui-scm(专项返利管理)
- * File: ScmSpecialRebateDto.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDto
- * Description: 专项返利表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-08 16:11:43
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "专项返利表 数据传输对象", description = "专项返利表 数据传输对象") public class ScmSpecialRebateDto implements Dto { @@ -55,39 +39,41 @@ public class ScmSpecialRebateDto implements Dto { @ApiModelProperty("状态") private String state; // 状态 + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("计算标准") + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("费用") + @ApiModelProperty("费用") private String money; // 费用 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; @@ -140,13 +126,13 @@ public class ScmSpecialRebateDto implements Dto { @ApiModelProperty("二次抵顶费用说明") private String secondSuppRemark; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java index 71ada60326..9ed1a3c108 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java @@ -102,6 +102,15 @@ public interface ScmSpecialRebateFeign { @ResponseBody public ResultBean> stayDisRebate(@RequestBody PagerQuery pq); + @PostMapping("/downloadExcel") + @ApiOperation(value = "下载模板") + public void downloadExcel(); + + @ApiOperation(value = "导入") + @PostMapping("/getExcelInfo") + @ResponseBody + public ResultBean getExcelInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException; + @ApiOperation("一次导出") @PostMapping("/excelListOne") public void excelListOne(@RequestBody ScmSpecialRebateQuery scmSpecialRebateQuery); diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java index fe638e29c1..b3ad19ee97 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java @@ -109,6 +109,16 @@ public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign { return null; } + @Override + public void downloadExcel() { + + } + + @Override + public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { + return null; + } + @Override public void excelListOne(ScmSpecialRebateQuery scmSpecialRebateQuery) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/SpecialRebateExcelInfo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/SpecialRebateExcelInfo.java new file mode 100644 index 0000000000..fa8e15e39d --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/SpecialRebateExcelInfo.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.scm.api.scmspecialrebate; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class SpecialRebateExcelInfo { + private String checkInfo; + private List infos = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java index f44ac23a6e..90b4ed57b0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java @@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-scm(进销存)
- * File: ScmWarehouse.java
- * Class: com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse
- * Description: 仓库.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-01-05 15:42:47
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "仓库", description = "仓库") @TableName("scm_warehouse") @Data diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java index f2fed61d96..48a6b5ee59 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java @@ -48,6 +48,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; +import java.util.ArrayList; import java.util.List; @Api(tags = "专项返利表") @@ -175,6 +176,25 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign { return rb.success().setData(pv); } + @Override + public void downloadExcel() { + List list = new ArrayList<>(); + //定义导出的excel名字 + String excelName = "专项返利管理导入模板"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, list, DownloadExcelVo.class, response); + } + + @Override + public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException { + return scmSpecialRebateService.getExcelInfo(file, request, userSid, orgPath); + } + @Override public void excelListOne(ScmSpecialRebateQuery scmSpecialRebateQuery) { //得到所有要导出的数据 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index dc416a6b7a..ddc2291cb0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -29,13 +29,20 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateQuery; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.scmspecialrebate.*; import com.yxt.anrui.scm.api.scmspecialrebate.OneExcelInfo; import com.yxt.anrui.scm.api.scmspecialrebate.TwoExcelInfo; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; import com.yxt.anrui.scm.biz.scmspecialrebatevehs.ScmSpecialrebateVehsService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -69,6 +76,10 @@ public class ScmSpecialRebateService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmSpecialRebateQuery query = pq.getParams(); @@ -231,6 +244,7 @@ public class ScmSpecialRebateService extends MybatisBaseService 0) { @@ -621,6 +635,297 @@ public class ScmSpecialRebateService extends MybatisBaseService infos = importReturn.getInfos(); + for (ExcelInfo info : infos) { + ScmSpecialRebateDto scmSpecialRebate = new ScmSpecialRebateDto(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + String purchaseSystemSid = basePurchaseSystemFeign.selByPurchaseSystemName(info.getPurchaseSystemName(), useOrgSid).getData(); + scmSpecialRebate.setPurchaseSystemSid(purchaseSystemSid); + scmSpecialRebate.setPurchaseSystemName(info.getPurchaseSystemName()); + scmSpecialRebate.setState("0"); + scmSpecialRebate.setCreateBySid(userSid); + String brandSid = baseVehicleBrandFeign.selByBrandName(info.getBrandName()).getData(); + scmSpecialRebate.setBrandSid(brandSid); + scmSpecialRebate.setBrandName(info.getBrandName()); + String dictKey = dictCommonFeign.selectByValue(info.getRebateTypeValue()).getData(); + scmSpecialRebate.setRebateTypeKey(dictKey); + scmSpecialRebate.setRebateTypeValue(info.getRebateTypeValue()); + scmSpecialRebate.setRebateName(info.getRebateName()); + scmSpecialRebate.setEstimateRebate(info.getEstimateRebate()); + scmSpecialRebate.setExpectItureCost(new BigDecimal(info.getExpectItureCost())); + scmSpecialRebate.setExpectTreatCost(new BigDecimal(info.getExpectTreatCost())); + scmSpecialRebate.setExpectSuppCost(new BigDecimal(info.getExpectSuppCost())); + scmSpecialRebate.setPalceGenDate(info.getPalceGenDate()); + scmSpecialRebate.setRemarks(info.getRemarks()); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + scmSpecialRebate.setCreateOrgSid(useOrgSid); + scmSpecialRebate.setCreateOrgName(sysOrganizationVo.getName()); + scmSpecialRebate.setUseOrgSid(useOrgSid); + scmSpecialRebate.setUseOrgName(sysOrganizationVo.getName()); + scmSpecialRebate.setOrgPath(orgPath); + saveOrUpdateDto(scmSpecialRebate); + } + return rb.success().setMsg("成功导入数据，请点击确定按钮"); + } + } + + private SpecialRebateExcelInfo getSheetVal(Sheet sheet, int[] resultCell, String createOrgSid) { + SpecialRebateExcelInfo importReturn = new SpecialRebateExcelInfo(); + List importVoList = new ArrayList<>(); + Set checkWord = new HashSet<>(); + for (int r = 1; r <= sheet.getLastRowNum(); r++) { + Row row = sheet.getRow(r); + if (row == null) { + continue; + } + ExcelInfo importVo = new ExcelInfo(); + int physicalNumberOfCells = row.getPhysicalNumberOfCells(); + if (physicalNumberOfCells < 9) { + physicalNumberOfCells = 9; + } + for (int i = 0; i < physicalNumberOfCells; i++) { + String trim = new String(); + try { + trim = getCellVal(row.getCell(i)).toString().trim(); + if (StringUtils.isBlank(trim)) { + NullPointerException nullPointerException = new NullPointerException(); + } + String temp = getCellVal(row.getCell(i)).toString().trim(); + for (int j = 0; j < resultCell.length; j++) { + if (i == resultCell[j]) { + switch (i) { + case 0: + importVo.setPurchaseSystemName(temp); + break; + case 1: + importVo.setBrandName(temp); + break; + case 2: + importVo.setRebateTypeValue(temp); + break; + case 3: + importVo.setRebateName(temp); + break; + case 4: + importVo.setEstimateRebate(temp); + break; + case 5: + importVo.setExpectItureCost(temp); + break; + case 6: + importVo.setExpectTreatCost(temp); + break; + case 7: + importVo.setExpectSuppCost(temp); + break; + case 8: + importVo.setPalceGenDate(temp); + break; + case 9: + importVo.setRemarks(temp); + break; + default: + break; + } + } else { + continue; + } + } + } catch (Exception e) { + if (StringUtils.isBlank(trim)) { + String word = new String(); + switch (i) { + case 0: + word = "采购系统"; + break; + case 1: + word = "品牌"; + break; + case 2: + word = "返利类型"; + break; + case 3: + word = "返利名称"; + break; + case 4: + word = "预提金额"; + break; + case 5: + word = "其中支出费用"; + break; + case 6: + word = "其中待支付费用"; + break; + case 7: + word = "其中抵顶费用"; + break; + case 8: + word = "所属年月"; + break; + case 9: + word = "备注"; + break; + default: + break; + } + continue; + } + } + } + importVoList.add(importVo); + } + if (!importVoList.isEmpty()) { + for (ExcelInfo excelInfo : importVoList) { + ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName()); + if (scmSpecialRebateVo == null || StringUtils.isBlank(scmSpecialRebateVo.getSid())) { + checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在"); + break; + } + if (scmSpecialRebateVo.getOnceCheckState() == 1) { + checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已调整"); + break; + } + if (StringUtils.isBlank(excelInfo.getPurchaseSystemName())) { + checkWord.add("采购系统不能为空"); + break; + } + if (StringUtils.isBlank(excelInfo.getBrandName())) { + checkWord.add("品牌名称不能为空"); + break; + } + if (StringUtils.isBlank(excelInfo.getRebateTypeValue())) { + checkWord.add("返利类型不能为空"); + break; + } + if (StringUtils.isBlank(excelInfo.getRebateName())) { + checkWord.add("返利名称不能为空"); + break; + } + if (StringUtils.isNotBlank(excelInfo.getRebateTypeValue())) { + String dictKey = dictCommonFeign.selectByValue(excelInfo.getRebateTypeValue()).getData(); + if (StringUtils.isBlank(dictKey)) { + checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利类型填写不正确"); + break; + } + } + if (StringUtils.isBlank(excelInfo.getEstimateRebate())) { + checkWord.add("预提返利不能为空"); + break; + } + if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) { + String estimateRebate = excelInfo.getEstimateRebate(); + Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); + boolean matches = pattern.matcher(estimateRebate).matches(); + if (!matches) { + checkWord.add("预提返利必须为数字"); + break; + } + } + if (StringUtils.isBlank(excelInfo.getExpectItureCost())) { + checkWord.add("其中支出费用不能为空"); + break; + } + if (StringUtils.isNotBlank(excelInfo.getExpectItureCost())) { + String expectItureCost = excelInfo.getExpectItureCost(); + Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); + boolean matches = pattern.matcher(expectItureCost).matches(); + if (!matches) { + checkWord.add("其中支出费用必须为数字"); + break; + } + } + if (StringUtils.isBlank(excelInfo.getExpectTreatCost())) { + checkWord.add("其中待支付费用不能为空"); + break; + } + if (StringUtils.isNotBlank(excelInfo.getExpectTreatCost())) { + String expectTreatCost = excelInfo.getExpectTreatCost(); + Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); + boolean matches = pattern.matcher(expectTreatCost).matches(); + if (!matches) { + checkWord.add("其中待支付费用必须为数字"); + break; + } + } + if (StringUtils.isBlank(excelInfo.getExpectSuppCost())) { + checkWord.add("其中抵顶费用不能为空"); + break; + } + if (StringUtils.isNotBlank(excelInfo.getExpectSuppCost())) { + String expectSuppCost = excelInfo.getExpectSuppCost(); + Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); + boolean matches = pattern.matcher(expectSuppCost).matches(); + if (!matches) { + checkWord.add("其中抵顶费用必须为数字"); + break; + } + } + if (StringUtils.isBlank(excelInfo.getPalceGenDate())) { + checkWord.add("所属年月不能为空"); + break; + } + if (StringUtils.isNotBlank(excelInfo.getPalceGenDate())) { + String palceGenDate = excelInfo.getPalceGenDate(); + String[] split = palceGenDate.split("-"); + if (split.length != 2) { + checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的所属年月填写不正确，格式yyyy-MM"); + break; + } else if (!isFourDigitNumber(split[0]) || !isTwoDigitNumber(split[1])) { + checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的所属年月填写不正确，格式yyyy-MM"); + break; + } + } + } + } + StringBuffer sbcheck1 = new StringBuffer(); + if (!checkWord.isEmpty()) { + for (String s : checkWord) { + if (StringUtils.isBlank(s)) { + continue; + } + sbcheck1.append(s).append("；"); + } + } + if (sbcheck1.length() > 0) { + sbcheck1.delete(sbcheck1.length() - 1, sbcheck1.length()); + importReturn.setCheckInfo(sbcheck1.toString()); + importReturn.setInfos(new ArrayList<>()); + return importReturn; + } + importReturn.setInfos(importVoList); + return importReturn; + } + public ResultBean getExcelOneInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException { ResultBean rb = ResultBean.fireFail(); String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录 @@ -904,10 +1209,14 @@ public class ScmSpecialRebateService extends MybatisBaseService scmSpecialRebateExcelVos = baseMapper.excelList(qw); for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) { - if (scmSpecialRebateExcelVo.getState().equals("0")){ + if (scmSpecialRebateExcelVo.getState().equals("0")) { scmSpecialRebateExcelVo.setState("未预提"); - }else if (scmSpecialRebateExcelVo.getState().equals("1")){ + } else if (scmSpecialRebateExcelVo.getState().equals("1")) { scmSpecialRebateExcelVo.setState("预提中"); - }else if (scmSpecialRebateExcelVo.getState().equals("2")){ + } else if (scmSpecialRebateExcelVo.getState().equals("2")) { scmSpecialRebateExcelVo.setState("待核对"); - }else if (scmSpecialRebateExcelVo.getState().equals("3")){ + } else if (scmSpecialRebateExcelVo.getState().equals("3")) { scmSpecialRebateExcelVo.setState("核对中"); - }else if (scmSpecialRebateExcelVo.getState().equals("4")){ + } else if (scmSpecialRebateExcelVo.getState().equals("4")) { scmSpecialRebateExcelVo.setState("已核对"); - }else if (scmSpecialRebateExcelVo.getState().equals("5")){ + } else if (scmSpecialRebateExcelVo.getState().equals("5")) { scmSpecialRebateExcelVo.setState("分配中"); - }else if (scmSpecialRebateExcelVo.getState().equals("6")){ + } else if (scmSpecialRebateExcelVo.getState().equals("6")) { scmSpecialRebateExcelVo.setState("已分配"); } - if (scmSpecialRebateExcelVo.getOnceCheckState().equals("0")){ + if (scmSpecialRebateExcelVo.getOnceCheckState().equals("0")) { scmSpecialRebateExcelVo.setOnceCheckState("否"); - }else if (scmSpecialRebateExcelVo.getOnceCheckState().equals("1")){ + } else if (scmSpecialRebateExcelVo.getOnceCheckState().equals("1")) { scmSpecialRebateExcelVo.setOnceCheckState("是"); - }else if (scmSpecialRebateExcelVo.getOnceCheckState().equals("2")){ + } else if (scmSpecialRebateExcelVo.getOnceCheckState().equals("2")) { scmSpecialRebateExcelVo.setOnceCheckState("一次核对中"); } scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime()))); - if ("是".equals(scmSpecialRebateExcelVo.getIsAdjustment())){ + if ("是".equals(scmSpecialRebateExcelVo.getIsAdjustment())) { scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost())); scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost())); scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost())); - }else { + } else { scmSpecialRebateExcelVo.setItureAdjustmentMoney(BigDecimal.ZERO); scmSpecialRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO); scmSpecialRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index fe85a089d8..724bc4b656 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -1485,10 +1485,14 @@ public class ScmVehRebateService extends MybatisBaseService - * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情") public class AppLeaveApplyDetailsVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyDto.java index 764b0f4997..b7fc0b1a71 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyDto.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyDto.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyDto
- * Description: 请假申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 数据传输对象", description = "请假申请 数据传输对象") public class AppLeaveApplyDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyInitVo.java index 3a4babe41e..c0fedc5694 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyInitVo.java @@ -25,30 +25,15 @@ *********************************************************/ package com.yxt.anrui.terminal.api.oa.leaveapply; - 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.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情") public class AppLeaveApplyInitVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDetailsVo.java index a1f9c68ba9..1fdfb463c2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDetailsVo.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyVo.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo
- * Description: 补卡申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情") public class AppMendApplyDetailsVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDto.java index fe73692bfe..671838149e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyDto.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyDto.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyDto
- * Description: 补卡申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象") public class AppMendApplyDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyInitVo.java index 458ccd00aa..a8526a61f8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/mendapply/AppMendApplyInitVo.java @@ -34,19 +34,7 @@ import lombok.Data; import java.util.Date; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyVo.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo
- * Description: 补卡申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象") public class AppMendApplyInitVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDetailsVo.java index 4baf0758e9..e3af0ca19d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDetailsVo.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情") public class OaLeaveApplyDetailsVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDto.java index 9744582593..5b0e2ce1c5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDto.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyDto.java @@ -36,19 +36,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyDto.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyDto
- * Description: 请假申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "请假申请 数据传输对象", description = "请假申请 数据传输对象") public class OaLeaveApplyDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyInitVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyInitVo.java index 55a538a559..5e1050f711 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyInitVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oaleaveapply/OaLeaveApplyInitVo.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情") public class OaLeaveApplyInitVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApply.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApply.java index c170f094b2..27341da76e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApply.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApply.java @@ -34,19 +34,7 @@ import lombok.Data; import java.util.Date; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApply.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApply
- * Description: 补卡申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请", description = "补卡申请") @TableName("oa_mend_apply") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDetailsVo.java index 629545c61c..5f7e1abb14 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDetailsVo.java @@ -37,19 +37,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyVo.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo
- * Description: 补卡申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情") public class OaMendApplyDetailsVo extends OaLeaveApplyDetailsVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDto.java index 560077fc08..373bd0ba42 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDto.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyDto.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyDto.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyDto
- * Description: 补卡申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象") public class OaMendApplyDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyInitVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyInitVo.java index 0ac348aae5..04a1e8ac35 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyInitVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/oamendapply/OaMendApplyInitVo.java @@ -34,19 +34,7 @@ import lombok.Data; import java.util.Date; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyVo.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo
- * Description: 补卡申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象") public class OaMendApplyInitVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java new file mode 100644 index 0000000000..cf3a0d025a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotApplyRest.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adfrockallotapply.*; +import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo; +import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDto; +import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyVo; +import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; +import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; +import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; +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.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApply; +import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyQuery; +import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyVo; +import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDetailsVo; +import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDto; +import com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyFeign; + +import javax.validation.Valid; + +@Api(tags = "工装订制配发申请") +@RestController +@RequestMapping("v1/adfrockallotapply") +public class AdFrockallotApplyRest { + + @Autowired + private AdFrockallotApplyService adFrockallotApplyService; + + @ApiOperation("初始化（新增或修改）") + @GetMapping({"/getInit", "/getInit/{sid}"}) + public ResultBean getInit( + @PathVariable(value = "sid", required = false) String sid, + @RequestParam(value = "userSid", required = false) String userSid, + @RequestParam(value = "orgPath", required = false) String orgPath) { + ResultBean rb = ResultBean.fireFail(); + if (sid == null || sid.isEmpty()) { + // 执行新增初始化 + if (userSid == null || orgPath == null) { + return rb.setMsg("userSid和orgPath不能为空"); + } + return adFrockallotApplyService.getSaveInit(userSid, orgPath); + } else { + // 执行修改初始化 + return adFrockallotApplyService.getUpdateInit(sid); + } + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdPircarpulApplyDto dto) { + return adFrockallotApplyService.saveOrUpdateDto(dto); + } + + @ApiOperation("详情") + @GetMapping("/details/{sid}") + ResultBean details(@PathVariable("sid") String sid + , @RequestParam(value = "application", required = false) String application) { + return adFrockallotApplyService.details(sid,application); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody AdPircarpulApplyDto dto) { + return adFrockallotApplyService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PutMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteDto dto) { + return adFrockallotApplyService.complete(dto); + } + + @ApiOperation(value = "驳回任务") + @PutMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody TaskDto dto) { + return adFrockallotApplyService.reject(dto); + } + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return adFrockallotApplyService.getFlowOperateTitle(query); + } +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java new file mode 100644 index 0000000000..c6fff4a48e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFrockallotDetailRest.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adfrockallotdetail.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailQuery; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDetailsVo; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDto; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailFeign; + + +@Api(tags = "工装订制配发列表") +@RestController +@RequestMapping("v1/adfrockallotdetail") +public class AdFrockallotDetailRest { + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java new file mode 100644 index 0000000000..d895ef0830 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java @@ -0,0 +1,111 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo; +import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDto; +import com.yxt.anrui.oa.biz.adleasehostapply.adPircarpulApplyService; +import com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyVo; +import com.yxt.anrui.oa.biz.adpircarpulapply.*; +import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; +import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; +import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; +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.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +@Api(tags = "临时私车公用申请") +@RestController +@RequestMapping("v1/adpircarpulapply") +public class AdPircarpulApplyRest { + + @Autowired + private AdPircarpulApplyService adPircarpulApplyService; + + @ApiOperation("初始化（新增或修改）") + @GetMapping({"/getInit", "/getInit/{sid}"}) + public ResultBean getInit( + @PathVariable(value = "sid", required = false) String sid, + @RequestParam(value = "userSid", required = false) String userSid, + @RequestParam(value = "orgPath", required = false) String orgPath) { + ResultBean rb = ResultBean.fireFail(); + if (sid == null || sid.isEmpty()) { + // 执行新增初始化 + if (userSid == null || orgPath == null) { + return rb.setMsg("userSid和orgPath不能为空"); + } + return adPircarpulApplyService.getSaveInit(userSid, orgPath); + } else { + // 执行修改初始化 + return adPircarpulApplyService.getUpdateInit(sid); + } + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdPircarpulApplyDto dto) { + return adPircarpulApplyService.saveOrUpdateDto(dto); + } + + @ApiOperation("详情") + @GetMapping("/details/{sid}") + ResultBean details(@PathVariable("sid") String sid + , @RequestParam(value = "application", required = false) String application) { + return adPircarpulApplyService.details(sid,application); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody AdPircarpulApplyDto dto) { + return adPircarpulApplyService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PutMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteDto dto) { + return adPircarpulApplyService.complete(dto); + } + + @ApiOperation(value = "驳回任务") + @PutMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody TaskDto dto) { + return adPircarpulApplyService.reject(dto); + } + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return adPircarpulApplyService.getFlowOperateTitle(query); + } +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulDetailRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulDetailRest.java new file mode 100644 index 0000000000..94ec9475e9 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulDetailRest.java @@ -0,0 +1,36 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.api; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "临时私车公用列表") +@RestController +@RequestMapping("v1/adpircarpuldetail") +public class AdPircarpulDetailRest { + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsDto.java index 027db2b91a..76a3890c98 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsDto.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") public class AdAllocateAssetDetailsDto implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsVo.java index 8c33cca9e4..df29bd9f32 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsVo.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") public class AdAllocateAssetDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetListDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetListDetailsVo.java index 58eac57988..ed65f7e7ea 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetListDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetListDetailsVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") public class AdAllocateAssetListDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetail.java index f4644abc5d..65b3e41066 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetail.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetail.java @@ -33,19 +33,7 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetail.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail
- * Description: 驻外人员认定列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "集团用酒领用申请列表", description = "集团用酒领用申请列表") @TableName("ad_beverage_acceptance_detail") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailDto.java index a2cdf53d09..ca11e15747 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailDto.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailDto.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto
- * Description: 驻外人员认定列表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象") public class AdBeverageAcceptanceDetailDto implements Dto { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailListDetailVo.java index 5260105860..b746338398 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailListDetailVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") public class AdBeverageAcceptanceDetailListDetailVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailVo.java index a6ecf52b7f..064582e965 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adbeverageacceptancedetail/AdBeverageAcceptanceDetailVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") public class AdBeverageAcceptanceDetailVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsDto.java index 434c43458c..b9349fe0d3 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsDto.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产处置列表 视图数据对象", description = "固定资产处置列表 视图数据对象") public class AdDisposalAssetDetailsDto implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsVo.java index 91146f2d1b..01b6cd743f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetDetailsVo.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产处置列表 视图数据对象", description = "固定资产处置列表 视图数据对象") public class AdDisposalAssetDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetListDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetListDetailsVo.java index b0cf42efb8..cb5f4feb7b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetListDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/addisposalassetdetails/AdDisposalAssetListDetailsVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产处置列表 视图数据对象", description = "固定资产处置列表 视图数据对象") public class AdDisposalAssetListDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java index 5a64e9049d..7ea66cc856 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetail.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetail.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail
- * Description: 驻外人员认定列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表", description = "驻外人员认定列表") @TableName("ad_expatriates_detail") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java index 714577a530..273b8ded72 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailDto.java @@ -33,19 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailDto.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto
- * Description: 驻外人员认定列表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象") public class AdExpatriatesDetailDto implements Dto { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java index c5eadc6f4f..299b08e5bf 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesDetailVo.java @@ -33,19 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") public class AdExpatriatesDetailVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java index 8853cb918c..3d2d60eb12 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriatesdetail/AdExpatriatesListDetailVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") public class AdExpatriatesListDetailVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApply.java new file mode 100644 index 0000000000..4c82d2fb6e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApply.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotapply; + +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; + +@Data +@ApiModel(value = "工装订制配发申请", description = "工装订制配发申请") +@TableName("ad_frockallot_apply") +public class AdFrockallotApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("基础表单sid") + private String formSid; // 基础表单sid + @ApiModelProperty("关联审批sid列表,英文逗号分隔") + private String linkFormSids; // 关联审批sid列表,英文逗号分隔 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java new file mode 100644 index 0000000000..42b111a5fc --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java @@ -0,0 +1,49 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotapply; + +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo; +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; + +@Data +@ApiModel(value = "工装订制配发申请 视图数据详情", description = "工装订制配发申请 视图数据详情") +public class AdFrockallotApplyDetailsVo implements Vo { + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDto.java new file mode 100644 index 0000000000..b818fdb291 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDto.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotapply; + + +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailDto; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailDto; +import com.yxt.anrui.oa.biz.oaform.OaFormDto; +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-oa(1)
+ * File: AdFrockallotApplyDto.java
+ * Class: com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDto
+ * Description: 工装订制配发申请 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 10:41:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工装订制配发申请 数据传输对象", description = "工装订制配发申请 数据传输对象") +public class AdFrockallotApplyDto extends OaFormDto { + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("基础表单sid") + private String formSid; + @ApiModelProperty("关联审批单") + private String linkFormSids; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("文件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.java new file mode 100644 index 0000000000..74fe50d1c0 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotapply; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdFrockallotApplyMapper extends BaseMapper { + + AdFrockallotApplyDetailsVo details(String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml new file mode 100644 index 0000000000..dabc27612e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java new file mode 100644 index 0000000000..b14aaa162e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyService.java @@ -0,0 +1,300 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailDto; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailService; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailVo; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.*; +import com.yxt.anrui.oa.biz.oaform.flowable.*; +import com.yxt.anrui.oa.feign.file.OaFileEnum; +import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class AdFrockallotApplyService extends MybatisBaseService { + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + @Autowired + private AdFrockallotDetailService adFrockallotDetailService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdFrockallotApplyVo adFrockallotApplyVo = new AdFrockallotApplyVo(); + adFrockallotApplyVo.setCreateBySid(userSid); + adFrockallotApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adFrockallotApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdFrockallotApplyVo adFrockallotApplyVo = new AdFrockallotApplyVo(); + AdFrockallotApply adFrockallotApply = fetchBySid(sid); + if (adFrockallotApply == null) { + return rb.setMsg("该申请不存在"); + } +// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage()); + OaForm oaForm = oaFormService.fetchBySid(sid); + adFrockallotApplyVo.setTaskId(oaForm.getTaskId()); + adFrockallotApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adFrockallotApplyVo.setOrgSidPath(orgSidPath); + adFrockallotApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adFrockallotApply, adFrockallotApplyVo); + List list = adFrockallotDetailService.getUpdateInit(sid); + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + adFrockallotApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adFrockallotApplyVo.setAppes(appes); + adFrockallotApplyVo.setList(list); + adFrockallotApplyVo.setSid(sid); + return rb.success().setData(adFrockallotApplyVo); + } + + public ResultBean saveOrUpdateDto(AdFrockallotApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + List files = dto.getFiles(); + List appes = dto.getAppes(); + List list = dto.getList(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdFrockallotApply entity = new AdFrockallotApply(); + BeanUtil.copyProperties(dto, entity, "sid"); + + dto.setBillNo("GZDZPFSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); + + if (!resultBean.getSuccess()) { + return rb; + } + + entity.setFormSid(resultBean.getData()); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdFrockallotApply entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + adFrockallotDetailService.saveDetails(list, sid); + // 处理附件 + saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); + saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); + return rb.success().setData(sid); + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdFrockallotApplyDetailsVo adFrockallotApplyDetailsVo = baseMapper.details(sid); + if (adFrockallotApplyDetailsVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adFrockallotApplyDetailsVo.setFiles(files); + adFrockallotApplyDetailsVo.setAppes(appes); + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adFrockallotApplyDetailsVo); + return rb.success().setData(adFrockallotApplyDetailsVo); + } + + /** + * 提交 + * + * @param dto + * @return + */ + public ResultBean submit(AdFrockallotApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean stringResultBean = saveOrUpdateDto(dto); + if (!stringResultBean.getSuccess()) { + return rb.setMsg(stringResultBean.getData()); + } + String businessSid = stringResultBean.getData(); + + SubmitDto submitDto = new SubmitDto(); + submitDto.setUserSid(dto.getCreateBySid()); + submitDto.setBusinessSid(businessSid); + + Map formVariables = new HashMap<>(); + formVariables = getMap(formVariables, businessSid); + submitDto.setFormVariables(formVariables); + submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); + submitDto.setNextTaskId(dto.getTaskId()); + submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); + return oaFormService.submit(submitDto); + } + + /** + * 办理（同意） + * + * @param dto + * @return + */ + public ResultBean complete(CompleteDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); + BeanUtil.copyProperties(dto, businessVariablesDto); + return oaFormService.complete(businessVariablesDto); + } + + /** + * 驳回 + * + * @param dto + * @return + */ + public ResultBean reject(TaskDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + return oaFormService.reject(dto); + } + + public ResultBean getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 + ResultBean rb = ResultBean.fireFail(); + + // 获取next值和formVariables + int next = query.getNext(); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); + query.setFormVariables(formVariables); + + // 校验next参数是否有效（只允许0或1） + if (next != 0 && next != 1) { + return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息 + } + + // 获取节点名称 + String data = getNodeName(query, next); + + // 如果data为null，表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 + return rb.success().setData(data); + } + + /** + * 网关参数组成 + * + * @param formVariables + * @param sid + * @return + */ + public Map getMap(Map formVariables, String sid) { + Map appMap = new HashMap<>(); + appMap.put("sid", sid); + /*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid); + appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid); + appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle"); + appMap.put("agreeUrl", "oa/v1/HrHireApply/complete"); + appMap.put("stopUrl", "oa/v1/oaform/breakProcess"); + appMap.put("rejectUrl", "oa/v1/HrHireApply/reject"); + appMap.put("recallUrl", "oa/v1/oaform/revokeProcess"); + appMap.put("signUrl", "oa/v1/oaform/delegate"); + appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/ + appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl()); + appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl()); + appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl()); + appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl()); + appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl()); + formVariables.put("app", appMap); + //根据组织查询是否是分公司 + OaForm oaForm = oaFormService.fetchBySid(sid); + AdFrockallotApply adFrockallotApply = fetchBySid(sid); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData(); + //是否是分公司 + formVariables.put("isTrue", sysOrganization.getIsDept() == 0); + return formVariables; + } + + /** + * 根据next的值获取前一个节点或下一个节点的名称。 + * + * @param query 包含查询所需参数的NodeQuery对象 + * @param next 参数，0表示上一环节，1表示下一环节 + * @return 节点名称，如果失败则返回null + */ + private String getNodeName(NodeQuery query, int next) { + // 根据next值选择相应的服务方法获取节点信息 + ResultBean> resultBean = (next == 0) + ? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点 + : oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点 + // 如果服务调用成功 + if (resultBean.getSuccess()) { + // 清除结果列表中的null值，避免空节点 + resultBean.getData().removeAll(Collections.singleton(null)); + // 如果结果列表非空，返回第一个节点的名称 + if (!resultBean.getData().isEmpty()) { + return resultBean.getData().get(0).getName(); + } + } else { + // 如果服务调用失败，返回null + return null; + } + // 如果结果为空，返回null + return null; + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyVo.java new file mode 100644 index 0000000000..4e2aac3b2f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotapply; + + +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailVo; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; +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; + + +@Data +@ApiModel(value = "工装订制配发申请 视图数据对象", description = "工装订制配发申请 视图数据对象") +public class AdFrockallotApplyVo implements Vo { + + private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +// private String testPage; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java new file mode 100644 index 0000000000..80f0f6fe85 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetail.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotdetail; + +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; + + +@Data +@ApiModel(value = "工装订制配发列表", description = "工装订制配发列表") +@TableName("ad_frockallot_detail") +public class AdFrockallotDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java new file mode 100644 index 0000000000..4750539d04 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java @@ -0,0 +1,46 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotdetail; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + + +@Data +@ApiModel(value = "工装订制配发列表 数据传输对象", description = "工装订制配发列表 数据传输对象") +public class AdFrockallotDetailDto implements Dto { + + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java new file mode 100644 index 0000000000..ca5cb73c69 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotdetail; + +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.oa.biz.adpircarpuldetail.AdPircarpulDetail; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo; + +import java.util.List; + + +@Mapper +public interface AdFrockallotDetailMapper extends BaseMapper { + + List getUpdateInit(String sid); + + @Select("select * from ad_frockallot_detail where mainSid = #{mainSid}") + List selectByMainSid(String mainSid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.xml new file mode 100644 index 0000000000..284b2c3232 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java new file mode 100644 index 0000000000..6ac1817752 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotdetail; + +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.oa.biz.adpircarpuldetail.AdPircarpulDetail; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailDto; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetail; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailQuery; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailVo; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDetailsVo; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailDto; +import com.yxt.anrui.oa.api.adfrockallotdetail.AdFrockallotDetailFeign; + +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + + +@Service +public class AdFrockallotDetailService extends MybatisBaseService { + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdFrockallotDetail adFrockallotDetail = new AdFrockallotDetail(); + BeanUtil.copyProperties(details, adFrockallotDetail); + adFrockallotDetail.setMainSid(sid); + baseMapper.insert(adFrockallotDetail); + }); + } + } + + public List getUpdateInit(String sid) { + return baseMapper.getUpdateInit(sid); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java new file mode 100644 index 0000000000..27171062aa --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotdetail; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + + +@Data +@ApiModel(value = "工装订制配发列表 视图数据对象", description = "工装订制配发列表 视图数据对象") +public class AdFrockallotDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java new file mode 100644 index 0000000000..b5a5ff1ba5 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java @@ -0,0 +1,44 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adfrockallotdetail; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.math.BigDecimal; + +@Data +@ApiModel(value = "工装订制配发列表 视图数据对象", description = "工装订制配发列表 视图数据对象") +public class AdFrockallotListDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java index 6ebe5df68c..13abca2f35 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java @@ -31,28 +31,15 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(宿舍租赁)
- * File: AdLeasehostApply.java
- * Class: com.yxt.anrui.oa.api.adleasehostapply.AdLeasehostApply
- * Description: 宿舍租赁申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-17 14:11:50
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "宿舍租赁申请", description = "宿舍租赁申请") @TableName("ad_leasehost_apply") public class AdLeasehostApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("基础表单sid") + @ApiModelProperty("基础表单sid") private String formSid; // 基础表单sid - @ApiModelProperty("关联审批sid列表,英文逗号分隔") + @ApiModelProperty("关联审批sid列表,英文逗号分隔") private String linkFormSids; // 关联审批sid列表,英文逗号分隔 } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetail.java index 7e6a51e0d2..0ce2737bee 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetail.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetail.java @@ -33,19 +33,7 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetail.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail
- * Description: 驻外人员认定列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "办公用品领用列表", description = "办公用品领用列表") @TableName("ad_office_supplies_detail") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailDto.java index b4ddf66f26..966145bfa7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailDto.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailDto.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto
- * Description: 驻外人员认定列表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象") public class AdOfficeSuppliesDetailDto implements Dto { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailVo.java index 0754415071..0cd4b5491a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adofficesuppliesdetail/AdOfficeSuppliesDetailVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象") public class AdOfficeSuppliesDetailVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApply.java index bd7461b3d7..ca7091e116 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApply.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(办公场地租赁)
- * File: AdOffspaceApply.java
- * Class: com.yxt.anrui.oa.api.adoffspaceapply.AdOffspaceApply
- * Description: 办公场地租赁申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-18 11:50:51
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "办公场地租赁申请", description = "办公场地租赁申请") @TableName("ad_offspace_apply") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyDetailsVo.java index c4e97de8a5..83e118aa91 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspaceapply/AdOffspaceApplyDetailsVo.java @@ -37,19 +37,7 @@ import lombok.Data; import java.util.ArrayList; import java.util.List; -/** - * Project: yxt-oa(办公场地租赁)
- * File: AdOffspaceApplyVo.java
- * Class: com.yxt.anrui.oa.api.adoffspaceapply.AdOffspaceApplyVo
- * Description: 办公场地租赁申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-18 11:50:51
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "办公场地租赁申请 视图数据详情", description = "办公场地租赁申请 视图数据详情") public class AdOffspaceApplyDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceDetailDto.java index 4086216d30..a1b4b50f4b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceDetailDto.java @@ -34,19 +34,7 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-oa(办公场地租赁)
- * File: AdOffspaceDetailDto.java
- * Class: com.yxt.anrui.oa.api.adoffspacedetail.AdOffspaceDetailDto
- * Description: 办公场地租赁列表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-18 11:50:51
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "办公场地租赁列表 数据传输对象", description = "办公场地租赁列表 数据传输对象") public class AdOffspaceDetailDto implements Dto { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceListDetailVo.java index 582562be7d..e318df68b4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adoffspacedetail/AdOffspaceListDetailVo.java @@ -33,19 +33,7 @@ import lombok.Data; import java.math.BigDecimal; -/** - * Project: yxt-oa(办公场地租赁)
- * File: AdOffspaceDetailVo.java
- * Class: com.yxt.anrui.oa.api.adoffspacedetail.AdOffspaceDetailVo
- * Description: 办公场地租赁列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-18 11:50:51
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "办公场地租赁列表 视图数据对象", description = "办公场地租赁列表 视图数据对象") public class AdOffspaceListDetailVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApply.java new file mode 100644 index 0000000000..12a0aae842 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApply.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpulapply; + +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-oa(私车临时公用)
+ * File: AdPircarpulApply.java
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApply
+ * Description: 临时私车公用申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用申请", description = "临时私车公用申请") +@TableName("ad_pircarpul_apply") +public class AdPircarpulApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("基础表单sid") + private String formSid; // 基础表单sid + @ApiModelProperty("关联审批sid列表,英文逗号分隔") + private String linkFormSids; // 关联审批sid列表,英文逗号分隔 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDetailsVo.java new file mode 100644 index 0000000000..18707d9375 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDetailsVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpulapply; + + +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo; +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-oa(私车临时公用)
+ * File: AdPircarpulApplyVo.java
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo
+ * Description: 临时私车公用申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用申请 视图数据详情", description = "临时私车公用申请 视图数据详情") +public class AdPircarpulApplyDetailsVo implements Vo { + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDto.java new file mode 100644 index 0000000000..1956295671 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyDto.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpulapply; + + +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailDto; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailDto; +import com.yxt.anrui.oa.biz.oaform.OaFormDto; +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-oa(私车临时公用)
+ * File: AdPircarpulApplyDto.java
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyDto
+ * Description: 临时私车公用申请 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用申请 数据传输对象", description = "临时私车公用申请 数据传输对象") +public class AdPircarpulApplyDto extends OaFormDto { + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("基础表单sid") + private String formSid; + @ApiModelProperty("关联审批单") + private String linkFormSids; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("文件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java new file mode 100644 index 0000000000..c0eb75ee34 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpulapply; + +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.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApply; +import com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo; + +import java.util.List; + +/** + * Project: yxt-oa(私车临时公用)
+ * File: AdPircarpulApplyMapper.java
+ * Class: com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper
+ * Description: 临时私车公用申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AdPircarpulApplyMapper extends BaseMapper { + + AdPircarpulApplyDetailsVo details(String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml new file mode 100644 index 0000000000..e5ec32580c --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java new file mode 100644 index 0000000000..3e21d3c5b4 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyService.java @@ -0,0 +1,311 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpulapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailDto; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailService; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.*; +import com.yxt.anrui.oa.biz.oaform.flowable.*; +import com.yxt.anrui.oa.feign.file.OaFileEnum; +import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class AdPircarpulApplyService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + @Autowired + private AdPircarpulDetailService adPircarpulDetailService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdPircarpulApplyVo adPircarpulApplyVo = new AdPircarpulApplyVo(); + adPircarpulApplyVo.setCreateBySid(userSid); + adPircarpulApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adPircarpulApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdPircarpulApplyVo adPircarpulApplyVo = new AdPircarpulApplyVo(); + AdPircarpulApply adPircarpulApply = fetchBySid(sid); + if (adPircarpulApply == null) { + return rb.setMsg("该申请不存在"); + } +// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage()); + OaForm oaForm = oaFormService.fetchBySid(sid); + adPircarpulApplyVo.setTaskId(oaForm.getTaskId()); + adPircarpulApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adPircarpulApplyVo.setOrgSidPath(orgSidPath); + adPircarpulApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adPircarpulApply, adPircarpulApplyVo); + List list = adPircarpulDetailService.getUpdateInit(sid); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + FormCommon userObj = FormCommon.of(details.getUserKey(), details.getUserValue()); + details.setUserObj(userObj); + FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue()); + details.setDeptObj(deptObj); + FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue()); + details.setJobObj(jobObj); + }); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + adPircarpulApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adPircarpulApplyVo.setAppes(appes); + adPircarpulApplyVo.setList(list); + adPircarpulApplyVo.setSid(sid); + return rb.success().setData(adPircarpulApplyVo); + } + + public ResultBean saveOrUpdateDto(AdPircarpulApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + List files = dto.getFiles(); + List appes = dto.getAppes(); + List list = dto.getList(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdPircarpulApply entity = new AdPircarpulApply(); + BeanUtil.copyProperties(dto, entity, "sid"); + + dto.setBillNo("LSSCGYSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); + + if (!resultBean.getSuccess()) { + return rb; + } + + entity.setFormSid(resultBean.getData()); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdPircarpulApply entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + adPircarpulDetailService.saveDetails(list, sid); + // 处理附件 + saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); + saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); + return rb.success().setData(sid); + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdPircarpulApplyDetailsVo adPircarpulApplyDetailsVo = baseMapper.details(sid); + if (adPircarpulApplyDetailsVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adPircarpulApplyDetailsVo.setFiles(files); + adPircarpulApplyDetailsVo.setAppes(appes); + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adPircarpulApplyDetailsVo); + return rb.success().setData(adPircarpulApplyDetailsVo); + } + + /** + * 提交 + * + * @param dto + * @return + */ + public ResultBean submit(AdPircarpulApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean stringResultBean = saveOrUpdateDto(dto); + if (!stringResultBean.getSuccess()) { + return rb.setMsg(stringResultBean.getData()); + } + String businessSid = stringResultBean.getData(); + + SubmitDto submitDto = new SubmitDto(); + submitDto.setUserSid(dto.getCreateBySid()); + submitDto.setBusinessSid(businessSid); + + Map formVariables = new HashMap<>(); + formVariables = getMap(formVariables, businessSid); + submitDto.setFormVariables(formVariables); + submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); + submitDto.setNextTaskId(dto.getTaskId()); + submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); + return oaFormService.submit(submitDto); + } + + /** + * 办理（同意） + * + * @param dto + * @return + */ + public ResultBean complete(CompleteDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); + BeanUtil.copyProperties(dto, businessVariablesDto); + return oaFormService.complete(businessVariablesDto); + } + + /** + * 驳回 + * + * @param dto + * @return + */ + public ResultBean reject(TaskDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + return oaFormService.reject(dto); + } + + public ResultBean getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 + ResultBean rb = ResultBean.fireFail(); + + // 获取next值和formVariables + int next = query.getNext(); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); + query.setFormVariables(formVariables); + + // 校验next参数是否有效（只允许0或1） + if (next != 0 && next != 1) { + return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息 + } + + // 获取节点名称 + String data = getNodeName(query, next); + + // 如果data为null，表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 + return rb.success().setData(data); + } + + /** + * 网关参数组成 + * + * @param formVariables + * @param sid + * @return + */ + public Map getMap(Map formVariables, String sid) { + Map appMap = new HashMap<>(); + appMap.put("sid", sid); + /*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid); + appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid); + appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle"); + appMap.put("agreeUrl", "oa/v1/HrHireApply/complete"); + appMap.put("stopUrl", "oa/v1/oaform/breakProcess"); + appMap.put("rejectUrl", "oa/v1/HrHireApply/reject"); + appMap.put("recallUrl", "oa/v1/oaform/revokeProcess"); + appMap.put("signUrl", "oa/v1/oaform/delegate"); + appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/ + appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl()); + appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl()); + appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl()); + appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl()); + appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl()); + formVariables.put("app", appMap); + //根据组织查询是否是分公司 + OaForm oaForm = oaFormService.fetchBySid(sid); + AdPircarpulApply adPircarpulApply = fetchBySid(sid); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData(); + //是否是分公司 + formVariables.put("isTrue", sysOrganization.getIsDept() == 0); + return formVariables; + } + + /** + * 根据next的值获取前一个节点或下一个节点的名称。 + * + * @param query 包含查询所需参数的NodeQuery对象 + * @param next 参数，0表示上一环节，1表示下一环节 + * @return 节点名称，如果失败则返回null + */ + private String getNodeName(NodeQuery query, int next) { + // 根据next值选择相应的服务方法获取节点信息 + ResultBean> resultBean = (next == 0) + ? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点 + : oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点 + // 如果服务调用成功 + if (resultBean.getSuccess()) { + // 清除结果列表中的null值，避免空节点 + resultBean.getData().removeAll(Collections.singleton(null)); + // 如果结果列表非空，返回第一个节点的名称 + if (!resultBean.getData().isEmpty()) { + return resultBean.getData().get(0).getName(); + } + } else { + // 如果服务调用失败，返回null + return null; + } + // 如果结果为空，返回null + return null; + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyVo.java new file mode 100644 index 0000000000..33c96bdf54 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpulapply; + + +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo; +import com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo; +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-oa(私车临时公用)
+ * File: AdPircarpulApplyVo.java
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo
+ * Description: 临时私车公用申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用申请 视图数据对象", description = "临时私车公用申请 视图数据对象") +public class AdPircarpulApplyVo implements Vo { + + private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +// private String testPage; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java new file mode 100644 index 0000000000..062f12d806 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetail.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpuldetail; + +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; + + +@Data +@ApiModel(value = "临时私车公用列表", description = "临时私车公用列表") +@TableName("ad_pircarpul_detail") +public class AdPircarpulDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("人员sid") + private String userSid; // 人员sid + @ApiModelProperty("人员姓名") + private String userName; // 人员姓名 + @ApiModelProperty("部门sid") + private String deptSid; // 部门sid + @ApiModelProperty("部门名称") + private String deptName; // 部门名称 + @ApiModelProperty("岗位sid") + private String postSid; // 岗位sid + @ApiModelProperty("岗位名称") + private String postName; // 岗位名称 + @ApiModelProperty("用车事由") + private String reasonsForUsingVehicles; // 用车事由 + @ApiModelProperty("计划出发地址") + private String departureAddress; // 计划出发地址 + @ApiModelProperty("目的地地址") + private String destinationAddress; // 目的地地址 + @ApiModelProperty("计划出发时间") + private String departureTime; // 计划出发时间 + @ApiModelProperty("计划返回时间") + private String returnTime; // 计划返回时间 + @ApiModelProperty("车牌号") + private String plateNumber; // 车牌号 + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailDto.java new file mode 100644 index 0000000000..890b6a57de --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailDto.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpuldetail; + + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-oa(私车临时公用)
+ * File: AdPircarpulDetailDto.java
+ * Class: com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDto
+ * Description: 临时私车公用列表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用列表 数据传输对象", description = "临时私车公用列表 数据传输对象") +public class AdPircarpulDetailDto implements Dto { + + @ApiModelProperty("人员") + private FormCommon userObj; + private String userKey; + private String userValue; + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("岗位") + private FormCommon jobObj; + private String jobKey; + private String jobValue; + @ApiModelProperty("用车事由") + private String reasonsForUsingVehicles; // 用车事由 + @ApiModelProperty("计划出发地址") + private String departureAddress; // 计划出发地址 + @ApiModelProperty("目的地地址") + private String destinationAddress; // 目的地地址 + @ApiModelProperty("计划出发时间") + private String departureTime; // 计划出发时间 + @ApiModelProperty("计划返回时间") + private String returnTime; // 计划返回时间 + @ApiModelProperty("车牌号") + private String plateNumber; // 车牌号 + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java new file mode 100644 index 0000000000..ef614b36d3 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpuldetail; + +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.oa.biz.adleasehostdetail.AdLeasehostDetail; +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetail; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo; + +import java.util.List; + +/** + * Project: yxt-oa(私车临时公用)
+ * File: AdPircarpulDetailMapper.java
+ * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper
+ * Description: 临时私车公用列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AdPircarpulDetailMapper extends BaseMapper { + + List getUpdateInit(String sid); + + @Select("select * from ad_pircarpul_detail where mainSid = #{mainSid}") + List selectByMainSid(String mainSid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.xml new file mode 100644 index 0000000000..cb38b88310 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java new file mode 100644 index 0000000000..ca8ed81fd9 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java @@ -0,0 +1,91 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpuldetail; + +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.oa.biz.adleasehostdetail.AdLeasehostDetail; +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailDto; +import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetail; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailQuery; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDetailsVo; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDto; +import com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailFeign; + +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * Project: yxt-oa(私车临时公用)
+ * File: AdPircarpulDetailService.java
+ * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailService
+ * Description: 临时私车公用列表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AdPircarpulDetailService extends MybatisBaseService { + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdPircarpulDetail adPircarpulDetail = new AdPircarpulDetail(); + BeanUtil.copyProperties(details, adPircarpulDetail); + adPircarpulDetail.setMainSid(sid); + baseMapper.insert(adPircarpulDetail); + }); + } + } + + public List getUpdateInit(String sid) { + return baseMapper.getUpdateInit(sid); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailVo.java new file mode 100644 index 0000000000..7bce796c21 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpuldetail; + + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-oa(私车临时公用)
+ * File: AdPircarpulDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo
+ * Description: 临时私车公用列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用列表 视图数据对象", description = "临时私车公用列表 视图数据对象") +public class AdPircarpulDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("人员") + private FormCommon userObj; + private String userKey; + private String userValue; + @ApiModelProperty("部门") + private FormCommon deptObj; + private String deptKey; + private String deptValue; + @ApiModelProperty("岗位") + private FormCommon jobObj; + private String jobKey; + private String jobValue; + @ApiModelProperty("用车事由") + private String reasonsForUsingVehicles; // 用车事由 + @ApiModelProperty("计划出发地址") + private String departureAddress; // 计划出发地址 + @ApiModelProperty("目的地地址") + private String destinationAddress; // 目的地地址 + @ApiModelProperty("计划出发时间") + private String departureTime; // 计划出发时间 + @ApiModelProperty("计划返回时间") + private String returnTime; // 计划返回时间 + @ApiModelProperty("车牌号") + private String plateNumber; // 车牌号 + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulListDetailVo.java new file mode 100644 index 0000000000..bd03c5b3d6 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulListDetailVo.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpircarpuldetail; + + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-oa(私车临时公用)
+ * File: AdPircarpulDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailVo
+ * Description: 临时私车公用列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-20 09:42:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "临时私车公用列表 视图数据对象", description = "临时私车公用列表 视图数据对象") +public class AdPircarpulListDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("人员") + private String userValue; + @ApiModelProperty("部门") + private String deptValue; + @ApiModelProperty("岗位") + private String jobValue; + @ApiModelProperty("用车事由") + private String reasonsForUsingVehicles; // 用车事由 + @ApiModelProperty("计划出发地址") + private String departureAddress; // 计划出发地址 + @ApiModelProperty("目的地地址") + private String destinationAddress; // 目的地地址 + @ApiModelProperty("计划出发时间") + private String departureTime; // 计划出发时间 + @ApiModelProperty("计划返回时间") + private String returnTime; // 计划返回时间 + @ApiModelProperty("车牌号") + private String plateNumber; // 车牌号 + @ApiModelProperty("预计费用") + private BigDecimal expectCost; // 预计费用 + @ApiModelProperty("费用明细") + private String costRemarks; // 费用明细 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java index 319c7a7c9b..b4b196df51 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") public class AdPurchaseAssetDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java index fa087d3f4c..89196ff072 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") public class AdPurchaseAssetListDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetdetails/AdReimbursedAssetListDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetdetails/AdReimbursedAssetListDetailsVo.java index 67f7944cd6..0c2ae52a54 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetdetails/AdReimbursedAssetListDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adreimbursedassetdetails/AdReimbursedAssetListDetailsVo.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(认定人员)
- * File: AdExpatriatesDetailVo.java
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
- * Description: 驻外人员认定列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-01-20 15:35:08
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "固定资产费用报销列表 视图数据对象", description = "固定资产费用报销列表 视图数据对象") public class AdReimbursedAssetListDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.java index 1d8d6fde92..ec80dcae68 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyMapper.java @@ -32,19 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireApplyMapper.java
- * Class: com.yxt.anrui.oa.biz.oahireapply.OaHireApplyMapper
- * Description: 招聘需求申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Mapper public interface OaHireApplyMapper extends BaseMapper { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyQuery.java index 23d65709e3..3ea574f9a9 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyQuery.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApplyQuery.java @@ -34,19 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireApplyQuery.java
- * Class: com.yxt.anrui.oa.api.oahireapply.OaHireApplyQuery
- * Description: 招聘需求申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "招聘需求申请 查询条件", description = "招聘需求申请 查询条件") public class OaHireApplyQuery implements Query { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetails.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetails.java index fa05c44c9e..5d5b9b82e5 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetails.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetails.java @@ -31,19 +31,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireDetails.java
- * Class: com.yxt.anrui.oa.api.oahiredetails.OaHireDetails
- * Description: 招聘需求明细.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "招聘需求明细", description = "招聘需求明细") @TableName("oa_hire_details") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsDetailsVo.java index 1b8de6f594..49c676edc8 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsDetailsVo.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireDetailsVo.java
- * Class: com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo
- * Description: 招聘需求明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "招聘需求明细 视图数据详情", description = "招聘需求明细 视图数据详情") public class OaHireDetailsDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsFeign.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsFeign.java index c0c498b6a2..6ec6dce15c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsFeign.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsFeign.java @@ -35,19 +35,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireDetailsFeign.java
- * Class: com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsFeign
- * Description: 招聘需求明细.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Api(tags = "招聘需求明细") @FeignClient( contextId = "yxt-oa-OaHireDetails", diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsQuery.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsQuery.java index ccb6615f67..138323da26 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsQuery.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsQuery.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireDetailsQuery.java
- * Class: com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsQuery
- * Description: 招聘需求明细 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "招聘需求明细 查询条件", description = "招聘需求明细 查询条件") public class OaHireDetailsQuery implements Query { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsVo.java index 77bc6ebfdc..9f5c8e4a0f 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsVo.java @@ -32,19 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(招聘需求)
- * File: OaHireDetailsVo.java
- * Class: com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo
- * Description: 招聘需求明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-05 11:51:52
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "招聘需求明细 视图数据对象", description = "招聘需求明细 视图数据对象") public class OaHireDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDetailsVo.java index aa6689c409..3854682613 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDetailsVo.java @@ -38,19 +38,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情") public class OaLeaveApplyDetailsVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDto.java index 370e06f272..adb4d4a72b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyDto.java @@ -38,19 +38,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyDto.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyDto
- * Description: 请假申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 数据传输对象", description = "请假申请 数据传输对象") public class OaLeaveApplyDto implements Dto { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyInitVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyInitVo.java index fb4471ca4e..43d20182c0 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyInitVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyInitVo.java @@ -36,19 +36,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情") public class OaLeaveApplyInitVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyVo.java index da11384b42..f331b6eb66 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApplyVo.java @@ -34,19 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(请假申请)
- * File: OaLeaveApplyVo.java
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo
- * Description: 请假申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-11-28 15:24:37
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "请假申请 视图数据对象", description = "请假申请 视图数据对象") public class OaLeaveApplyVo implements Vo { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java index 1d569d72df..6bd07c59b6 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java @@ -38,19 +38,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.data.annotation.Transient; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApply.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApply
- * Description: 补卡申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请", description = "补卡申请") @TableName("oa_mend_apply") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java index 7b9bc25510..ff42acf0aa 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java @@ -39,19 +39,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyDto.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyDto
- * Description: 补卡申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象") public class OaMendApplyDto extends OaFormDto { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java index 7a2b963d2c..5343ca6756 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java @@ -38,19 +38,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(补卡申请)
- * File: OaMendApplyVo.java
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo
- * Description: 补卡申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-04 14:14:34
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ + @Data @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象") public class OaMendApplyVo implements Vo {