diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckQuery.java index a9aea91fbf..e25183de2d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckQuery.java @@ -15,4 +15,14 @@ public class AsBusclaimCheckQuery implements Query { private static final long serialVersionUID = -5046272268264726533L; @ApiModelProperty("维修工单号") private String repairBillNo; + @ApiModelProperty("差异金额开始范围") + private String cyStartMoney; + @ApiModelProperty("差异金额结束范围") + private String cyEndMoney; + + @ApiModelProperty("组织全路径") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckVo.java index 664bc46a86..fc21ad1ca3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheck/AsBusclaimCheckVo.java @@ -72,4 +72,7 @@ public class AsBusclaimCheckVo { //合计 private String all2; + + //差异合计 + private String all3; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApply.java index 74473e8150..40685be9f0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApply.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApply.java @@ -19,9 +19,9 @@ public class AsBusclaimCheckApply extends BaseEntity { @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("申请部门sid") - private String createDeptSid; - @ApiModelProperty("申请部门") - private String createDeptName; + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("附件") private String file; @ApiModelProperty("创建组织sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java index 9ef8314b0b..f3ecd3cd10 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDetailsVo.java @@ -1,11 +1,13 @@ package com.yxt.anrui.as.api.asbusclaimcheckapply; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailVo; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -19,17 +21,37 @@ public class AsBusclaimCheckApplyDetailsVo { private String sid; private String createBySid; private String createByName; -// private String orgPath; - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date createTime; @ApiModelProperty("申请部门sid") - private String createDeptSid; - @ApiModelProperty("申请部门") - private String createDeptName; + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; - private List fileList = new ArrayList<>(); + private List fileList = new ArrayList<>(); private String remarks; - private List detailList = new ArrayList<>(); + private String billNo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("办结日期") + private String closeDate; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("任务iD") + private String taskId; + @ApiModelProperty("环节iD") + private String taskDefKey; + @ApiModelProperty("流程状态") + private String nodeState; + + private List detailsList = new ArrayList<>(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java index 229f621aa9..c6189217d3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyDto.java @@ -18,17 +18,36 @@ public class AsBusclaimCheckApplyDto { private String sid; private String createBySid; private String createByName; -// private String orgPath; private String createTime; @ApiModelProperty("申请部门sid") - private String createDeptSid; - @ApiModelProperty("申请部门") - private String createDeptName; + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; - private List fileList = new ArrayList<>(); + private List fileList = new ArrayList<>(); private String remarks; + private String billNo; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("办结日期") + private String closeDate; + @ApiModelProperty("实例id") + private String procInstId; + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("任务iD") + private String taskId; + @ApiModelProperty("环节iD") + private String taskDefKey; + @ApiModelProperty("流程状态") + private String nodeState; + private List detailsList = new ArrayList<>(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java new file mode 100644 index 0000000000..6a68631ce3 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyFile.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.as.api.asbusclaimcheckapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/5/11 + **/ +@Data +public class AsBusclaimCheckApplyFile { + + private String url; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyQuery.java index 6ab36b426d..537b160675 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyQuery.java @@ -15,8 +15,8 @@ public class AsBusclaimCheckApplyQuery implements Query { @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("申请部门") - private String createDeptName; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("单据编号") @@ -30,6 +30,8 @@ public class AsBusclaimCheckApplyQuery implements Query { @ApiModelProperty("办结日期结束时间") private String closeDateEnd; - private String createBySid; private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java index 691127d699..053cdfe98e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapply/AsBusclaimCheckApplyVo.java @@ -22,8 +22,8 @@ public class AsBusclaimCheckApplyVo { private String billNo; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("申请部门") - private String createDeptName; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("申请日期") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java index c3abb8aaf1..57553cbc08 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetail.java @@ -41,8 +41,9 @@ public class AsBusclaimCheckApplyDetail extends BaseEntity { private BigDecimal claimOtherAmount; @ApiModelProperty("预留") private BigDecimal reserved; - @ApiModelProperty("原因") - private String reason; - + @ApiModelProperty("原因key") + private String reasonKey; + @ApiModelProperty("原因value") + private String reasonValue; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java index 34d107bdcf..df7e1a9de0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailDto.java @@ -37,6 +37,8 @@ public class AsBusclaimCheckApplyDetailDto { private String claimOtherAmount; @ApiModelProperty("预留") private String reserved; - @ApiModelProperty("原因") - private String reason; + @ApiModelProperty("原因key") + private String reasonKey; + @ApiModelProperty("原因value") + private String reasonValue; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java index 1474b707f7..aa744e9a95 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimcheckapplydetail/AsBusclaimCheckApplyDetailVo.java @@ -37,8 +37,10 @@ public class AsBusclaimCheckApplyDetailVo { private String claimOtherAmount; @ApiModelProperty("预留") private String reserved; - @ApiModelProperty("原因") - private String reason; + @ApiModelProperty("原因key") + private String reasonKey; + @ApiModelProperty("原因value") + private String reasonValue; //工单：工时费 private String hourAmount1; @@ -75,4 +77,10 @@ public class AsBusclaimCheckApplyDetailVo { //合计 private String all2; + + //差异合计 + private String all3; + + //差异调整合计 + private String all4; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java index 4a292383d3..4b8cbc08b6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java @@ -18,9 +18,9 @@ public class AsBusclaimInvoiceBill extends BaseEntity { @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("申请部门sid") - private String createDeptSid; - @ApiModelProperty("申请部门") - private String createDeptName; + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("开票sid") private String invoiceSid; @ApiModelProperty("开票名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java index ccd22f4c8b..099e1f6ecf 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDetailsVo.java @@ -38,9 +38,9 @@ public class AsBusclaimInvoiceBillDetailsVo { private String nodeState; @ApiModelProperty("申请部门sid") - private String createDeptSid; - @ApiModelProperty("申请部门") - private String createDeptName; + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("开票sid") private String invoiceSid; @ApiModelProperty("开票名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java index 98caa24cef..973529a51f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java @@ -32,9 +32,9 @@ public class AsBusclaimInvoiceBillDto { private String nodeState; @ApiModelProperty("申请部门sid") - private String createDeptSid; - @ApiModelProperty("申请部门") - private String createDeptName; + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("开票sid") private String invoiceSid; @ApiModelProperty("开票名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java index da8462bccc..0bb4e85afb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java @@ -15,8 +15,8 @@ public class AsBusclaimInvoiceBillQuery implements Query { @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("申请部门") - private String createDeptName; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("单据编号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java index 4fc4decda5..3629ddbe05 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java @@ -21,8 +21,8 @@ public class AsBusclaimInvoiceBillVo { private String billNo; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("申请部门") - private String createDeptName; + @ApiModelProperty("申请部门名称") + private String deptName; @ApiModelProperty("申请人") private String createByName; @ApiModelProperty("申请日期") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckMapper.xml index 0a59be5054..5efa37cf2b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheck/AsBusclaimCheckMapper.xml @@ -2,13 +2,36 @@ @@ -41,4 +42,12 @@ WHERE sid = #{sid} + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java index 9e7bbb6cbe..875b5ab54c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java @@ -7,15 +7,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill; +import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckVo; import com.yxt.anrui.as.api.asbusclaimcheckapply.*; import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*; import com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailDto; import com.yxt.anrui.as.api.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailVo; import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill; import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService; import com.yxt.anrui.as.biz.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailMapper; import com.yxt.anrui.as.biz.asbusclaimcheckapplydetail.AsBusclaimCheckApplyDetailService; import com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailService; +import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; +import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables; import com.yxt.anrui.as.feign.flowable.flow.FlowableFeign; import com.yxt.anrui.as.feign.flowable.flow.ProcDefEnum; @@ -28,8 +32,10 @@ import com.yxt.anrui.as.feign.flowable.flowtask.LatestTaskVo; import com.yxt.anrui.as.feign.message.MessageFeign; import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowableQuery; +import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -41,6 +47,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -60,7 +67,7 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService listPage(PagerQuery pagerQuery) { AsBusclaimCheckApplyQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } //ToDo:添加查询条件 //分公司 if (StringUtils.isNotBlank(query.getUseOrgName())) { qw.like("a.useOrgName", query.getUseOrgName()); } //申请部门 - if (StringUtils.isNotBlank(query.getCreateDeptName())) { - qw.like("a.createDeptName", query.getCreateDeptName()); + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("a.deptName", query.getDeptName()); } //申请人 if (StringUtils.isNotBlank(query.getCreateByName())) { @@ -124,36 +172,54 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService saveOrUpdateBill(AsBusclaimCheckApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + dto.setUseOrgSid(dto.getUseOrgSid()); + dto.setUseOrgName(organizationVo.getName()); + dto.setCreateOrgSid(dto.getUseOrgSid()); if (StringUtils.isBlank(sid)) { AsBusclaimCheckApply asBusclaimCheckApply = new AsBusclaimCheckApply(); + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "SPTZ" + organizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); BeanUtil.copyProperties(dto, asBusclaimCheckApply, "sid"); - asBusclaimCheckApply.setCreateBySid(dto.getCreateBySid()); sid = asBusclaimCheckApply.getSid(); - List fileList = dto.getFileList(); + List fileList = dto.getFileList(); fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - asBusclaimCheckApply.setFile(files); + String url = ""; + for (AsBusclaimCheckApplyFile asBusclaimCheckApplyFile : fileList) { + String filePath = asBusclaimCheckApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; } + asBusclaimCheckApply.setFile(url); List detailList = dto.getDetailsList(); detailList.removeAll(Collections.singleton(null)); if (!detailList.isEmpty()) { asBusclaimCheckApplyDetailService.saveOrUpdateDetails(sid, detailList); } + asBusclaimCheckApply.setNodeState("待提交"); baseMapper.insert(asBusclaimCheckApply); - } else { AsBusclaimCheckApply asBusclaimCheckApply = fetchBySid(sid); if (asBusclaimCheckApply == null) { return rb.setMsg("该单据不存在"); } BeanUtil.copyProperties(dto, asBusclaimCheckApply, "sid"); - List fileList = dto.getFileList(); + List fileList = dto.getFileList(); fileList.removeAll(Collections.singleton(null)); - if (!fileList.isEmpty()) { - String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - asBusclaimCheckApply.setFile(files); + String url = ""; + for (AsBusclaimCheckApplyFile asBusclaimCheckApplyFile : fileList) { + String filePath = asBusclaimCheckApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; } + asBusclaimCheckApply.setFile(url); List detailList = dto.getDetailsList(); detailList.removeAll(Collections.singleton(null)); if (!detailList.isEmpty()) { @@ -189,21 +255,27 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService fileList = Arrays.asList(asBusclaimCheckApply.getFile().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - asBusclaimCheckApplyDetailsVo.setFileList(fileList); + List asBusclaimCheckApplyFiles = new ArrayList<>(); + for (String s : fileList) { + AsBusclaimCheckApplyFile asBusclaimCheckApplyFile = new AsBusclaimCheckApplyFile(); + asBusclaimCheckApplyFile.setUrl(s); + asBusclaimCheckApplyFiles.add(asBusclaimCheckApplyFile); + } + asBusclaimCheckApplyDetailsVo.setFileList(asBusclaimCheckApplyFiles); } List detailList = asBusclaimCheckApplyDetailService.selectDetails(sid); detailList.removeAll(Collections.singleton(null)); if (!detailList.isEmpty()) { for (int i = 0; i < detailList.size(); i++) { AsBusclaimCheckApplyDetailVo asBusclaimCheckApplyDetailVo = detailList.get(i); - String billNo = asBusclaimCheckApplyDetailVo.getClaimBillNo(); - AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(billNo); - if (asBusclaimBill != null) { - asBusclaimCheckApplyDetailVo.setHourAmount1(asBusclaimBill.getHourAmount().toString()); - asBusclaimCheckApplyDetailVo.setGoodsAmount1(asBusclaimBill.getGoodsAmount().toString()); - asBusclaimCheckApplyDetailVo.setClaimOutAmount1(asBusclaimBill.getClaimOutAmount().toString()); - asBusclaimCheckApplyDetailVo.setClaimSubsidyAmount1(asBusclaimBill.getClaimSubsidyAmount().toString()); - asBusclaimCheckApplyDetailVo.setClaimOtherAmount1(asBusclaimBill.getClaimOtherAmount().toString()); + AsBusrepairBill asBusrepairBill = asBusrepairBillService.selectByBillNo(asBusclaimCheckApplyDetailVo.getRepairBillNo()); + if (asBusrepairBill != null) { + asBusclaimCheckApplyDetailVo.setHourAmount1("0"); + asBusclaimCheckApplyDetailVo.setGoodsAmount1("0"); + asBusclaimCheckApplyDetailVo.setClaimOutAmount1("0"); + asBusclaimCheckApplyDetailVo.setClaimSubsidyAmount1("0"); + asBusclaimCheckApplyDetailVo.setClaimOtherAmount1("0"); + asBusclaimCheckApplyDetailVo.setAll1("0"); } AsBusclaimInvoiceBillDetail asBusclaimInvoiceBillDetail = asBusclaimInvoiceBillDetailService.fetchBySid(asBusclaimCheckApplyDetailVo.getBillInvoiceDetailSid()); if (asBusclaimInvoiceBillDetail != null) { @@ -212,9 +284,12 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService selectDetails(String sid); List selectByBillSid(String businessSid); + + int selectYkpSpdCount(String repairBillNo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml index 7dc7291a75..105b8323f4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml @@ -29,4 +29,14 @@ from as_busclaim_invoice_bill_detail where billSid = #{businessSid} + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java index e7b7c116c6..fc025a817d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java @@ -34,4 +34,8 @@ public class AsBusclaimInvoiceBillDetailService extends MybatisBaseService selectByBillSid(String businessSid) { return baseMapper.selectByBillSid(businessSid); } + + public int selectYkpSpdCount(String repairBillNo) { + return baseMapper.selectYkpSpdCount(repairBillNo); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index cb45c7a151..2f09bea3d5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -8,6 +8,7 @@ import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -39,4 +40,7 @@ public interface AsBusrepairBillMapper extends BaseMapper { List selectSitemList(String sourceBillSid); IPage billPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Select("select * from as_busrepair_bill where billNo = #{billNo}") + AsBusrepairBill selectOneByBillNo(String billNo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index d6286649d7..798662226d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -858,4 +858,8 @@ public class AsBusrepairBillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public AsBusrepairBill selectByBillNo(String billNo) { + return baseMapper.selectOneByBillNo(billNo); + } }