diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index 3fd746cec7..d01dc2de8f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -1703,8 +1703,10 @@ public class BusBillApplicationService extends MybatisBaseService \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 3923bc384b..d9c5f3a06e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -350,8 +350,36 @@ public class InvoicedService { BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(query.getSid()).getData(); BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(query.getSid()).getData(); List busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(query.getSid()).getData(); + if ("2".equals(busDeliveredApply.getPaymentMethodKey()) && StringUtils.isBlank(data.getSid())){ + String userSid = query.getUserSid(); + String orgPath = query.getOrgPath(); + List vins = query.getVins(); + for (BusDeliveredApplyDetails busDeliveredApplyDetail : busDeliveredApplyDetails) { + vins.add(busDeliveredApplyDetail.getVinSid()); + } + ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(busDeliveredApply.getContractNo(),vins); + if(billApplicationIInfoVoResultBean.getData() != null){ + BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); + BeanUtil.copyProperties(billApplicationIInfoVoss,billApplicationIInfoVo); + } + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); + billApplicationIInfoVo.setCkSid(query.getSid()); + billApplicationIInfoVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName()); + billApplicationIInfoVo.setShowBtn(true); + billApplicationIInfoVo.setInvoiceStateKey("001"); + billApplicationIInfoVo.setInvoiceState("正常开票"); + billApplicationIInfoVo.setDate(DateUtil.formatDate(new Date())); + billApplicationIInfoVo.setShowXsState(true); + return rb.success().setData(billApplicationIInfoVo); + } billApplicationIInfoVo.setShowValueCustomer(data.getShowValueCustomer()); if (data != null) { + if ("2".equals(busDeliveredApply.getPaymentMethodKey())){ + billApplicationIInfoVo.setNoEditInvoiceTypeAndName(true); + billApplicationIInfoVo.setNoEditInvoiceMoney(true); + } + billApplicationIInfoVo.setRemarks(data.getRemarks()); billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); billApplicationIInfoVo.setSid(data.getSid()); @@ -471,28 +499,6 @@ public class InvoicedService { } } else { - if ("2".equals(busDeliveredApply.getPaymentMethodKey())){ - String userSid = query.getUserSid(); - String orgPath = query.getOrgPath(); - List vins = query.getVins(); - if(vins.size() == 0){ - return rb.setMsg("请选择车辆"); - } - ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins); - if(billApplicationIInfoVoResultBean.getData() != null){ - BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); - BeanUtil.copyProperties(billApplicationIInfoVoss,billApplicationIInfoVo); - } - SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); - SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); - billApplicationIInfoVo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName()); - billApplicationIInfoVo.setShowBtn(true); - billApplicationIInfoVo.setInvoiceStateKey("001"); - billApplicationIInfoVo.setInvoiceState("正常开票"); - billApplicationIInfoVo.setDate(DateUtil.formatDate(new Date())); - billApplicationIInfoVo.setShowXsState(true); - return rb.success().setData(billApplicationIInfoVo); - } billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId()); diff --git a/yxt-as-ui/src/api/operation/pendingclaim.js b/yxt-as-ui/src/api/operation/pendingclaim.js index a8ac47c4cd..f4ced4e853 100644 --- a/yxt-as-ui/src/api/operation/pendingclaim.js +++ b/yxt-as-ui/src/api/operation/pendingclaim.js @@ -4,10 +4,18 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/as/v1/asbusrepairbillreversesettle/listPage', + url: '/as/v1/AsBusrepairBill/billPageList', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } }) }, + save: function(data) { + return request({ + url: '/as/v1/AsBusclaimBill/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } } diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 67300e3eba..c52ec6616a 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -98,6 +98,12 @@ export const constantRoutes = [{ name: 'WorkSLRSettlement', meta: { title: '工单反结算管理', noCache: true } }, + { + path: '/pendingclaim/pendingclaim', + component: () => import('@/views/operation/pendingclaim/pendingclaim.vue'), + name: 'PendingClaim', + meta: { title: '待索赔维修工单', noCache: true } + }, ] }, { diff --git a/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue b/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue index 4671a0f5a8..01674953b7 100644 --- a/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue +++ b/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue @@ -27,8 +27,9 @@ - - + + + @@ -120,6 +121,44 @@ + + + + +
维修工单编号
+ {{ formobj.repairBillNo }} + + + + +
客户名称
+ {{ formobj.customerName }} + + + + +
车牌号
+ {{ formobj.vehMark }} + + + + +
车架号
+ {{ formobj.vinNo }} + + + + +
厂家索赔单号
+ + + + +
+ 确定 + 取消 +
+ @@ -128,6 +167,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import req from '@/api/operation/pendingclaim' +import { typeValues } from '@/api/Common/dictcommons' export default { name: 'PendingClaim', @@ -139,6 +179,7 @@ export default { data() { return { btndisabled: false, + dialogVisible: false, btnList: [ { type: 'primary', @@ -161,7 +202,8 @@ export default { tableKey: 0, list: [], sids: [], // 用于导出的时候保存已选择的SIDs - supplier_list: [], + multipleSelection: [], + billType_list: [], FormLoading: false, listLoading: false, // 翻页 @@ -193,6 +235,16 @@ export default { groupName: '', mainRepairers: '' } + }, + formobj: { + repairBillSid: '', + repairBillNo: '', + customerName: '', + vehMark: '', + vinNo: '', + billNo: '', + createBySid: '', + orgPath: '' } } }, @@ -206,6 +258,11 @@ export default { }, methods: { init() { + typeValues({ type: 'billType' }).then((res) => { + if (res.success) { + this.billType_list = res.data + } + }) }, // 搜索条件效果 clicksearchShow() { @@ -232,6 +289,7 @@ export default { // 信息条数 获取点击时当前的sid handleSelectionChange(row) { const aa = [] + this.multipleSelection = row row.forEach(element => { aa.push(element.sid) }) @@ -298,11 +356,44 @@ export default { }, toMaintain() { if (this.sids.length === 1) { - + this.dialogVisible = true + this.formobj.repairBillNo = this.multipleSelection[0].billNo + this.formobj.repairBillSid = this.multipleSelection[0].sid + this.formobj.customerName = this.multipleSelection[0].customerName + this.formobj.vehMark = this.multipleSelection[0].vehMark + this.formobj.vinNo = this.multipleSelection[0].vinNo } else { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } }, + handleConfirm() { + if (this.formobj.billNo === '') { + this.$message({ showClose: true, type: 'error', message: '厂家索赔单号不能为空' }) + return + } + this.formobj.createBySid = window.sessionStorage.getItem('userSid') + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') + req.save(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + this.handleClose() + } + }) + }, + handleClose() { + this.dialogVisible = false + this.formobj = { + repairBillSid: '', + repairBillNo: '', + customerName: '', + vehMark: '', + vinNo: '', + billNo: '', + createBySid: '', + orgPath: '' + } + }, doClose() { this.$store.dispatch('tagsView/delView', this.$route) this.$router.go(-1) @@ -311,4 +402,10 @@ export default { } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java index 9bb78d66b2..3f3f164a28 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java @@ -31,6 +31,7 @@ import com.yxt.common.core.dto.Dto; import com.fasterxml.jackson.annotation.JsonFormat; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -88,7 +89,7 @@ public class AsArrearsoutApplyDto implements Dto { @ApiModelProperty("工单欠款金额") private BigDecimal pairArrearsMoney; // 工单欠款金额 @ApiModelProperty("附件路径") - private List filePaths; // 附件路径(多个附件之间英文逗号隔开) + private List filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java index b232a51757..aa5ae92bfb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyQuery.java @@ -53,21 +53,30 @@ import lombok.Data; @ApiModel(value = "欠款出厂申请 查询条件", description = "欠款出厂申请 查询条件") public class AsArrearsoutApplyQuery implements Query { + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + @ApiModelProperty("办结开始日期") + private String finishStartTime; + @ApiModelProperty("办结结束日期") + private String finishEndTime; @ApiModelProperty("工单编号") private String pairBillNo; @ApiModelProperty("工单类型") - private String billType; - @ApiModelProperty("科目名称") - private String subject; + private String billTypeValue; @ApiModelProperty("客户姓名") private String customerName; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("车牌号") private String vehMark; - - private String userSid; - private String orgPath; - private String menuUrl; - private String menuSid; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java index ebf552050b..8f73473cc3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java @@ -59,26 +59,36 @@ public class AsArrearsoutApplyVo implements Vo { private String nodeState; @ApiModelProperty("单据编号") private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; @ApiModelProperty("工单编号") private String pairBillNo; @ApiModelProperty("工单类型") - private String billType; - @ApiModelProperty("科目名称") - private String subject; + private String billTypeValue; @ApiModelProperty("客户姓名") private String customerName; + @ApiModelProperty("客户联系电话") + private String customerPhone; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("车牌号") private String vehMark; @ApiModelProperty("工单应收金额") private BigDecimal pairReceivableMoney; + @ApiModelProperty("工单已交金额") + private BigDecimal pairReceivedMoney; @ApiModelProperty("工单欠款金额") private BigDecimal pairArrearsMoney; - @ApiModelProperty("制单人姓名") - private String createByName; - @ApiModelProperty("发起日期") - private String createTime; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java index b48716b43f..3bf180366d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java @@ -67,4 +67,6 @@ public interface AsArrearsoutApplyMapper extends BaseMapper { int updateFlowFiled(Map map); String selectNum(String billNo); + + int selectBySid(String join); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml index 42302ea165..089c1b77c0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml @@ -36,4 +36,11 @@ order by billNo desc limit 1 + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java index 590e193f9d..a2366ca2d2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java @@ -84,11 +84,9 @@ public class AsArrearsoutApplyRest { } @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - asArrearsoutApplyService.delBySids(sids); - return rb.success(); + return asArrearsoutApplyService.delAll(sids); } @ApiOperation("根据SID获取一条记录") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java index b2f354ac58..6c22b866fd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java @@ -30,6 +30,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asarrearsoutapply.*; import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*; import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.flowable.flow.*; @@ -46,17 +47,13 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; -import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyQuery; -import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyVo; -import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDetailsVo; -import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApplyDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -94,58 +91,29 @@ public class AsArrearsoutApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsArrearsoutApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - //========================================数据授权开始 - if (StringUtils.isNotBlank(query.getMenuUrl())) { - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setMenuSid(query.getMenuSid()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("useOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("billNo", query.getBillNo()); } if (StringUtils.isNotBlank(query.getPairBillNo())){ qw.like("pairBillNo",query.getPairBillNo()); } - if (StringUtils.isNotBlank(query.getBillType())){ - qw.like("billType",query.getBillType()); - } - if (StringUtils.isNotBlank(query.getSubject())){ - qw.like("subject",query.getSubject()); + if (StringUtils.isNotBlank(query.getBillTypeValue())){ + qw.like("billTypeValue",query.getBillTypeValue()); } if (StringUtils.isNotBlank(query.getCustomerName())){ qw.like("customerName",query.getCustomerName()); @@ -156,6 +124,16 @@ public class AsArrearsoutApplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String finishStartTime = query.getFinishStartTime(); + String finishEndTime = query.getFinishEndTime(); + qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishEndTime), "date_format (finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" + ); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -193,6 +171,13 @@ public class AsArrearsoutApplyService extends MybatisBaseService filePaths = dto.getFilePaths(); + String url = ""; + for (AsArrearsoutApplyFile asArrearsoutApplyFile : filePaths) { + String filePath = asArrearsoutApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + entity.setFilePath(url); baseMapper.insert(entity); return entity.getSid(); } @@ -204,6 +189,13 @@ public class AsArrearsoutApplyService extends MybatisBaseService filePaths = dto.getFilePaths(); + String url = ""; + for (AsArrearsoutApplyFile asArrearsoutApplyFile : filePaths) { + String filePath = asArrearsoutApplyFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), ""); + url = url + filePath + ","; + } + entity.setFilePath(url); baseMapper.updateById(entity); } @@ -211,6 +203,16 @@ public class AsArrearsoutApplyService extends MybatisBaseService urlPahts = new ArrayList<>(); + for (String path : filePaths) { + String url = fileUploadComponent.getUrlPrefix() + path; + AsArrearsoutApplyFile asArrearsoutApplyFile = new AsArrearsoutApplyFile(); + asArrearsoutApplyFile.setUrl(url); + urlPahts.add(asArrearsoutApplyFile); + } + vo.setFilePaths(urlPahts); return vo; } @@ -508,4 +510,15 @@ public class AsArrearsoutApplyService extends MybatisBaseService 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + return rb.success(); + } } \ No newline at end of file