Merge remote-tracking branch 'origin/master'

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(安瑞基础信息) <br/>
- * File: BaseDataList.java <br/>
- * Class: com.yxt.anrui.base.api.basedatalist.BaseDataList <br/>
- * Description: 资料清单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-02-26 09:59:29 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "附件清单", description = "附件清单")
 @TableName("base_files")
 @Data

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java

@@ -100,4 +100,9 @@ public interface BasePurchaseSystemFeign {
     @GetMapping("/fetchDetailsByUseOrgPath")
     @ResponseBody
     public ResultBean<List<AppBasePurchSystemVo>> fetchDetailsByUseOrgPath(@RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("根据采购系统名称查询采购系统sid")
+    @GetMapping("/selByPurchaseSystemName")
+    @ResponseBody
+    public ResultBean<String> selByPurchaseSystemName(@RequestParam("purchaseSystemName") String purchaseSystemName, @RequestParam("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java

@@ -121,4 +121,8 @@ public interface BaseVehicleBrandFeign {
     @ApiOperation("根据品牌sid获取品牌信息")
     @GetMapping("/fetchBySid/{sid}")
     BaseVehicleBrand fetchBySid(@RequestParam("sid") String sid);
+
+    @ApiOperation("根据品牌名称获取品牌sid")
+    @GetMapping("/selByBrandName")
+    ResultBean<String> selByBrandName(@RequestParam("brandName") String brandName);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java

@@ -83,4 +83,7 @@ public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem>
 
     @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);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java

@@ -36,21 +36,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-base(采购系统管理) <br/>
- * File: BasePurchaseSystemFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemRest <br/>
- * Description: 采购系统管理表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-01-06 09:27:28 <br/>
- *
- * @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 {
 
@@ -115,4 +102,9 @@ public class BasePurchaseSystemRest implements BasePurchaseSystemFeign {
     public ResultBean<List<AppBasePurchSystemVo>> fetchDetailsByUseOrgPath(String orgPath) {
         return basePurchaseSystemService.fetchDetailsByUseOrgPath(orgPath);
     }
+
+    @Override
+    public ResultBean<String> selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) {
+        return basePurchaseSystemService.selByPurchaseSystemName(purchaseSystemName, useOrgSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java

@@ -162,4 +162,10 @@ public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSy
         baseMapper.maintenance(sid, shareProportion);
         return rb.success();
     }
+
+    public ResultBean<String> selByPurchaseSystemName(String purchaseSystemName, String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String purchaseSystemSid = baseMapper.selByPurchaseSystemName(purchaseSystemName, useOrgSid);
+        return rb.success().setData(purchaseSystemSid);
+    }
 }

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<BaseVehicleBrand> {
     String selectByManufacturerSid(@Param("carBrandSid") String carBrandSid);
 
     List<BaseVehicleBrand> selectByUseOrgSid(String sid);
+
+    @Select("select sid from base_vehicle_brand where brandName=#{brandName}")
+    String selByBrandName(String brandName);
 }

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<String> selByBrandName(String brandName) {
+        return baseVehicleBrandService.selByBrandName(brandName);
+    }
 }

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<BaseVehicleBrand
     public List<BaseVehicleBrand> selectByUseOrgSid(String sid) {
         return baseMapper.selectByUseOrgSid(sid);
     }
+
+    public ResultBean<String> selByBrandName(String brandName) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = baseMapper.selByBrandName(brandName);
+        return rb.success().setData(sid);
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/OrgDeptObjVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class OrgDeptObjVo {
+
+
+    private String id;
+    private String dictValue;
+
+    private Map<String, Object> extra;
+
+    // 静态方法，直接通过方法创建对象并赋值
+    public static OrgDeptObjVo of(String id, String dictValue) {
+        OrgDeptObjVo formCommon = new OrgDeptObjVo();
+        formCommon.setId(id);
+        formCommon.setDictValue(dictValue);
+        return formCommon;
+    }
+
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -245,4 +245,11 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("根据组织全路径查询该组织下的所有部门")
     ResultBean<List<OrgDeptVo>> getAllDept(@RequestParam("orgPath") String orgPath);
+
+    @GetMapping("/getAllDeptObj")
+    @ResponseBody
+    @ApiOperation("根据组织全路径查询该组织下的所有部门返回app下拉选格式")
+    ResultBean<List<OrgDeptObjVo>> getAllDeptObj(@RequestParam(value = "orgPath", required = false) String orgPath,
+                                           @RequestParam(value = "userSid", required = false) String userSid,
+                                           @RequestParam(value = "name", required = false) String name);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -251,4 +251,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<OrgDeptVo>> getAllDept(String orgPath) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<OrgDeptObjVo>> getAllDeptObj(String orgPath, String userSid, String name) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -532,4 +532,20 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     public ResultBean<List<OrgDeptVo>> getAllDept(String orgPath) {
         return sysOrganizationService.getAllDept(orgPath);
     }
+
+    @Override
+    public ResultBean<List<OrgDeptObjVo>> getAllDeptObj(String orgPath, String userSid, String name) {
+        ResultBean rb = ResultBean.fireFail();
+        List<OrgDeptObjVo> list = new ArrayList<>();
+        List<OrgDeptVo> deptVos = sysOrganizationService.getAllDept(orgPath).getData();
+        if (!deptVos.isEmpty()) {
+            for (OrgDeptVo deptVo : deptVos) {
+                OrgDeptObjVo objVo = new OrgDeptObjVo();
+                objVo.setId(deptVo.getSid());
+                objVo.setDictValue(deptVo.getName());
+                list.add(objVo);
+            }
+        }
+        return rb.success().setData(list);
+    }
 }

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

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

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(专项返利管理) <br/>
- * File: ScmSpecialRebateDto.java <br/>
- * Class: com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDto <br/>
- * Description: 专项返利表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-09-08 16:11:43 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "专项返利表 数据传输对象", description = "专项返利表 数据传输对象")
 public class ScmSpecialRebateDto implements Dto {
@@ -55,6 +39,8 @@ public class ScmSpecialRebateDto implements Dto {
 
     @ApiModelProperty("状态")
     private String state; // 状态
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("品牌sid")

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<PagerVo<ScmStayDisRebateVo>> stayDisRebate(@RequestBody PagerQuery<ScmSpecialRebateQuery> 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);

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

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<ExcelInfo> infos = new ArrayList<>();
+}

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(进销存) <br/>
- * File: ScmWarehouse.java <br/>
- * Class: com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse <br/>
- * Description: 仓库. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-01-05 15:42:47 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "仓库", description = "仓库")
 @TableName("scm_warehouse")
 @Data

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<DownloadExcelVo> 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) {
         //得到所有要导出的数据

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<ScmSpecialRebate
     @Autowired
     private ScmSpecialrebateVehsService scmSpecialrebateVehsService;
     @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private BaseVehicleBrandFeign baseVehicleBrandFeign;
+    @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
     HttpServletResponse response;
@@ -76,6 +87,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
     private DictCommonFeign dictCommonFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public PagerVo<ScmSpecialRebateVo> listPageVo(PagerQuery<ScmSpecialRebateQuery> pq) {
         ScmSpecialRebateQuery query = pq.getParams();
@@ -231,6 +244,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.eq("palceGenDate", dto.getPalceGenDate());
         qw.eq("purchaseSystemSid", dto.getPurchaseSystemSid());
         qw.eq("brandSid", dto.getBrandSid());
+        qw.eq("remarks",dto.getRemarks());
         if (StringUtils.isBlank(dtoSid)) {
             int i = baseMapper.checkSave(qw);
             if (i > 0) {
@@ -621,6 +635,297 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         return p;
     }
 
+    public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException {
+        ResultBean rb = ResultBean.fireFail();
+        String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
+        File tempFile = new File(temp);
+        if (!tempFile.exists()) {
+            tempFile.mkdirs();
+        }
+        String fileName = file.getOriginalFilename();
+        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            return rb.fail().setMsg("上传文件不正确");
+        }
+
+        int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+        boolean isExcel2003 = true;
+        if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            isExcel2003 = false;
+        }
+        InputStream is = file.getInputStream();
+        Workbook wb = null;
+        if (isExcel2003) {
+            wb = new HSSFWorkbook(is);
+        } else {
+            wb = new XSSFWorkbook(is);
+        }
+        Sheet sheet = wb.getSheetAt(0);
+        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        SpecialRebateExcelInfo importReturn = getSheetVal(sheet, resultCell, createOrgSid);
+        if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
+            return rb.setMsg(importReturn.getCheckInfo());
+        } else {
+            List<ExcelInfo> 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<ExcelInfo> importVoList = new ArrayList<>();
+        Set<String> 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<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getUploadDate())) {
+                if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     checkWord.add("上传日期不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) {
+                    checkWord.add("上传金额不能为空");
+                    break;
+                }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
                     String uploadDate = "";
                     if (isNumber(excelInfo.getUploadDate())) {
@@ -925,10 +1234,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getUploadMoney())) {
-                    checkWord.add("上传金额不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -938,10 +1243,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getStayDetermineMoney())) {
-                    checkWord.add("待确定金额不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -951,10 +1252,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceItureCost())) {
-                    checkWord.add("其中支出费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getOnceItureCost())) {
                     String onceItureCost = excelInfo.getOnceItureCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -964,10 +1261,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceTreatCost())) {
-                    checkWord.add("其中待支付费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
                     String onceTreatCost = excelInfo.getOnceTreatCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -977,10 +1270,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceSuppCost())) {
-                    checkWord.add("其中抵顶费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
                     String onceSuppCost = excelInfo.getOnceSuppCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1456,10 +1745,14 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getUploadDate())) {
+                if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     checkWord.add("二次上传日期不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
+                    checkWord.add("二次上传金额不能为空");
+                    break;
+                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
                     String secondaryUploadDate = "";
                     if (isNumber(excelInfo.getSecondaryUploadDate())) {
@@ -1477,10 +1770,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
-                    checkWord.add("二次上传金额不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1499,10 +1788,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondTreatCost())) {
-                    checkWord.add("其中待支付费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
                     String secondTreatCost = excelInfo.getSecondTreatCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1512,10 +1797,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondSuppCost())) {
-                    checkWord.add("其中抵顶费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
                     String secondSuppCost = excelInfo.getSecondSuppCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");

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<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getUploadDate())) {
+                if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     checkWord.add("上传日期不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) {
+                    checkWord.add("上传金额不能为空");
+                    break;
+                }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
                     String uploadDate = "";
                     if (isNumber(excelInfo.getUploadDate())) {
@@ -1506,10 +1510,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getUploadMoney())) {
-                    checkWord.add("上传金额不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1519,10 +1519,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getStayDetermineMoney())) {
-                    checkWord.add("待确定金额不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1532,10 +1528,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceTreatCost())) {
-                    checkWord.add("待支付费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
                     String onceTreatCost = excelInfo.getOnceTreatCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1545,10 +1537,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceSuppCost())) {
-                    checkWord.add("抵顶费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
                     String onceSuppCost = excelInfo.getOnceSuppCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -1997,10 +1985,14 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getUploadDate())) {
+                if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     checkWord.add("二次上传日期不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
+                    checkWord.add("二次上传金额不能为空");
+                    break;
+                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
                     String secondaryUploadDate = "";
                     if (isNumber(excelInfo.getSecondaryUploadDate())) {
@@ -2018,10 +2010,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
-                    checkWord.add("二次上传金额不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -2031,10 +2019,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondTreatCost())) {
-                    checkWord.add("待支付费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
                     String secondTreatCost = excelInfo.getSecondTreatCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
@@ -2044,10 +2028,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondSuppCost())) {
-                    checkWord.add("抵顶费费用不能为空");
-                    break;
-                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
                     String secondSuppCost = excelInfo.getSecondSuppCost();
                     Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js

@@ -53,5 +53,14 @@ export default {
       responseType: 'blob', // 表明返回服务器返回的数据类型
       headers: { 'Content-Type': 'application/json' }
     })
+  },
+  // 下载模板
+  downloadExcel: function() {
+    return request({
+      url: '/scm/v1/scmspecialrebate/downloadExcel',
+      method: 'post',
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: { 'Content-Type': 'application/json' }
+    })
   }
 }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@@ -90,7 +90,7 @@
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
             <el-table-column prop="expectCost" label="其中预计费用" align="center" width="160" />
             <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
-            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" width="120" />
             <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />
             <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="120" />

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

@@ -75,7 +75,7 @@
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
             <el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
             <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
-            <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" width="120" />
             <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />
             <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
@@ -97,6 +97,43 @@
     </div>
     <specialrebatemanagementAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <specialrebatemanagementInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
+    <el-dialog :visible.sync="dialogVisible" width="70%" :show-close="false">
+      <div>
+        <el-button style="font-weight: bold" size="small" type="text" @click="downLoad">下载专项返利模板</el-button>
+      </div>
+      <el-card class="box-card">
+        <div>
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            accept=".xls"
+            name="file"
+            :action="updateAction"
+            :on-success="handleSuccess"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            :auto-upload="false"
+            :multiple="false"
+            :limit="1"
+            :data="uploadData"
+            :headers="headers"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
+          </el-upload>
+        </div>
+        <div>
+          <h3>文件上传结果</h3>
+          <el-card class="box-card">
+            <div>{{ uploadResultMesssage }}</div>
+          </el-card>
+        </div>
+      </el-card>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -129,6 +166,13 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'Import',
+          btnKey: 'doImport',
+          btnLabel: '导入'
+        },
         {
           type: 'success',
           size: 'small',
@@ -211,7 +255,19 @@ export default {
         size: 5,
         total: 0
       },
-      rules: {}
+      rules: {},
+      dialogVisible: false,
+      updateAction: process.env.VUE_APP_BASE_API + '/scm/v1/scmspecialrebate/getExcelInfo',
+      fileList: [],
+      uploadResultMesssage: '',
+      uploadData: {
+        sid: '',
+        userSid: '',
+        orgPath: ''
+      },
+      headers: {
+        token: window.sessionStorage.getItem('token')
+      }
     }
   },
   created() {
@@ -250,6 +306,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
+        case 'doImport':
+          this.doImport()
+          break
         case 'doExport':
           this.doExport()
           break
@@ -370,6 +429,63 @@ export default {
       }).catch(() => {
       })
     },
+    doImport() {
+      this.dialogVisible = true
+      this.fileList = []
+      this.uploadResultMesssage = ''
+    },
+    downLoad() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.downloadExcel().then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '专项返利模版' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'none'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    handleRemove() {
+      this.uploadResultMesssage = ''
+    },
+    submitUpload() {
+      this.uploadData.userSid = window.sessionStorage.getItem('userSid')
+      this.uploadData.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.$refs.upload.submit()
+    },
+    handleSuccess(resp, file, fileList) {
+      const _this = this
+      if (resp.success) {
+        _this.uploadResultMesssage = resp.msg
+      } else {
+        _this.uploadResultMesssage = resp.msg
+      }
+    },
+    handleConfirm() {
+      if (this.uploadResultMesssage === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先上传专项返利模版' })
+        return
+      } else {
+        this.dialogVisible = false
+        this.uploadData.userSid = ''
+        this.uploadData.orgPath = ''
+        this.getList()
+      }
+    },
     doExport() {
       const loading = this.$loading({
         lock: true,

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/leaveapply/AppLeaveApplyDetailsVo.java

@@ -36,19 +36,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: yxt-oa(请假申请) <br/>
- * File: OaLeaveApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo <br/>
- * Description: 请假申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-11-28 15:24:37 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情")
 public class AppLeaveApplyDetailsVo implements Vo {

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(请假申请) <br/>
- * File: OaLeaveApplyDto.java <br/>
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyDto <br/>
- * Description: 请假申请 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-11-28 15:24:37 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "请假申请 数据传输对象", description = "请假申请 数据传输对象")
 public class AppLeaveApplyDto implements Dto {

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(请假申请) <br/>
- * File: OaLeaveApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo <br/>
- * Description: 请假申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-11-28 15:24:37 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情")
 public class AppLeaveApplyInitVo implements Vo {

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(补卡申请) <br/>
- * File: OaMendApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo <br/>
- * Description: 补卡申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情")
 public class AppMendApplyDetailsVo implements Vo {

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(补卡申请) <br/>
- * File: OaMendApplyDto.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyDto <br/>
- * Description: 补卡申请 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
 public class AppMendApplyDto implements Dto {

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(补卡申请) <br/>
- * File: OaMendApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo <br/>
- * Description: 补卡申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象")
 public class AppMendApplyInitVo implements Vo {

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(请假申请) <br/>
- * File: OaLeaveApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo <br/>
- * Description: 请假申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-11-28 15:24:37 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情")
 public class OaLeaveApplyDetailsVo implements Vo {

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(请假申请) <br/>
- * File: OaLeaveApplyDto.java <br/>
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyDto <br/>
- * Description: 请假申请 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-11-28 15:24:37 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "请假申请 数据传输对象", description = "请假申请 数据传输对象")
 public class OaLeaveApplyDto implements Dto {

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(请假申请) <br/>
- * File: OaLeaveApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oaleaveapply.OaLeaveApplyVo <br/>
- * Description: 请假申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-11-28 15:24:37 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "请假申请 视图数据详情", description = "请假申请 视图数据详情")
 public class OaLeaveApplyInitVo implements Vo {

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(补卡申请) <br/>
- * File: OaMendApply.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApply <br/>
- * Description: 补卡申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请", description = "补卡申请")
 @TableName("oa_mend_apply")

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(补卡申请) <br/>
- * File: OaMendApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo <br/>
- * Description: 补卡申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情")
 public class OaMendApplyDetailsVo extends OaLeaveApplyDetailsVo implements Vo {

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(补卡申请) <br/>
- * File: OaMendApplyDto.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyDto <br/>
- * Description: 补卡申请 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
 public class OaMendApplyDto implements Dto {

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(补卡申请) <br/>
- * File: OaMendApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.oamendapply.OaMendApplyVo <br/>
- * Description: 补卡申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-12-04 14:14:34 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象")
 public class OaMendApplyInitVo implements Vo {

yxt-as-ui/src/views/storage/inventory/inventory.vue

@@ -35,7 +35,7 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.firstInEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
-              <el-form-item label="库龄">
+              <el-form-item label="库龄>">
                 <el-input v-model="listQuery.params.dateAge" placeholder="" clearable/>
               </el-form-item>
             </el-form>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@@ -65,7 +65,7 @@
         spu.sid as goodsSpuSid,
         sku.title goodsSpuName,
         sku.goodsSkuCode,
-        sku.indexes,
+        sku.own_spec as indexes,
         spu.goodsUnitName,
         spu.manufacturerSid,
         spu.manufacturerName
@@ -83,7 +83,7 @@
         sku.title AS goodsSkuTitle,
         sku.goodsSkuCode,
         spu.goodsUnitName AS unit,
-        sku.indexes AS goodsSkuOwnSpec,
+        sku.own_spec AS goodsSkuOwnSpec,
         spu.manufacturerSid,
         spu.manufacturerName
         from base_goods_sku sku

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -51,7 +51,7 @@ WHERE
         p.barCode,
         p.goodsUnitName,
         t.goodsTypeName,
-        k.indexes,
+        k.own_spec as indexes,
         p.shelfLife,
         b.brandName,
         m.manufacturerName,

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -320,7 +320,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                     skuUpdate.setGoodsSkuCode(dto.getGoodsCode());
                 }
                 if (StringUtils.isNotBlank(dto.getIndexes())) {
-                    skuUpdate.setIndexes(dto.getIndexes());
+//                    skuUpdate.setIndexes(dto.getIndexes());
+                    skuUpdate.setOwnSpec(dto.getIndexes());
                 }
                 skuUpdate.setModifyTime(new Date());
                 baseGoodsSkuService.updateById(skuUpdate);
@@ -395,7 +396,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                     sku.setGoodsSkuCode(dto.getGoodsCode());
                 }
                 if (StringUtils.isNotBlank(dto.getIndexes())) {
-                    sku.setIndexes(dto.getIndexes());
+//                    sku.setIndexes(dto.getIndexes());
+                    sku.setOwnSpec(dto.getIndexes());
                 }
                 baseGoodsSkuService.insert(sku);
                 //商品sku_extend
@@ -523,8 +525,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         }
         BaseGoodsSku sku = baseGoodsSkuService.getOneBySpuSid(sid);
         if (null != sku) {
-            if (StringUtils.isNotBlank(sku.getIndexes())) {
-                vo.setIndexes(sku.getIndexes());
+            if (StringUtils.isNotBlank(sku.getOwnSpec())) {
+                vo.setIndexes(sku.getOwnSpec());
             }
             BaseGoodsSkuExtend skuExtend = baseGoodsSkuExtendService.getOneBySKuSid(sku.getSid());
             if (null != skuExtend) {
@@ -618,8 +620,8 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                 //商品sku
                 BaseGoodsSku skuUpdate = baseGoodsSkuService.getOneBySpuSid(details.getSid());
                 if (null != skuUpdate) {
-                    if (StringUtils.isNotBlank(skuUpdate.getIndexes())) {
-                        extra.put("goodsSkuOwnSpec", skuUpdate.getIndexes());
+                    if (StringUtils.isNotBlank(skuUpdate.getOwnSpec())) {
+                        extra.put("goodsSkuOwnSpec", skuUpdate.getOwnSpec());
                     }
                 }
                 if (StringUtils.isNotBlank(details.getGoodsUnitName())) {

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<AdFrockallotApplyVo> getInit(
+			@PathVariable(value = "sid", required = false) String sid,
+			@RequestParam(value = "userSid", required = false) String userSid,
+			@RequestParam(value = "orgPath", required = false) String orgPath) {
+		ResultBean<AdFrockallotApplyVo> 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<AdPircarpulApplyDetailsVo> 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<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+		return adFrockallotApplyService.getFlowOperateTitle(query);
+	}
+}

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

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<AdPircarpulApplyVo> getInit(
+			@PathVariable(value = "sid", required = false) String sid,
+			@RequestParam(value = "userSid", required = false) String userSid,
+			@RequestParam(value = "orgPath", required = false) String orgPath) {
+		ResultBean<AdPircarpulApplyVo> 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<AdPircarpulApplyDetailsVo> 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<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+		return adPircarpulApplyService.getFlowOperateTitle(query);
+	}
+}

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

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPurchaseAssetApplyRest.java

@@ -4,6 +4,7 @@ import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyDetailVo;
 import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyDto;
 import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyService;
 import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyVo;
+import com.yxt.anrui.oa.biz.adreimbursedassetdetails.AssetObjVo;
 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;
@@ -14,6 +15,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @RestController
 @RequestMapping("v1/AdPurchaseAssetApply")
@@ -88,5 +90,14 @@ public class AdPurchaseAssetApplyRest {
         return adPurchaseAssetApplyService.getFlowOperateTitle(query);
     }
 
+    @GetMapping("/getPurchaseAssetList")
+    @ResponseBody
+    @ApiOperation("查询固定资产采购申请列表")
+    ResultBean<List<AssetObjVo>> getPurchaseAssetList(@RequestParam(value = "orgPath", required = false) String orgPath,
+                                               @RequestParam(value = "userSid", required = false) String userSid,
+                                               @RequestParam(value = "name", required = false) String name) {
+        return adPurchaseAssetApplyService.getPurchaseAssetList(orgPath,userSid,name);
+    }
+
 
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdReimbursedAssetApplyRest.java

@@ -0,0 +1,92 @@
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.adreimbursedassetapply.AdReimbursedAssetApplyDetailVo;
+import com.yxt.anrui.oa.biz.adreimbursedassetapply.AdReimbursedAssetApplyDto;
+import com.yxt.anrui.oa.biz.adreimbursedassetapply.AdReimbursedAssetApplyService;
+import com.yxt.anrui.oa.biz.adreimbursedassetapply.AdReimbursedAssetApplyVo;
+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.result.ResultBean;
+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;
+
+@RestController
+@RequestMapping("v1/AdReimbursedAssetApply")
+public class AdReimbursedAssetApplyRest {
+
+
+    @Autowired
+    private AdReimbursedAssetApplyService adReimbursedAssetApplyService;
+
+    @ApiOperation("初始化（新增或修改）")
+    @GetMapping({"/getInit", "/getInit/{sid}"})
+    public ResultBean<AdReimbursedAssetApplyVo> getInit(
+            @PathVariable(value = "sid", required = false) String sid,
+            @RequestParam(value = "userSid", required = false) String userSid,
+            @RequestParam(value = "orgPath", required = false) String orgPath) {
+        ResultBean<AdReimbursedAssetApplyVo> rb = ResultBean.fireFail();
+        if (sid == null || sid.isEmpty()) {
+            // 执行新增初始化
+            if (userSid == null || orgPath == null) {
+                return rb.setMsg("userSid和orgPath不能为空");
+            }
+            return adReimbursedAssetApplyService.getSaveInit(userSid, orgPath);
+        } else {
+            // 执行修改初始化
+            return adReimbursedAssetApplyService.getUpdateInit(sid);
+        }
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AdReimbursedAssetApplyDto dto) {
+        return adReimbursedAssetApplyService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        adReimbursedAssetApplyService.delAll(sids);
+        return rb.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/details/{sid}")
+    ResultBean<AdReimbursedAssetApplyDetailVo> details(@PathVariable("sid") String sid
+            , @RequestParam(value = "application", required = false) String application) {
+        return adReimbursedAssetApplyService.details(sid,application);
+    }
+
+    @ApiOperation("提交审批流程")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody @Valid AdReimbursedAssetApplyDto dto) {
+        return adReimbursedAssetApplyService.submit(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PutMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
+        return adReimbursedAssetApplyService.complete(dto);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/reject")
+    public ResultBean reject(@Valid @RequestBody TaskDto dto) {
+        return adReimbursedAssetApplyService.reject(dto);
+    }
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+        return adReimbursedAssetApplyService.getFlowOperateTitle(query);
+    }
+
+
+}

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象")
 public class AdAllocateAssetDetailsDto implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象")
 public class AdAllocateAssetDetailsVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象")
 public class AdAllocateAssetListDetailsVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetail.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail <br/>
- * Description: 驻外人员认定列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "集团用酒领用申请列表", description = "集团用酒领用申请列表")
 @TableName("ad_beverage_acceptance_detail")

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(认定人员) <br/>
- * File: AdExpatriatesDetailDto.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto <br/>
- * Description: 驻外人员认定列表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象")
 public class AdBeverageAcceptanceDetailDto implements Dto {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象")
 public class AdBeverageAcceptanceDetailListDetailVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象")
 public class AdBeverageAcceptanceDetailVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "固定资产处置列表 视图数据对象", description = "固定资产处置列表 视图数据对象")
 public class AdDisposalAssetDetailsDto implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "固定资产处置列表 视图数据对象", description = "固定资产处置列表 视图数据对象")
 public class AdDisposalAssetDetailsVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "固定资产处置列表 视图数据对象", description = "固定资产处置列表 视图数据对象")
 public class AdDisposalAssetListDetailsVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetail.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail <br/>
- * Description: 驻外人员认定列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表", description = "驻外人员认定列表")
 @TableName("ad_expatriates_detail")

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(认定人员) <br/>
- * File: AdExpatriatesDetailDto.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto <br/>
- * Description: 驻外人员认定列表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象")
 public class AdExpatriatesDetailDto implements Dto {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象")
 public class AdExpatriatesDetailVo implements Vo {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象")
 public class AdExpatriatesListDetailVo implements Vo {

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列表,英文逗号分隔
+
+}

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<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdLeasehostListDetailVo> list = new ArrayList<>();
+}

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) <br/>
+ * File: AdFrockallotApplyDto.java <br/>
+ * Class: com.yxt.anrui.oa.api.adfrockallotapply.AdFrockallotApplyDto <br/>
+ * Description: 工装订制配发申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 10:41:13 <br/>
+ *
+ * @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<String> files = new ArrayList<>();
+    @ApiModelProperty("文件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdFrockallotDetailDto> list = new ArrayList<>();
+}

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<AdFrockallotApply> {
+
+	AdFrockallotApplyDetailsVo details(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adfrockallotapply.AdFrockallotApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="details" resultType="com.yxt.anrui.oa.biz.adfrockallotapply.AdFrockallotApplyDetailsVo">
+        select remarks, sid
+        from ad_frockallot_apply
+        where sid = #{sid}
+    </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adfrockallotapply.AdFrockallotApplyDetailsVo">
+        <result column="remarks" property="remarks"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo">
+        select sid,
+               expectCost,
+               costRemarks
+        from ad_frockallot_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

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<AdFrockallotApplyMapper, AdFrockallotApply> {
+    @Autowired
+    private OaAppendixService oaAppendixService;
+    @Autowired
+    private OaFormService oaFormService;
+    @Autowired
+    private AdFrockallotDetailService adFrockallotDetailService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+    public ResultBean<AdFrockallotApplyVo> getSaveInit(String userSid, String orgPath) {
+        ResultBean<AdFrockallotApplyVo> rb = ResultBean.fireFail();
+        AdFrockallotApplyVo adFrockallotApplyVo = new AdFrockallotApplyVo();
+        adFrockallotApplyVo.setCreateBySid(userSid);
+        adFrockallotApplyVo.setOrgSidPath(orgPath);
+        return rb.success().setData(adFrockallotApplyVo);
+    }
+
+    public ResultBean<AdFrockallotApplyVo> getUpdateInit(String sid) {
+        ResultBean<AdFrockallotApplyVo> 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<AdFrockallotDetailVo> list = adFrockallotDetailService.getUpdateInit(sid);
+        List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+        adFrockallotApplyVo.setFiles(files);
+        List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+        adFrockallotApplyVo.setAppes(appes);
+        adFrockallotApplyVo.setList(list);
+        adFrockallotApplyVo.setSid(sid);
+        return rb.success().setData(adFrockallotApplyVo);
+    }
+
+    public ResultBean<String> saveOrUpdateDto(AdFrockallotApplyDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        List<String> files = dto.getFiles();
+        List<String> appes = dto.getAppes();
+        List<AdFrockallotDetailDto> list = dto.getList();
+        if (StringUtils.isBlank(sid)) {
+            // 新建操作
+            AdFrockallotApply entity = new AdFrockallotApply();
+            BeanUtil.copyProperties(dto, entity, "sid");
+
+            dto.setBillNo("GZDZPFSQ");
+            dto.setSid(entity.getSid());
+            ResultBean<String> 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<String> files, String attachType, String fileType) {
+        files.removeAll(Collections.singleton(null));
+        oaAppendixService.saveFile(sid, files, attachType, fileType);
+    }
+
+    public ResultBean<AdFrockallotApplyDetailsVo> details(String sid, String application) {
+        ResultBean rb = ResultBean.fireFail();
+        AdFrockallotApplyDetailsVo adFrockallotApplyDetailsVo = baseMapper.details(sid);
+        if (adFrockallotApplyDetailsVo == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+        List<String> 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<String> 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<String, Object> 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<String, Object> 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<String, Object> formVariables = dto.getFormVariables();
+        formVariables = getMap(formVariables, dto.getBusinessSid());
+        dto.setFormVariables(formVariables);
+        return oaFormService.reject(dto);
+    }
+
+    public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        // 默认失败返回
+        ResultBean<String> rb = ResultBean.fireFail();
+
+        // 获取next值和formVariables
+        int next = query.getNext();
+
+        // 获取并更新formVariables
+        Map<String, Object> 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<String, Object> getMap(Map<String, Object> formVariables, String sid) {
+        Map<String, Object> 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<List<NodeVo>> 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;
+    }
+}

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<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdFrockallotDetailVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+//    private String testPage;
+}

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; // 费用明细
+
+}

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; // 费用明细
+}

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<AdFrockallotDetail> {
+
+	List<AdFrockallotDetailVo> getUpdateInit(String sid);
+
+	@Select("select * from ad_frockallot_detail where mainSid = #{mainSid}")
+	List<AdFrockallotDetail> selectByMainSid(String mainSid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotDetailVo">
+		select sid,
+			   expectCost,
+			   costRemarks
+		from ad_frockallot_detail
+		where mainSid = #{sid}
+	</select>
+</mapper>

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<AdFrockallotDetailMapper, AdFrockallotDetail> {
+
+	public void saveDetails(List<AdFrockallotDetailDto> list, String sid) {
+		//根据sid查询明细并删除
+		List<AdFrockallotDetail> 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<AdFrockallotDetailVo> getUpdateInit(String sid) {
+		return baseMapper.getUpdateInit(sid);
+	}
+}

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; // 费用明细
+}

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; // 费用明细
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyService.java

@@ -82,8 +82,8 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService<AdGroupDocu
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             baseMapper.updateById(entity);
         }
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, "", "图片");
+        saveFiles(sid, appes, "", "文件");
         return rb.success().setData(sid);
     }
     public ResultBean<AdGroupDocumentsApplyVo> getSaveInit(String userSid, String orgPath) {
@@ -169,7 +169,7 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService<AdGroupDocu
 //        appMap.put("sid", businessSid);
         formVariables = getMap(formVariables, businessSid);
         submitDto.setFormVariables(formVariables);
-        submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
+        submitDto.setProcDefId("");
         submitDto.setNextTaskId(dto.getTaskId());
         submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
         return oaFormService.submit(submitDto);
@@ -204,32 +204,30 @@ public class AdGroupDocumentsApplyService extends MybatisBaseService<AdGroupDocu
     }
 
     public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        // 默认失败返回
         ResultBean<String> rb = ResultBean.fireFail();
-        //0 上一环节  1下一环节
+
+        // 获取next值和formVariables
         int next = query.getNext();
-        Map<String, Object> formVariables = query.getFormVariables();
-        formVariables = getMap(formVariables, query.getBusinessSid());
+
+        // 获取并更新formVariables
+        Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
         query.setFormVariables(formVariables);
-        String data = "";
-        if (next == 0) {
-            ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
-            if (resultBean.getSuccess()) {
-                resultBean.getData().removeAll(Collections.singleton(null));
-                data = resultBean.getData().get(0).getName();
-            } else {
-                return rb.setMsg(resultBean.getMsg());
-            }
-        } else if (next == 1) {
-            ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
-            if (resultBean.getSuccess()) {
-                resultBean.getData().removeAll(Collections.singleton(null));
-                data = resultBean.getData().get(0).getName();
-            } else {
-                return rb.setMsg(resultBean.getMsg());
+
+        // 校验next参数是否有效（只允许0或1）
+        if (next != 0 && next != 1) {
+            return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
         }
-        } else {
-            return rb.setMsg("参数错误：next");
+
+        // 获取节点名称
+        String data = oaFormService.getNodeName(query, next);
+
+        // 如果data为null，表示未获取到有效的节点信息
+        if (data == null) {
+            return rb.setMsg("没有获取到节点信息"); // 返回错误消息
         }
+
+        // 返回成功的结果和获取到的节点名称
         return rb.success().setData(data);
     }
     public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupsystemapply/AdGroupSystemApplyService.java

@@ -202,32 +202,30 @@ public class AdGroupSystemApplyService  extends MybatisBaseService<AdGroupSystem
     }
 
     public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        // 默认失败返回
         ResultBean<String> rb = ResultBean.fireFail();
-        //0 上一环节  1下一环节
+
+        // 获取next值和formVariables
         int next = query.getNext();
-        Map<String, Object> formVariables = query.getFormVariables();
-        formVariables = getMap(formVariables, query.getBusinessSid());
+
+        // 获取并更新formVariables
+        Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
         query.setFormVariables(formVariables);
-        String data = "";
-        if (next == 0) {
-            ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
-            if (resultBean.getSuccess()) {
-                resultBean.getData().removeAll(Collections.singleton(null));
-                data = resultBean.getData().get(0).getName();
-            } else {
-                return rb.setMsg(resultBean.getMsg());
-            }
-        } else if (next == 1) {
-            ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
-            if (resultBean.getSuccess()) {
-                resultBean.getData().removeAll(Collections.singleton(null));
-                data = resultBean.getData().get(0).getName();
-            } else {
-                return rb.setMsg(resultBean.getMsg());
+
+        // 校验next参数是否有效（只允许0或1）
+        if (next != 0 && next != 1) {
+            return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
         }
-        } else {
-            return rb.setMsg("参数错误：next");
+
+        // 获取节点名称
+        String data = oaFormService.getNodeName(query, next);
+
+        // 如果data为null，表示未获取到有效的节点信息
+        if (data == null) {
+            return rb.setMsg("没有获取到节点信息"); // 返回错误消息
         }
+
+        // 返回成功的结果和获取到的节点名称
         return rb.success().setData(data);
     }
     public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adjdpermissionapply/AdJdPermissionApplyService.java

@@ -64,8 +64,8 @@ public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissio
             BeanUtil.copyProperties(dto, entity, "id", "sid");
             baseMapper.updateById(entity);
         }
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, files, "", "图片");
+        saveFiles(sid, appes, "", "文件");
         return rb.success().setData(sid);
     }
     public ResultBean<AdJdPermissionApplyVo> getSaveInit(String userSid, String orgPath) {
@@ -138,7 +138,7 @@ public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissio
 //        appMap.put("sid", businessSid);
         formVariables = getMap(formVariables, businessSid);
         submitDto.setFormVariables(formVariables);
-        submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
+        submitDto.setProcDefId("");
         submitDto.setNextTaskId(dto.getTaskId());
         submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
         return oaFormService.submit(submitDto);
@@ -173,32 +173,30 @@ public class AdJdPermissionApplyService extends MybatisBaseService<AdJdPermissio
     }
 
     public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        // 默认失败返回
         ResultBean<String> rb = ResultBean.fireFail();
-        //0 上一环节  1下一环节
+
+        // 获取next值和formVariables
         int next = query.getNext();
-        Map<String, Object> formVariables = query.getFormVariables();
-        formVariables = getMap(formVariables, query.getBusinessSid());
+
+        // 获取并更新formVariables
+        Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
         query.setFormVariables(formVariables);
-        String data = "";
-        if (next == 0) {
-            ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
-            if (resultBean.getSuccess()) {
-                resultBean.getData().removeAll(Collections.singleton(null));
-                data = resultBean.getData().get(0).getName();
-            } else {
-                return rb.setMsg(resultBean.getMsg());
-            }
-        } else if (next == 1) {
-            ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
-            if (resultBean.getSuccess()) {
-                resultBean.getData().removeAll(Collections.singleton(null));
-                data = resultBean.getData().get(0).getName();
-            } else {
-                return rb.setMsg(resultBean.getMsg());
+
+        // 校验next参数是否有效（只允许0或1）
+        if (next != 0 && next != 1) {
+            return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息
         }
-        } else {
-            return rb.setMsg("参数错误：next");
+
+        // 获取节点名称
+        String data = oaFormService.getNodeName(query, next);
+
+        // 如果data为null，表示未获取到有效的节点信息
+        if (data == null) {
+            return rb.setMsg("没有获取到节点信息"); // 返回错误消息
         }
+
+        // 返回成功的结果和获取到的节点名称
         return rb.success().setData(data);
     }
     public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java

@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-oa(宿舍租赁) <br/>
- * File: AdLeasehostApply.java <br/>
- * Class: com.yxt.anrui.oa.api.adleasehostapply.AdLeasehostApply <br/>
- * Description: 宿舍租赁申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-17 14:11:50 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "宿舍租赁申请", description = "宿舍租赁申请")
 @TableName("ad_leasehost_apply")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailDto.java

@@ -27,11 +27,9 @@ package com.yxt.anrui.oa.biz.adleasehostdetail;
 
 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;
 
 @Data

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(认定人员) <br/>
- * File: AdExpatriatesDetail.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetail <br/>
- * Description: 驻外人员认定列表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "办公用品领用列表", description = "办公用品领用列表")
 @TableName("ad_office_supplies_detail")

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(认定人员) <br/>
- * File: AdExpatriatesDetailDto.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailDto <br/>
- * Description: 驻外人员认定列表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 数据传输对象", description = "驻外人员认定列表 数据传输对象")
 public class AdOfficeSuppliesDetailDto implements Dto {

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(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "驻外人员认定列表 视图数据对象", description = "驻外人员认定列表 视图数据对象")
 public class AdOfficeSuppliesDetailVo implements Vo {

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(办公场地租赁) <br/>
- * File: AdOffspaceApply.java <br/>
- * Class: com.yxt.anrui.oa.api.adoffspaceapply.AdOffspaceApply <br/>
- * Description: 办公场地租赁申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-18 11:50:51 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "办公场地租赁申请", description = "办公场地租赁申请")
 @TableName("ad_offspace_apply")

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(办公场地租赁) <br/>
- * File: AdOffspaceApplyVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adoffspaceapply.AdOffspaceApplyVo <br/>
- * Description: 办公场地租赁申请 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-18 11:50:51 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "办公场地租赁申请 视图数据详情", description = "办公场地租赁申请 视图数据详情")
 public class AdOffspaceApplyDetailsVo implements Vo {

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(办公场地租赁) <br/>
- * File: AdOffspaceDetailDto.java <br/>
- * Class: com.yxt.anrui.oa.api.adoffspacedetail.AdOffspaceDetailDto <br/>
- * Description: 办公场地租赁列表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-18 11:50:51 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "办公场地租赁列表 数据传输对象", description = "办公场地租赁列表 数据传输对象")
 public class AdOffspaceDetailDto implements Dto {

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(办公场地租赁) <br/>
- * File: AdOffspaceDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adoffspacedetail.AdOffspaceDetailVo <br/>
- * Description: 办公场地租赁列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-02-18 11:50:51 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
+
 @Data
 @ApiModel(value = "办公场地租赁列表 视图数据对象", description = "办公场地租赁列表 视图数据对象")
 public class AdOffspaceListDetailVo implements Vo {

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(私车临时公用) <br/>
+ * File: AdPircarpulApply.java <br/>
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApply <br/>
+ * Description: 临时私车公用申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @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列表,英文逗号分隔
+
+}

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(私车临时公用) <br/>
+ * File: AdPircarpulApplyVo.java <br/>
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo <br/>
+ * Description: 临时私车公用申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "临时私车公用申请 视图数据详情", description = "临时私车公用申请 视图数据详情")
+public class AdPircarpulApplyDetailsVo implements Vo {
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdLeasehostListDetailVo> list = new ArrayList<>();
+}

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(私车临时公用) <br/>
+ * File: AdPircarpulApplyDto.java <br/>
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyDto <br/>
+ * Description: 临时私车公用申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @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<String> files = new ArrayList<>();
+    @ApiModelProperty("文件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdPircarpulDetailDto> list = new ArrayList<>();
+}

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(私车临时公用) <br/>
+ * File: AdPircarpulApplyMapper.java <br/>
+ * Class: com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper <br/>
+ * Description: 临时私车公用申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AdPircarpulApplyMapper extends BaseMapper<AdPircarpulApply> {
+
+	AdPircarpulApplyDetailsVo details(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="details" resultType="com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo">
+        select remarks, sid
+        from ad_pircarpul_apply
+        where sid = #{sid}
+    </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo">
+        <result column="remarks" property="remarks"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulListDetailVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulListDetailVo">
+        select sid,
+               userSid  as userKey,
+               userName as userValue,
+               deptSid  as deptKey,
+               deptName as deptValue,
+               postSid  as jobKey,
+               postName as jobValue,
+               reasonsForUsingVehicles,
+               departureAddress,
+               destinationAddress,
+               departureTime,
+               returnTime,
+               plateNumber,
+               expectCost,
+               costRemarks
+        from ad_pircarpul_detail
+        where mainSid = #{sid}
+    </select>
+</mapper>

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<AdPircarpulApplyMapper, AdPircarpulApply> {
+
+	@Autowired
+	private OaAppendixService oaAppendixService;
+	@Autowired
+	private OaFormService oaFormService;
+	@Autowired
+	private AdPircarpulDetailService adPircarpulDetailService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+
+	public ResultBean<AdPircarpulApplyVo> getSaveInit(String userSid, String orgPath) {
+		ResultBean<AdPircarpulApplyVo> rb = ResultBean.fireFail();
+		AdPircarpulApplyVo adPircarpulApplyVo = new AdPircarpulApplyVo();
+		adPircarpulApplyVo.setCreateBySid(userSid);
+		adPircarpulApplyVo.setOrgSidPath(orgPath);
+		return rb.success().setData(adPircarpulApplyVo);
+	}
+
+	public ResultBean<AdPircarpulApplyVo> getUpdateInit(String sid) {
+		ResultBean<AdPircarpulApplyVo> 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<AdPircarpulDetailVo> 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<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		adPircarpulApplyVo.setFiles(files);
+		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+		adPircarpulApplyVo.setAppes(appes);
+		adPircarpulApplyVo.setList(list);
+		adPircarpulApplyVo.setSid(sid);
+		return rb.success().setData(adPircarpulApplyVo);
+	}
+
+	public ResultBean<String> saveOrUpdateDto(AdPircarpulApplyDto dto) {
+		ResultBean<String> rb = ResultBean.fireFail();
+		String sid = dto.getSid();
+		List<String> files = dto.getFiles();
+		List<String> appes = dto.getAppes();
+		List<AdPircarpulDetailDto> list = dto.getList();
+		if (StringUtils.isBlank(sid)) {
+			// 新建操作
+			AdPircarpulApply entity = new AdPircarpulApply();
+			BeanUtil.copyProperties(dto, entity, "sid");
+
+			dto.setBillNo("LSSCGYSQ");
+			dto.setSid(entity.getSid());
+			ResultBean<String> 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<String> files, String attachType, String fileType) {
+		files.removeAll(Collections.singleton(null));
+		oaAppendixService.saveFile(sid, files, attachType, fileType);
+	}
+
+	public ResultBean<AdPircarpulApplyDetailsVo> details(String sid, String application) {
+		ResultBean rb = ResultBean.fireFail();
+		AdPircarpulApplyDetailsVo adPircarpulApplyDetailsVo = baseMapper.details(sid);
+		if (adPircarpulApplyDetailsVo == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+		List<String> 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<String> 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<String, Object> 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<String, Object> 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<String, Object> formVariables = dto.getFormVariables();
+		formVariables = getMap(formVariables, dto.getBusinessSid());
+		dto.setFormVariables(formVariables);
+		return oaFormService.reject(dto);
+	}
+
+	public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+		// 默认失败返回
+		ResultBean<String> rb = ResultBean.fireFail();
+
+		// 获取next值和formVariables
+		int next = query.getNext();
+
+		// 获取并更新formVariables
+		Map<String, Object> 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<String, Object> getMap(Map<String, Object> formVariables, String sid) {
+		Map<String, Object> 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<List<NodeVo>> 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;
+	}
+}

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(私车临时公用) <br/>
+ * File: AdPircarpulApplyVo.java <br/>
+ * Class: com.yxt.anrui.oa.api.adpircarpulapply.AdPircarpulApplyVo <br/>
+ * Description: 临时私车公用申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @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<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdPircarpulDetailVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+//    private String testPage;
+}

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; // 费用明细
+
+}

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(私车临时公用) <br/>
+ * File: AdPircarpulDetailDto.java <br/>
+ * Class: com.yxt.anrui.oa.api.adpircarpuldetail.AdPircarpulDetailDto <br/>
+ * Description: 临时私车公用列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @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; // 费用明细
+}

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(私车临时公用) <br/>
+ * File: AdPircarpulDetailMapper.java <br/>
+ * Class: com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper <br/>
+ * Description: 临时私车公用列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-02-20 09:42:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AdPircarpulDetailMapper extends BaseMapper<AdPircarpulDetail> {
+
+	List<AdPircarpulDetailVo> getUpdateInit(String sid);
+
+	@Select("select * from ad_pircarpul_detail where mainSid = #{mainSid}")
+	List<AdPircarpulDetail> selectByMainSid(String mainSid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulDetailVo">
+		select sid,
+			   userSid as userKey,
+			   userName as userValue,
+			   deptSid as deptKey,
+			   deptName as deptValue,
+			   postSid as jobKey,
+			   postName as jobValue,
+			   reasonsForUsingVehicles,
+			   departureAddress,
+			   destinationAddress,
+			   departureTime,
+			   returnTime,
+			   plateNumber,
+			   expectCost,
+			   costRemarks
+		from ad_pircarpul_detail
+		where mainSid = #{sid}
+	</select>
+</mapper>