From 6b5b576b619cb96916e088b76293f9d5daa98df2 Mon Sep 17 00:00:00 2001 From: ligaode Date: Tue, 25 Feb 2025 18:27:56 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateService.java | 79 ++++++++++--------- .../biz/scmvehrebate/ScmVehRebateService.java | 79 ++++++++++--------- 2 files changed, 84 insertions(+), 74 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index efb772dbc8..4207efd819 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -155,11 +155,12 @@ public class ScmSpecialRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") .or().isNull("uploadDate") ); @@ -172,17 +173,17 @@ public class ScmSpecialRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") .or().isNull("uploadDate") ); @@ -462,17 +464,17 @@ public class ScmSpecialRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") .or().isNull("uploadDate") ); @@ -592,17 +595,17 @@ public class ScmSpecialRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (OneExcelInfo info : infos) { - ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName()); - String uploadDate = ""; - if (isNumber(info.getUploadDate())) { - Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); - uploadDate = DateUtil.formatDate(javaDate); - } else { - uploadDate = info.getUploadDate(); + if (StringUtils.isNotBlank(info.getUploadDate()) && StringUtils.isNotBlank(info.getUploadMoney())) { + ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName()); + String uploadDate = ""; + if (isNumber(info.getUploadDate())) { + Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); + uploadDate = DateUtil.formatDate(javaDate); + } else { + uploadDate = info.getUploadDate(); + } + baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceItureCost(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid()); } - baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceItureCost(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid()); } return rb.success().setMsg("成功导入数据，请点击确定按钮"); } @@ -1578,15 +1583,17 @@ public class ScmSpecialRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (TwoExcelInfo info : infos) { - ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName()); - String secondaryUploadDate = ""; - if (isNumber(info.getSecondaryUploadDate())) { - Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); - secondaryUploadDate = DateUtil.formatDate(javaDate); - } else { - secondaryUploadDate = info.getSecondaryUploadDate(); + if (StringUtils.isNotBlank(info.getSecondaryUploadDate()) && StringUtils.isNotBlank(info.getSecondaryUploadMoney())) { + ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcelInfo(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName()); + String secondaryUploadDate = ""; + if (isNumber(info.getSecondaryUploadDate())) { + Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); + secondaryUploadDate = DateUtil.formatDate(javaDate); + } else { + secondaryUploadDate = info.getSecondaryUploadDate(); + } + baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid()); } - baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondItureCost(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmSpecialRebateVo.getSid()); } return rb.success().setMsg("成功导入数据，请点击确定按钮"); } @@ -1758,10 +1765,6 @@ public class ScmSpecialRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") .or().isNull("uploadDate") ); @@ -169,17 +170,17 @@ public class ScmVehRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") .or().isNull("uploadDate") ); @@ -427,17 +429,17 @@ public class ScmVehRebateService extends MybatisBaseService wrapper.eq("uploadDate", "") .or().isNull("uploadDate") ); @@ -560,17 +563,17 @@ public class ScmVehRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (OneExcelInfo info : infos) { - ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); - String uploadDate = ""; - if (isNumber(info.getUploadDate())) { - Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); - uploadDate = DateUtil.formatDate(javaDate); - } else { - uploadDate = info.getUploadDate(); + if (StringUtils.isNotBlank(info.getUploadDate()) && StringUtils.isNotBlank(info.getUploadMoney())) { + ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); + String uploadDate = ""; + if (isNumber(info.getUploadDate())) { + Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); + uploadDate = DateUtil.formatDate(javaDate); + } else { + uploadDate = info.getUploadDate(); + } + baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); } - baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); } return rb.success().setMsg("成功导入数据，请点击确定按钮"); } @@ -1785,15 +1790,17 @@ public class ScmVehRebateService extends MybatisBaseService infos = importReturn.getInfos(); for (TwoExcelInfo info : infos) { - ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); - String secondaryUploadDate = ""; - if (isNumber(info.getSecondaryUploadDate())) { - Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); - secondaryUploadDate = DateUtil.formatDate(javaDate); - } else { - secondaryUploadDate = info.getSecondaryUploadDate(); + if (StringUtils.isNotBlank(info.getSecondaryUploadDate()) && StringUtils.isNotBlank(info.getSecondaryUploadMoney())) { + ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); + String secondaryUploadDate = ""; + if (isNumber(info.getSecondaryUploadDate())) { + Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); + secondaryUploadDate = DateUtil.formatDate(javaDate); + } else { + secondaryUploadDate = info.getSecondaryUploadDate(); + } + baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); } - baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); } return rb.success().setMsg("成功导入数据，请点击确定按钮"); } @@ -2148,11 +2155,11 @@ public class ScmVehRebateService extends MybatisBaseService Date: Tue, 25 Feb 2025 19:02:52 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseAccadjApplyService.java | 42 ++++++++++--------- .../BaseInternalPurchaseService.java | 21 +++++++++- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 018357a735..1060a2b321 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -88,6 +88,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -481,21 +482,21 @@ public class BaseAccadjApplyService extends MybatisBaseService flowList = flowRecordVo.getFlowList(); for (FlowTask flowTask : flowList) { - if (flowTask.getTaskName().equals("发起方分公司会计主管审批")){ + if (flowTask.getTaskName().equals("发起方分公司会计主管审批")) { confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); } } - }else if (baseAccadjApply.getAccadjTypeValue().equals("调出")){ + } else if (baseAccadjApply.getAccadjTypeValue().equals("调出")) { FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData(); List flowList = flowRecordVo.getFlowList(); for (FlowTask flowTask : flowList) { - if (flowTask.getTaskName().equals("应对方分公司会计主管审批")){ + if (flowTask.getTaskName().equals("应对方分公司会计主管审批")) { confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); @@ -1050,24 +1051,10 @@ public class BaseAccadjApplyService extends MybatisBaseService purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); - if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - for (String purchaseSid : purchaseSids) { - baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0"); - } - return rb.success().setData(resultBean.getData()); - } String businessTaskId = baseAccadjApply.getTaskId(); + List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); if (StringUtils.isNotBlank(businessTaskId)) { - if (businessTaskId.equals(query.getTaskId())) { + if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) { FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(query, flowTaskVo); ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -1080,6 +1067,21 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + for (String purchaseSid : purchaseSids) { + baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0"); + } + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index f4ee8c02e3..53267796d3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -940,7 +940,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -957,6 +957,25 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + List baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid()); + for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) { + BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid()); + baseVehicle.setVinNo(baseInternalPurchaseVehicleVo.getVinNo()); + baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); + baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); + baseVehicleService.updateVeh(baseVehicle); + } + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); From 0ba5455db4a864c592434cf4840bc3f8f2d5a67b Mon Sep 17 00:00:00 2001 From: ligaode Date: Tue, 25 Feb 2025 19:24:57 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/scmspecialrebate/ScmSpecialRebateService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 4207efd819..29168432cf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -506,6 +506,15 @@ public class ScmSpecialRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())) { + record.setSecondCheckState("是"); + } else { + record.setSecondCheckState("否"); + } + } else { + record.setSecondCheckState("否"); + } } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; From 1cec8fd67d309b294485e083d9ef95abbd9406d5 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Feb 2025 09:36:32 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/oa/feign/file/OaFileEnum.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java index 4dd4015631..a11a677c09 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java @@ -15,6 +15,15 @@ public enum OaFileEnum { ADALLOCATEASSETAPPLY("006", "固定资产调拨附件"), ADDISPOSALASSETAPPLY("007", "固定资产处置附件"), GROUPSYSTEMAPPLY("008", "集团制度会签附件"), + ADEXPATRIATESHOMEAPPLY("009", "驻外人员探亲附件"), + ADNOEXPATRIATESHOSTELAPPLY("010", "非驻外人员申请宿舍附件"), + ADOFFICESPACERENTALAPPLY("011", "宿舍租赁附件"), + ADOFFSPACEAPPLY("012", "办公场地租赁附件"), + ADFROCKALLOTAPPLY("013", "工装订制配发附件"), + ADPIRCARPULAPPLY("014", "临时私车公用附件"), + ADSENPIRCARPULAPPLY("015", "总经理级固定私车公用附件"), + a("016", "销售人员固定私车公用方案附件"), + ADFETEAPPLY("017", "商务宴请事前附件"), ; From 7b1f94a7ab01c2eaefa956f0b80a44d105d9bf46 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Feb 2025 10:23:04 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/oa/api/AdOffSpaceApplyRest.java | 2 +- .../AdExpatriatesHomeApplyService.java | 4 +- .../biz/adfeteapply/AdFeteApplyService.java | 4 +- .../AdFrockallotApplyService.java | 11 +++- .../AdFrockallotDetailDto.java | 4 ++ .../AdFrockallotDetailService.java | 64 ++++++++++++------- .../AdFrockallotDetailVo.java | 4 ++ .../AdFrockallotListDetailVo.java | 4 ++ .../AdLeasehostApplyService.java | 4 +- .../AdNoexpatriatesHostelApplyService.java | 4 +- .../AdOffspaceApplyService.java | 4 +- .../AdPircarpulApplyService.java | 4 +- .../AdSenpircarpulApplyDetailsVo.java | 3 +- .../AdSenpircarpulApplyService.java | 12 +++- .../AdSenpircarpulDetailDto.java | 5 ++ .../AdSenpircarpulDetailService.java | 21 +++++- .../AdSenpircarpulDetailVo.java | 5 ++ .../AdSenpircarpulListDetailVo.java | 5 ++ .../yxt/anrui/oa/feign/file/OaFileEnum.java | 2 +- 19 files changed, 124 insertions(+), 42 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java index bf0b3b5f51..87362785b4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdOffSpaceApplyRest.java @@ -40,7 +40,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -@Api(tags = "宿舍租赁申请") +@Api(tags = "办公场地租赁申请") @RestController @RequestMapping("v1/officeSpaceRentalapply") public class AdOffSpaceApplyRest { diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java index b440900edf..c0bc29409d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java @@ -148,8 +148,8 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService { + @Autowired private OaAppendixService oaAppendixService; @Autowired @@ -123,8 +125,8 @@ public class AdFrockallotApplyService extends MybatisBaseService appes = oaAppendixService.selectByLinkSid(sid, "文件"); adFrockallotApplyDetailsVo.setFiles(files); adFrockallotApplyDetailsVo.setAppes(appes); + //子表附件赋值 + for (AdFrockallotListDetailVo adFrockallotListDetailVo : adFrockallotApplyDetailsVo.getList()) { + List detailFiles = oaAppendixService.selectByLinkSid(adFrockallotListDetailVo.getSid()); + adFrockallotListDetailVo.setDetailFiles(detailFiles); + } //基础字段赋值 BeanUtil.copyProperties(oaFormService.getDetails(sid), adFrockallotApplyDetailsVo); return rb.success().setData(adFrockallotApplyDetailsVo); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java index 4750539d04..b1ca013404 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailDto.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Data @@ -43,4 +45,6 @@ public class AdFrockallotDetailDto implements Dto { private BigDecimal expectCost; // 预计费用 @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 + + private List detailFiles = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java index 8454db38bb..dc9ac69509 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailService.java @@ -26,35 +26,55 @@ package com.yxt.anrui.oa.biz.adfrockallotdetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.Collections; import java.util.List; @Service public class AdFrockallotDetailService extends MybatisBaseService { - public void saveDetails(List list, String sid) { - //根据sid查询明细并删除 - List list2 = baseMapper.selectByMainSid(sid); - list2.removeAll(Collections.singleton(null)); - if (!list2.isEmpty()) { - list2.stream().forEach(v -> { - deleteBySid(v.getSid()); - }); - } - list.removeAll(Collections.singleton(null)); - if (!list.isEmpty()) { - list.stream().forEach(details -> { - AdFrockallotDetail adFrockallotDetail = new AdFrockallotDetail(); - BeanUtil.copyProperties(details, adFrockallotDetail); - adFrockallotDetail.setMainSid(sid); - baseMapper.insert(adFrockallotDetail); - }); - } - } + @Autowired + private OaAppendixService oaAppendixService; + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdFrockallotDetail adFrockallotDetail = new AdFrockallotDetail(); + BeanUtil.copyProperties(details, adFrockallotDetail); + adFrockallotDetail.setMainSid(sid); + baseMapper.insert(adFrockallotDetail); + List detailFiles = details.getDetailFiles(); + saveFiles(adFrockallotDetail.getSid(), detailFiles, OaFileEnum.ADFROCKALLOTAPPLY.getAttachType(), ""); + }); + } + } + + public List getUpdateInit(String sid) { + List adFrockallotDetailVos = baseMapper.getUpdateInit(sid); + for (AdFrockallotDetailVo adFrockallotDetailVo : adFrockallotDetailVos) { + List detailFiles = oaAppendixService.selectByLinkSid(adFrockallotDetailVo.getSid()); + adFrockallotDetailVo.setDetailFiles(detailFiles); + } + return adFrockallotDetailVos; + } - public List getUpdateInit(String sid) { - return baseMapper.getUpdateInit(sid); - } + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java index 27171062aa..42b18f112a 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotDetailVo.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Data @@ -45,4 +47,6 @@ public class AdFrockallotDetailVo implements Vo { private BigDecimal expectCost; // 预计费用 @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java index b5a5ff1ba5..880c358f73 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotdetail/AdFrockallotListDetailVo.java @@ -30,6 +30,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @Data @ApiModel(value = "工装订制配发列表 视图数据对象", description = "工装订制配发列表 视图数据对象") @@ -41,4 +43,6 @@ public class AdFrockallotListDetailVo implements Vo { private BigDecimal expectCost; // 预计费用 @ApiModelProperty("费用明细") private String costRemarks; // 费用明细 + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java index 7641aecd10..e5577c7b0c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java @@ -130,8 +130,8 @@ public class AdLeasehostApplyService extends MybatisBaseService appes = new ArrayList<>(); - private List list = new ArrayList<>(); + private List list = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java index 8b6ad73b9b..1922c50887 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyService.java @@ -26,9 +26,11 @@ package com.yxt.anrui.oa.biz.adsenpircarpulapply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo; import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulDetailDto; import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulDetailService; import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulDetailVo; +import com.yxt.anrui.oa.biz.adsenpircarpuldetail.AdSenpircarpulListDetailVo; import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; import com.yxt.anrui.oa.biz.oaform.*; import com.yxt.anrui.oa.biz.oaform.flowable.*; @@ -48,6 +50,7 @@ import java.util.Map; @Service public class AdSenpircarpulApplyService extends MybatisBaseService { + @Autowired private OaAppendixService oaAppendixService; @Autowired @@ -133,8 +136,8 @@ public class AdSenpircarpulApplyService extends MybatisBaseService appes = oaAppendixService.selectByLinkSid(sid, "文件"); adSenpircarpulApplyDetailsVo.setFiles(files); adSenpircarpulApplyDetailsVo.setAppes(appes); + //子表附件赋值 + for (AdSenpircarpulListDetailVo adSenpircarpulListDetailVo : adSenpircarpulApplyDetailsVo.getList()) { + List detailFiles = oaAppendixService.selectByLinkSid(adSenpircarpulListDetailVo.getSid()); + adSenpircarpulListDetailVo.setDetailFiles(detailFiles); + } //基础字段赋值 BeanUtil.copyProperties(oaFormService.getDetails(sid), adSenpircarpulApplyDetailsVo); return rb.success().setData(adSenpircarpulApplyDetailsVo); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java index 5547f3932e..6087eebc56 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailDto.java @@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-oa(1)
* File: AdSenpircarpulDetailDto.java
@@ -62,4 +65,6 @@ public class AdSenpircarpulDetailDto implements Dto { private FormCommon jobObj; private String jobKey; private String jobValue; + + private List detailFiles = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java index 0c3dafe176..0430ab682d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java @@ -26,7 +26,10 @@ package com.yxt.anrui.oa.biz.adsenpircarpuldetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.feign.file.OaFileEnum; import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; @@ -34,6 +37,9 @@ import java.util.List; @Service public class AdSenpircarpulDetailService extends MybatisBaseService { + @Autowired + private OaAppendixService oaAppendixService; + public void saveDetails(List list, String sid) { //根据sid查询明细并删除 List list2 = baseMapper.selectByMainSid(sid); @@ -50,11 +56,24 @@ public class AdSenpircarpulDetailService extends MybatisBaseService detailFiles = details.getDetailFiles(); + saveFiles(adSenpircarpulDetail.getSid(), detailFiles, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), ""); }); } } public List getUpdateInit(String sid) { - return baseMapper.getUpdateInit(sid); + List adSenpircarpulDetailVos = baseMapper.getUpdateInit(sid); + for (AdSenpircarpulDetailVo adSenpircarpulDetailVo : adSenpircarpulDetailVos) { + List detailFiles = oaAppendixService.selectByLinkSid(adSenpircarpulDetailVo.getSid()); + adSenpircarpulDetailVo.setDetailFiles(detailFiles); + } + return adSenpircarpulDetailVos; + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java index e38ce4fc28..0a70a25db4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailVo.java @@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-oa(1)
* File: AdSenpircarpulDetailVo.java
@@ -64,4 +67,6 @@ public class AdSenpircarpulDetailVo implements Vo { private FormCommon jobObj; private String jobKey; private String jobValue; + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java index 56432fdcbe..88da4d166c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulListDetailVo.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: yxt-oa(1)
* File: AdSenpircarpulDetailVo.java
@@ -57,4 +60,6 @@ public class AdSenpircarpulListDetailVo implements Vo { private String deptValue; @ApiModelProperty("岗位") private String jobValue; + + private List detailFiles = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java index a11a677c09..34cb963872 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java @@ -17,7 +17,7 @@ public enum OaFileEnum { GROUPSYSTEMAPPLY("008", "集团制度会签附件"), ADEXPATRIATESHOMEAPPLY("009", "驻外人员探亲附件"), ADNOEXPATRIATESHOSTELAPPLY("010", "非驻外人员申请宿舍附件"), - ADOFFICESPACERENTALAPPLY("011", "宿舍租赁附件"), + ADLEASEHOSTAPPLY("011", "宿舍租赁附件"), ADOFFSPACEAPPLY("012", "办公场地租赁附件"), ADFROCKALLOTAPPLY("013", "工装订制配发附件"), ADPIRCARPULAPPLY("014", "临时私车公用附件"), From c1606338762919b753f45d28ebd63d2b150c49ef Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Feb 2025 10:26:52 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmspecialrebate/ScmSpecialRebateService.java | 14 -------------- .../scm/biz/scmvehrebate/ScmVehRebateService.java | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 29168432cf..08d8f2c611 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -1335,13 +1335,6 @@ public class ScmSpecialRebateService extends MybatisBaseService Date: Wed, 26 Feb 2025 11:25:43 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/scmspecialrebate/OneExcelInfo.java | 2 ++ .../scm/api/scmspecialrebate/OneExcelVo.java | 2 ++ .../api/scmspecialrebate/TwoExcelInfo.java | 2 ++ .../scm/api/scmspecialrebate/TwoExcelVo.java | 2 ++ .../ScmSpecialRebateService.java | 20 +++++++++++------- .../biz/adfeteapply/AdFeteApplyDetailsVo.java | 6 ++---- .../oa/biz/adfeteapply/AdFeteApplyMapper.xml | 2 +- .../AdFrockallotApplyDetailsVo.java | 4 ++-- .../AdFrockallotApplyMapper.xml | 2 +- .../AdGroupDocumentsApplyMapper.xml | 1 + .../AdGroupSystemApplyMapper.xml | 1 + .../AdLeasehostApplyDetailsVo.java | 21 ++----------------- .../AdLeasehostApplyMapper.xml | 2 +- .../AdNoexpatriatesHostelApplyDetailsVo.java | 6 ++---- .../AdNoexpatriatesHostelApplyMapper.xml | 3 +-- .../AdOffspaceApplyDetailsVo.java | 9 ++------ .../adoffspaceapply/AdOffspaceApplyMapper.xml | 2 +- .../AdPircarpulApplyDetailsVo.java | 20 ++---------------- .../AdPircarpulApplyMapper.xml | 2 +- .../AdSenpircarpulApplyDetailsVo.java | 21 ++----------------- .../AdSenpircarpulApplyMapper.xml | 2 +- 21 files changed, 44 insertions(+), 88 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelInfo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelInfo.java index 53180b2a54..7305d283f1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelInfo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelInfo.java @@ -43,6 +43,8 @@ public class OneExcelInfo { private String onceSuppRemark; //调整说明 private String adjustmentRemarks; + //备注 + private String remarks; //是否调整 private String isAdjustment; //调整金额 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java index 5eb4cd832f..9a8dc9f3d2 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java @@ -43,4 +43,6 @@ public class OneExcelVo { private String onceSuppRemark; @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") private String adjustmentRemarks; + @ExportEntityMap(CnName = "备注", EnName = "remarks") + private String remarks; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java index 4489447094..256a83b5ad 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java @@ -48,6 +48,8 @@ public class TwoExcelInfo { private String secondSuppRemark; //调整说明 private String adjustmentRemarks; + //备注 + private String remarks; //是否调整 private String isAdjustment; //调整金额 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java index 228fc62d0e..d20ac58b9f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java @@ -49,4 +49,6 @@ public class TwoExcelVo { private String secondSuppRemark; @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") private String adjustmentRemarks; + @ExportEntityMap(CnName = "备注", EnName = "remarks") + private String remarks; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 08d8f2c611..2e17274a91 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -1110,7 +1110,7 @@ public class ScmSpecialRebateService extends MybatisBaseService - select remarks, sid from ad_fete_apply where sid = #{sid} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java index e3ce6c1992..501293ddb9 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyDetailsVo.java @@ -26,7 +26,7 @@ package com.yxt.anrui.oa.biz.adfrockallotapply; import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo; -import com.yxt.common.core.vo.Vo; +import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,7 +35,7 @@ import java.util.List; @Data @ApiModel(value = "工装订制配发申请 视图数据详情", description = "工装订制配发申请 视图数据详情") -public class AdFrockallotApplyDetailsVo implements Vo { +public class AdFrockallotApplyDetailsVo extends OaFormCommonVo { @ApiModelProperty("备注") private String remarks; diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml index dabc27612e..0c651223a7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfrockallotapply/AdFrockallotApplyMapper.xml @@ -3,7 +3,7 @@ - select remarks, sid from ad_frockallot_apply where sid = #{sid} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyMapper.xml index f9362e1fb0..f45ac100dc 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adgroupdocumentsapply/AdGroupDocumentsApplyMapper.xml @@ -9,6 +9,7 @@ ${ew.sqlSegment} + + + + + + + - - + select remarks, sid + from ad_pircarpul_apply + where sid = #{sid} + + + + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java new file mode 100644 index 0000000000..5b5d3b4590 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java @@ -0,0 +1,300 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpulapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo; +import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailDto; +import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailService; +import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailVo; +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 AdSalecarpulApplyService extends MybatisBaseService { + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + @Autowired + private AdSalecarpulDetailService adSalecarpulDetailService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdSalecarpulApplyVo adSalecarpulApplyVo = new AdSalecarpulApplyVo(); + adSalecarpulApplyVo.setCreateBySid(userSid); + adSalecarpulApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adSalecarpulApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdSalecarpulApplyVo adSalecarpulApplyVo = new AdSalecarpulApplyVo(); + AdSalecarpulApply adSalecarpulApply = fetchBySid(sid); + if (adSalecarpulApply == null) { + return rb.setMsg("该申请不存在"); + } +// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage()); + OaForm oaForm = oaFormService.fetchBySid(sid); + adSalecarpulApplyVo.setTaskId(oaForm.getTaskId()); + adSalecarpulApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adSalecarpulApplyVo.setOrgSidPath(orgSidPath); + adSalecarpulApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adSalecarpulApply, adSalecarpulApplyVo); + List list = adSalecarpulDetailService.getUpdateInit(sid); + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + adSalecarpulApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adSalecarpulApplyVo.setAppes(appes); + adSalecarpulApplyVo.setList(list); + adSalecarpulApplyVo.setSid(sid); + return rb.success().setData(adSalecarpulApplyVo); + } + + public ResultBean saveOrUpdateDto(AdSalecarpulApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + List files = dto.getFiles(); + List appes = dto.getAppes(); + List list = dto.getList(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdSalecarpulApply entity = new AdSalecarpulApply(); + BeanUtil.copyProperties(dto, entity, "sid"); + + dto.setBillNo("XSRYGDSCGYSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); + + if (!resultBean.getSuccess()) { + return rb; + } + + entity.setFormSid(resultBean.getData()); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdSalecarpulApply entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + adSalecarpulDetailService.saveDetails(list, sid); + // 处理附件 + saveFiles(sid, files, OaFileEnum.ADSALECARPULAPPLY.getAttachType(), "图片"); + saveFiles(sid, appes, OaFileEnum.ADSALECARPULAPPLY.getAttachType(), "文件"); + return rb.success().setData(sid); + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdPircarpulApplyDetailsVo adPircarpulApplyDetailsVo = baseMapper.details(sid); + if (adPircarpulApplyDetailsVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adPircarpulApplyDetailsVo.setFiles(files); + adPircarpulApplyDetailsVo.setAppes(appes); + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adPircarpulApplyDetailsVo); + return rb.success().setData(adPircarpulApplyDetailsVo); + } + + /** + * 提交 + * + * @param dto + * @return + */ + public ResultBean submit(AdSalecarpulApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean stringResultBean = saveOrUpdateDto(dto); + if (!stringResultBean.getSuccess()) { + return rb.setMsg(stringResultBean.getData()); + } + String businessSid = stringResultBean.getData(); + + SubmitDto submitDto = new SubmitDto(); + submitDto.setUserSid(dto.getCreateBySid()); + submitDto.setBusinessSid(businessSid); + + Map formVariables = new HashMap<>(); + formVariables = getMap(formVariables, businessSid); + submitDto.setFormVariables(formVariables); + submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); + submitDto.setNextTaskId(dto.getTaskId()); + submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); + return oaFormService.submit(submitDto); + } + + /** + * 办理（同意） + * + * @param dto + * @return + */ + public ResultBean complete(CompleteDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); + BeanUtil.copyProperties(dto, businessVariablesDto); + return oaFormService.complete(businessVariablesDto); + } + + /** + * 驳回 + * + * @param dto + * @return + */ + public ResultBean reject(TaskDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + return oaFormService.reject(dto); + } + + public ResultBean getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 + ResultBean rb = ResultBean.fireFail(); + + // 获取next值和formVariables + int next = query.getNext(); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); + query.setFormVariables(formVariables); + + // 校验next参数是否有效（只允许0或1） + if (next != 0 && next != 1) { + return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息 + } + + // 获取节点名称 + String data = getNodeName(query, next); + + // 如果data为null，表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 + return rb.success().setData(data); + } + + /** + * 网关参数组成 + * + * @param formVariables + * @param sid + * @return + */ + public Map getMap(Map formVariables, String sid) { + Map appMap = new HashMap<>(); + appMap.put("sid", sid); + /*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid); + appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid); + appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle"); + appMap.put("agreeUrl", "oa/v1/HrHireApply/complete"); + appMap.put("stopUrl", "oa/v1/oaform/breakProcess"); + appMap.put("rejectUrl", "oa/v1/HrHireApply/reject"); + appMap.put("recallUrl", "oa/v1/oaform/revokeProcess"); + appMap.put("signUrl", "oa/v1/oaform/delegate"); + appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/ + appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl()); + appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl()); + appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl()); + appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl()); + appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl()); + formVariables.put("app", appMap); + //根据组织查询是否是分公司 + OaForm oaForm = oaFormService.fetchBySid(sid); + AdSalecarpulApply adSalecarpulApply = fetchBySid(sid); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData(); + //是否是分公司 + formVariables.put("isTrue", sysOrganization.getIsDept() == 0); + return formVariables; + } + + /** + * 根据next的值获取前一个节点或下一个节点的名称。 + * + * @param query 包含查询所需参数的NodeQuery对象 + * @param next 参数，0表示上一环节，1表示下一环节 + * @return 节点名称，如果失败则返回null + */ + private String getNodeName(NodeQuery query, int next) { + // 根据next值选择相应的服务方法获取节点信息 + ResultBean> resultBean = (next == 0) + ? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点 + : oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点 + // 如果服务调用成功 + if (resultBean.getSuccess()) { + // 清除结果列表中的null值，避免空节点 + resultBean.getData().removeAll(Collections.singleton(null)); + // 如果结果列表非空，返回第一个节点的名称 + if (!resultBean.getData().isEmpty()) { + return resultBean.getData().get(0).getName(); + } + } else { + // 如果服务调用失败，返回null + return null; + } + // 如果结果为空，返回null + return null; + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyVo.java new file mode 100644 index 0000000000..64e9f01c49 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyVo.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpulapply; + +import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailVo; +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 AdSalecarpulApplyVo implements Vo { + + private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +// private String testPage; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetail.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetail.java new file mode 100644 index 0000000000..8c766e192a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetail.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpuldetail; + +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: 1(1)
+ * File: AdSalecarpulDetail.java
+ * Class: com.yxt.anrui.oa.api.adsalecarpuldetail.AdSalecarpulDetail
+ * Description: 销售人员固定私车公用列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-26 11:41:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售人员固定私车公用列表", description = "销售人员固定私车公用列表") +@TableName("ad_salecarpul_detail") +public class AdSalecarpulDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailDto.java new file mode 100644 index 0000000000..6bf5027fd3 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailDto.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpuldetail; + + +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: 1(1)
+ * File: AdSalecarpulDetailDto.java
+ * Class: com.yxt.anrui.oa.api.adsalecarpuldetail.AdSalecarpulDetailDto
+ * Description: 销售人员固定私车公用列表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-26 11:41:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售人员固定私车公用列表 数据传输对象", description = "销售人员固定私车公用列表 数据传输对象") +public class AdSalecarpulDetailDto implements Dto { + + private List detailFiles = new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailMapper.java new file mode 100644 index 0000000000..5c3c0235bb --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailMapper.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpuldetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import java.util.List; + +@Mapper +public interface AdSalecarpulDetailMapper extends BaseMapper { + + List getUpdateInit(String sid); + + @Select("select * from ad_salecarpul_detail where mainSid = #{mainSid}") + List selectByMainSid(String mainSid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailMapper.xml new file mode 100644 index 0000000000..45688b2195 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailMapper.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailService.java new file mode 100644 index 0000000000..e1ba0a9009 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailService.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpuldetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.feign.file.OaFileEnum; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + +@Service +public class AdSalecarpulDetailService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdSalecarpulDetail adSalecarpulDetail = new AdSalecarpulDetail(); + BeanUtil.copyProperties(details, adSalecarpulDetail); + adSalecarpulDetail.setMainSid(sid); + baseMapper.insert(adSalecarpulDetail); + List detailFiles = details.getDetailFiles(); + saveFiles(adSalecarpulDetail.getSid(), detailFiles, OaFileEnum.ADSALECARPULAPPLY.getAttachType(), ""); + }); + } + } + + public List getUpdateInit(String sid) { + List adSalecarpulDetailVos = baseMapper.getUpdateInit(sid); + for (AdSalecarpulDetailVo adSalecarpulDetailVo : adSalecarpulDetailVos) { + List detailFiles = oaAppendixService.selectByLinkSid(adSalecarpulDetailVo.getSid()); + adSalecarpulDetailVo.setDetailFiles(detailFiles); + } + return adSalecarpulDetailVos; + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailVo.java new file mode 100644 index 0000000000..427c428c2e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulDetailVo.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpuldetail; + + +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: 1(1)
+ * File: AdSalecarpulDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adsalecarpuldetail.AdSalecarpulDetailVo
+ * Description: 销售人员固定私车公用列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-26 11:41:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售人员固定私车公用列表 视图数据对象", description = "销售人员固定私车公用列表 视图数据对象") +public class AdSalecarpulDetailVo implements Vo { + + private String sid; // sid + + private List detailFiles = new ArrayList<>(); +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulListDetailVo.java new file mode 100644 index 0000000000..dc49c8552e --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpuldetail/AdSalecarpulListDetailVo.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adsalecarpuldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: 1(1)
+ * File: AdSalecarpulDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adsalecarpuldetail.AdSalecarpulDetailVo
+ * Description: 销售人员固定私车公用列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-02-26 11:41:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售人员固定私车公用列表 视图数据对象", description = "销售人员固定私车公用列表 视图数据对象") +public class AdSalecarpulListDetailVo implements Vo { + + private String sid; // sid + + private List detailFiles = new ArrayList<>(); +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApply.java index d9051ff8c2..b4324313d5 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApply.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApply.java @@ -31,28 +31,15 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: yxt-oa(1)
- * File: AdSenpircarpulApply.java
- * Class: com.yxt.anrui.oa.api.adsenpircarpulapply.AdSenpircarpulApply
- * Description: 总经理级固定私车公用申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2025-02-20 11:28:22
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "总经理级固定私车公用申请", description = "总经理级固定私车公用申请") @TableName("ad_senpircarpul_apply") public class AdSenpircarpulApply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("基础表单sid") + @ApiModelProperty("基础表单sid") private String formSid; // 基础表单sid - @ApiModelProperty("关联审批sid列表,英文逗号分隔") + @ApiModelProperty("关联审批sid列表,英文逗号分隔") private String linkFormSids; // 关联审批sid列表,英文逗号分隔 } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java index 34cb963872..566fc10b75 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java @@ -22,7 +22,7 @@ public enum OaFileEnum { ADFROCKALLOTAPPLY("013", "工装订制配发附件"), ADPIRCARPULAPPLY("014", "临时私车公用附件"), ADSENPIRCARPULAPPLY("015", "总经理级固定私车公用附件"), - a("016", "销售人员固定私车公用方案附件"), + ADSALECARPULAPPLY("016", "销售人员固定私车公用方案附件"), ADFETEAPPLY("017", "商务宴请事前附件"), ; From ff931398ecea6400a96cb37205e08a04f13e26a9 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 26 Feb 2025 17:24:10 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=AE=A4=E6=AC=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AC=BE=E9=A1=B9=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=E8=AE=A4=E6=AC=BE=E9=87=91=E9=A2=9D=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 8dea604160..78a21c2f86 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -52,14 +52,19 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.crm.api.crmcustomertemp.*; +import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempDto; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.as.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.*; -import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; -import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; @@ -96,9 +101,6 @@ import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; -import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; -import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo; -import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord; import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory; import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistoryFeign; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; @@ -106,15 +108,11 @@ import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryFei import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; -import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsForOverDue; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign; -import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign; import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo; -import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto; @@ -123,7 +121,10 @@ import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.*; +import com.yxt.common.base.utils.HanZiConverterPinYin; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.WordConvertUtils; +import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -5833,6 +5834,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Wed, 26 Feb 2025 17:37:52 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=94=AE=E5=90=8E=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E9=80=89=E6=8B=A9=E9=94=80=E5=94=AE=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index dc788688d7..94423a151e 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -163,6 +163,7 @@ s.goodsAmount, s.addAmount, s.discountAmount, + s.settleAmount, date_format(s.settleTime, '%Y-%m-%d') as settleDate from sms_sales_bill AS s From 1844a79bbfa90fe869d8e44f10a3ac41dfbb096a Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Feb 2025 17:38:40 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/biz/sysuser/SysUserMapper.xml | 2 ++ .../anrui/oa/api/AdPircarpulApplyRest.java | 2 +- .../anrui/oa/api/AdSalecarpulApplyRest.java | 4 +-- .../oa/biz/adfeteapply/AdFeteApplyMapper.xml | 2 +- .../biz/adfeteapply/AdFeteApplyService.java | 2 +- .../oa/biz/adfetedetail/AdFeteDetailDto.java | 4 +-- .../biz/adfetedetail/AdFeteDetailMapper.xml | 4 +-- .../biz/adfetedetail/AdFeteDetailService.java | 2 ++ .../oa/biz/adfetedetail/AdFeteDetailVo.java | 4 +-- .../biz/adfetedetail/AdFeteListDetailVo.java | 3 ++- .../AdPircarpulApplyMapper.xml | 3 --- .../AdPircarpulDetailService.java | 6 +++++ .../AdSalecarpulApplyDetailsVo.java | 4 +-- .../AdSalecarpulApplyMapper.java | 3 +-- .../AdSalecarpulApplyMapper.xml | 26 +++++-------------- .../AdSalecarpulApplyService.java | 21 ++++++++++----- .../AdSenpircarpulApplyMapper.xml | 4 +-- 17 files changed, 48 insertions(+), 48 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 2f582d15a9..c0413d3deb 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -481,10 +481,12 @@ #{deptSid}, '%' ) + AND st.name LIKE CONCAT( '%', #{name}, '%' ) + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java index 0e49cab1e7..a60fec072b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java @@ -39,7 +39,7 @@ import javax.validation.Valid; @Api(tags = "临时私车公用申请") @RestController -@RequestMapping("v1/adpircarpulapply") +@RequestMapping("v1/privateCarPublicUseapply") public class AdPircarpulApplyRest { @Autowired diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java index eb383a768c..1a3e5e5f95 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java @@ -40,7 +40,7 @@ import javax.validation.Valid; @Api(tags = "销售人员固定私车公用申请") @RestController -@RequestMapping("v1/adsalecarpulapply") +@RequestMapping("v1/salesPrivateCarPublicUse") public class AdSalecarpulApplyRest { @Autowired @@ -73,7 +73,7 @@ public class AdSalecarpulApplyRest { @ApiOperation("详情") @GetMapping("/details/{sid}") - ResultBean details(@PathVariable("sid") String sid + ResultBean details(@PathVariable("sid") String sid , @RequestParam(value = "application", required = false) String application) { return adSalecarpulApplyService.details(sid,application); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml index 113d5ff272..84d7204cee 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml @@ -18,7 +18,7 @@ select sid, - deptSid, - deptName, + deptSid as deptKey, + deptName as deptValue, banquetDate, banquetNum, banquetObject, diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java index 58f20e1dd2..afc3ea6dc5 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java @@ -48,6 +48,8 @@ public class AdFeteDetailService extends MybatisBaseService { AdFeteDetail adFeteDetail = new AdFeteDetail(); BeanUtil.copyProperties(details, adFeteDetail); + adFeteDetail.setDeptSid(details.getDeptKey()); + adFeteDetail.setDeptName(details.getDeptValue()); adFeteDetail.setMainSid(sid); baseMapper.insert(adFeteDetail); }); diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java index 2c133ab07d..c593591f63 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java @@ -40,8 +40,8 @@ public class AdFeteDetailVo implements Vo { @ApiModelProperty("部门") private FormCommon deptObj; - private String deptSid; - private String deptName; + private String deptKey; + private String deptValue; @ApiModelProperty("宴请时间") private String banquetDate; @ApiModelProperty("宴请人数") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java index a738f1d8df..6be3a28e6c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.oa.biz.adfetedetail; +import com.yxt.anrui.oa.biz.oaform.FormCommon; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +39,7 @@ public class AdFeteListDetailVo implements Vo { private String sid; @ApiModelProperty("部门") - private String deptName; + private String deptValue; @ApiModelProperty("宴请时间") private String banquetDate; @ApiModelProperty("宴请人数") diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml index 62b1feae12..41dc65aecb 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml @@ -18,11 +18,8 @@ select remarks, sid - from ad_pircarpul_apply + from ad_salecarpul_apply where sid = #{sid} - + - - + select sid + from ad_salecarpul_detail where mainSid = #{sid} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java index 5b5d3b4590..3a148a8aae 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java @@ -26,10 +26,12 @@ package com.yxt.anrui.oa.biz.adsalecarpulapply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo; import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo; import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailDto; import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailService; import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailVo; +import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo; import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; import com.yxt.anrui.oa.biz.oaform.*; import com.yxt.anrui.oa.biz.oaform.flowable.*; @@ -134,19 +136,24 @@ public class AdSalecarpulApplyService extends MybatisBaseService details(String sid, String application) { + public ResultBean details(String sid, String application) { ResultBean rb = ResultBean.fireFail(); - AdPircarpulApplyDetailsVo adPircarpulApplyDetailsVo = baseMapper.details(sid); - if (adPircarpulApplyDetailsVo == null) { + AdSalecarpulApplyDetailsVo adSalecarpulApplyDetailsVo = baseMapper.details(sid); + if (adSalecarpulApplyDetailsVo == null) { return rb.setMsg("该申请不存在"); } List files = oaAppendixService.selectByLinkSid(sid, "图片"); List appes = oaAppendixService.selectByLinkSid(sid, "文件"); - adPircarpulApplyDetailsVo.setFiles(files); - adPircarpulApplyDetailsVo.setAppes(appes); + adSalecarpulApplyDetailsVo.setFiles(files); + adSalecarpulApplyDetailsVo.setAppes(appes); + //子表附件赋值 + for (AdSalecarpulListDetailVo adSalecarpulListDetailVo : adSalecarpulApplyDetailsVo.getList()) { + List detailFiles = oaAppendixService.selectByLinkSid(adSalecarpulListDetailVo.getSid()); + adSalecarpulListDetailVo.setDetailFiles(detailFiles); + } //基础字段赋值 - BeanUtil.copyProperties(oaFormService.getDetails(sid), adPircarpulApplyDetailsVo); - return rb.success().setData(adPircarpulApplyDetailsVo); + BeanUtil.copyProperties(oaFormService.getDetails(sid), adSalecarpulApplyDetailsVo); + return rb.success().setData(adSalecarpulApplyDetailsVo); } /** diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml index 6f745dcc1c..98b4d56e09 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml @@ -5,7 +5,7 @@ @@ -21,7 +21,7 @@ userName as userValue, deptName as deptValue, postName as jobValue - from ad_pircarpul_detail + from ad_senpircarpul_detail where mainSid = #{sid} \ No newline at end of file From aa6e75dca56e3c2b58eff593a6ab842137b21023 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Feb 2025 17:51:55 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateService.java | 6 +++--- .../scm/biz/scmvehrebate/ScmVehRebateRest.java | 18 ------------------ .../biz/scmvehrebate/ScmVehRebateService.java | 4 ++-- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index c44937816b..e068dfaab2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -210,7 +210,7 @@ public class ScmSpecialRebateService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); for (ScmSpecialRebateVo record : pagging.getRecords()) { if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) { - if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) { + if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); } else { record.setSecondCheckState("否"); @@ -556,7 +556,7 @@ public class ScmSpecialRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())) { + if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); } else { record.setSecondCheckState("否"); @@ -695,7 +695,7 @@ public class ScmSpecialRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())) { + if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); } else { record.setSecondCheckState("否"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 929b4805ec..cad5954d44 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java @@ -25,8 +25,6 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehrebate; -import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo; -import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery; import com.yxt.anrui.scm.api.scmvehrebate.*; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; @@ -35,36 +33,20 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.compress.utils.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.FileOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; import java.util.List; -/** - * Project: anrui-scm(单车返利)
- * File: ScmVehRebateFeignFallback.java
- * Class: com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateRest
- * Description: 单车返利表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-24 09:01:54
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "单车返利表") @RestController @RequestMapping("v1/scmvehrebate") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 47885c93ec..54cb82f64b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -210,7 +210,7 @@ public class ScmVehRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())) { + if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); } else { record.setSecondCheckState("否"); @@ -660,7 +660,7 @@ public class ScmVehRebateService extends MybatisBaseService 0 && "是".equals(record.getIsAdjustment())) { + if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { record.setSecondCheckState("是"); } else { record.setSecondCheckState("否");