diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index 3dd547c3b8..1a82b0a612 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -85,8 +85,6 @@ public class FinBillApplication extends BaseEntity { @ApiModelProperty(value = "节点状态") private String nodeState; - @ApiModelProperty(value = "是否高低开") - private Boolean isHighAndLowOpen; @ApiModelProperty(value = "是否延迟开票") private Integer isDelayBill; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxDto.java index 546019d542..6828ba8f81 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxDto.java @@ -63,5 +63,6 @@ public class FinBillApplicationAppendxDto implements Vo { private String fileSize; @ApiModelProperty("文件的路径") private String filePath; - + @ApiModelProperty("附件名称") + private String appendixName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxVo.java index f80c670609..66dd9f9609 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationAppendxVo.java @@ -47,6 +47,8 @@ import lombok.Data; @Data public class FinBillApplicationAppendxVo implements Vo { + @ApiModelProperty("上传时间") + private String createTime; @ApiModelProperty("上传人sid") private String createBySid; @ApiModelProperty("上传人姓名") @@ -63,4 +65,6 @@ public class FinBillApplicationAppendxVo implements Vo { private String fileSize; @ApiModelProperty("文件的路径") private String filePath; + @ApiModelProperty("附件名称") + private String appendixName; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index d56f7a957c..26ee6e027e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -71,16 +71,22 @@ public class FinBillApplicationDetailsVo implements Vo { private String customerName; // 客户名称 @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 + @ApiModelProperty("单台开票状态(0空，1不为空)") + private String oneBillState; // 单台开票状态 @ApiModelProperty("开票金额合计") private String totalBillMoney; // 开票金额合计 @ApiModelProperty("开票状态") private String billState; // 开票状态 + @ApiModelProperty("申请日期") + private String applyDate; // 申请日期 @ApiModelProperty("开票公共表sid") private String billAppPublicSid; // 开票公共表sid + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty(value = "是否延迟开票") + private Integer isDelayBill; @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 @ApiModelProperty("附件信息") - private List finBillApplicationAppendxs; // 附件信息 - @ApiModelProperty("开票申请-附件关联信息") - private List finBillFiles; // 开票申请-附件关联信息 + private List finBillFileVos; // 附件信息 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index dd8196e1ff..d40b612685 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -73,10 +73,10 @@ public class FinBillApplicationDto implements Dto { private String oneBillMoney; // 单台开票金额 @ApiModelProperty("开票金额合计") private String totalBillMoney; // 开票金额合计 + @ApiModelProperty("申请日期") + private String applyDate; // 申请日期 @ApiModelProperty("开票状态") private String billState; // 开票状态 - @ApiModelProperty("附件类型") - private String fileType; // 附件类型 @ApiModelProperty("开票公共表sid") private String billAppPublicSid; // 开票公共表sid @ApiModelProperty("流程定义的id") @@ -85,17 +85,18 @@ public class FinBillApplicationDto implements Dto { private String nodeSid; @ApiModelProperty("流程实例的sid") private String procInstSid; - @ApiModelProperty(value = "是否高低开") - private Boolean isHighAndLowOpen; @ApiModelProperty(value = "是否延迟开票") private String isDelayBill; - - @ApiModelProperty(value = "节点状态") - private String nodeState; + @ApiModelProperty(value = "是否高低开") + private String isHighAndLowOpen; + @ApiModelProperty("备注") + private String remarks; // 备注 @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 - @ApiModelProperty("附件信息") - private List finBillApplicationAppendxs; // 附件信息 - @ApiModelProperty("开票申请-附件关联信息") - private List finBillFiles; // 开票申请-附件关联信息 + @ApiModelProperty("客户开票申请书附件信息") + private List khkpsqsApplicationAppendxs; // 客户开票申请书附件信息 + @ApiModelProperty("开票信息确认书附件信息") + private List kpxxqrsApplicationAppendxs; // 开票信息确认书附件信息 + @ApiModelProperty("车辆登记合同附件信息") + private List cldjhtApplicationAppendxs; // 车辆登记合同附件信息 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index b605221d0b..ded1855671 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -69,11 +69,7 @@ public interface FinBillApplicationFeign { @ResponseBody public ResultBean save(@RequestBody FinBillApplicationDto dto); - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 26b2be4e47..73a38be071 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -61,11 +61,6 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign return ResultBean.fireFail().setMsg("接口anrui-fin/finbillapplication/save无法访问"); } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-fin/finbillapplication/delBySids无法访问"); - } - @Override public ResultBean fetchDetailsBySid(String sid){ ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java index fe3b57c55a..dffa5cae34 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java @@ -84,7 +84,7 @@ public class FinBillApplicationVo implements Vo { @ApiModelProperty(value = "节点状态") private String nodeState; @ApiModelProperty(value = "是否高低开") - private Boolean isHighAndLowOpen; + private String isHighAndLowOpen; @ApiModelProperty(value = "是否延迟开票") private String isDelayBill; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java new file mode 100644 index 0000000000..ca1f9f5b33 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileAppendxVo.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finbillfile; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FinBillFileAppendxVo implements Vo { + + @ApiModelProperty("上传人sid") + private String createBySid; + @ApiModelProperty("上传人姓名") + private String name; + @ApiModelProperty("文件名") + private String fileName; + @ApiModelProperty("文件类型") + private String fileType; + @ApiModelProperty("关联业务对象sid") + private String linkSid; + @ApiModelProperty("附件类型") + private String attachType; + @ApiModelProperty("文件大小") + private String fileSize; + @ApiModelProperty("文件的路径") + private String filePath; + @ApiModelProperty("附件名称") + private String appendixName; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDetailsVo.java index 6ee3bbf154..dd17313e07 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDetailsVo.java @@ -61,4 +61,6 @@ public class FinBillFileDetailsVo implements Vo { private String fileSid; // 附件sid @ApiModelProperty("附件路径") private String fileUrl; // 附件路径 + @ApiModelProperty("文件名称") + private String fileName; // 文件名称 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java index d1363d404c..286f4cf8d6 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java @@ -79,5 +79,5 @@ public interface FinBillFileFeign { @ApiOperation("查看图片") @PostMapping("/fetchFileBySid") @ResponseBody - public ResultBean> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType); + public ResultBean> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java index 4ef31395c6..231359a9e2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeignFallback.java @@ -71,7 +71,7 @@ public class FinBillFileFeignFallback implements FinBillFileFeign { } @Override - public ResultBean> fetchFileBySid(String billAppSid, String fileType) { + public ResultBean> fetchFileBySid(String billAppSid, String fileType) { return null; } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java index baea39e4d1..43edc8d583 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileVo.java @@ -51,6 +51,8 @@ public class FinBillFileVo implements Vo { private String sid; // sid + @ApiModelProperty("上传时间") + private String createTime; // 上传时间 @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 @ApiModelProperty("开票申请单sid") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java index 92275dc24a..31ca1c5bc5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.api.finbillvehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; @@ -56,6 +57,7 @@ public class FinBillVehicleDto implements Dto { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("车架号") + @JsonProperty("VIN") private String VIN; // 车架号 @ApiModelProperty("开票类型key") private String billTypeKey; // 开票类型key @@ -67,5 +69,6 @@ public class FinBillVehicleDto implements Dto { private String billName; // 挂靠公司名称 @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid - + @ApiModelProperty("备注") + private String remarks; // 备注 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java index 5147e131f6..d7cf8c4903 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.fin.api.finbillvehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -56,6 +57,7 @@ public class FinBillVehicleVo implements Vo { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("车架号") + @JsonProperty("VIN") private String VIN; // 车架号 @ApiModelProperty("开票类型key") private String billTypeKey; // 开票类型key @@ -67,5 +69,6 @@ public class FinBillVehicleVo implements Vo { private String billName; // 挂靠公司名称 @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid - + @ApiModelProperty("备注") + private String remarks; // 备注 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index 0890f36280..a5f45aab14 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -74,15 +74,6 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { return finBillApplicationService.saveOrUpdateDto(dto); } - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - finBillApplicationService.delAllBySids(sids); - return rb.success(); - } - @Override @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 470db305d2..c7708e4453 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -126,30 +126,30 @@ public class FinBillApplicationService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("fba.useOrgSid", query.getUseOrgSid()); qw.eq("fba.createBySid", query.getStaffSid()); - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.eq("fba.contractNo", query.getContractNo()); - } - if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.eq("fba.customerName", query.getCustomerName()); - } - if (StringUtils.isNotBlank(query.getBillTypeKey())) { - qw.eq("fbv.billTypeKey", query.getBillTypeKey()); - } - if (StringUtils.isNotBlank(query.getBillName())) { - qw.eq("fbv.billName", query.getBillName()); - } - String applyStartDate = query.getApplyStartDate(); - String applyEndDate = query.getApplyEndDate(); - qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" - ); - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.eq("fba.createByName", query.getCreateByName()); - } - if (StringUtils.isNotBlank(query.getBillState())) { - qw.eq("fba.billState", query.getBillState()); - } - return qw; + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.eq("fba.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.eq("fba.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getBillTypeKey())) { + qw.eq("fbv.billTypeKey", query.getBillTypeKey()); + } + if (StringUtils.isNotBlank(query.getBillName())) { + qw.eq("fbv.billName", query.getBillName()); + } + String applyStartDate = query.getApplyStartDate(); + String applyEndDate = query.getApplyEndDate(); + qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.eq("fba.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBillState())) { + qw.eq("fba.billState", query.getBillState()); + } + return qw; } public PagerVo listPageVo(PagerQuery pq) { @@ -184,63 +184,89 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); - List finBillApplicationAppendxs = dto.getFinBillApplicationAppendxs(); - List finBillFiles = dto.getFinBillFiles(); - String path = ""; + List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); + List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); + List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); if (StringUtils.isBlank(dtoSid)) {//新增 FinBillApplication finBillApplication = new FinBillApplication(); String sid = finBillApplication.getSid(); - BeanUtil.copyProperties(dto,finBillApplication); + BeanUtil.copyProperties(dto, finBillApplication); finBillApplication.setSid(sid); FinBillApplicationPublic finBillApplicationPublic = new FinBillApplicationPublic(); String sid2 = finBillApplicationPublic.getSid(); - BeanUtil.copyProperties(finBillApplication,finBillApplicationPublic); + BeanUtil.copyProperties(finBillApplication, finBillApplicationPublic); finBillApplicationPublic.setSid(sid2); finBillApplicationPublicService.save(finBillApplicationPublic); finBillApplication.setBillAppPublicSid(sid2); finBillApplication.setNodeState("待提交"); - String contractSid = finBillApplication.getContractSid(); - String oneBillMoney = dto.getOneBillMoney(); - ResultBean commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid); - CommonContractVo data1 = commonContractVoResultBean.getData(); - String busSid = data1.getBusSid(); - String price = busOrderModelFeign.getPriceByOrderSid(busSid); - if (price.equals(oneBillMoney)){ - finBillApplication.setIsHighAndLowOpen(false); - }else { - finBillApplication.setIsHighAndLowOpen(true); - } save(finBillApplication); for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) { FinBillVehicle finBillVehicle = new FinBillVehicle(); String sid1 = finBillVehicle.getSid(); - BeanUtil.copyProperties(finBillVehicleDto,finBillVehicle); + BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle); finBillVehicle.setSid(sid1); finBillVehicle.setBillAppSid(sid); finBillVehicleService.save(finBillVehicle); } - for (FinBillApplicationAppendxDto finBillApplicationAppendx : finBillApplicationAppendxs) { - BeanUtil.copyProperties(finBillApplicationAppendx,commonAppendixDto); + for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) { + BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); String filePath = finBillApplicationAppendx.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - path = urlPrefix + filePath; + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + FinBillFile finBillFile = new FinBillFile(); + finBillFile.setBillAppSid(sid); + finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); + finBillFile.setFileUrl(filePath); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); + CommonAppendixVo data = commonAppendixVoResultBean.getData(); + String sid1 = data.getSid(); + finBillFile.setFileSid(sid1); + finBillFileService.save(finBillFile); + } + for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { + BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); + String filePath = finBillApplicationAppendx.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(path); + commonAppendixDto.setFilePath(filePath); commonAppendixDto.setCreateBySid(dto.getStaffSid()); commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); commonAppendixFeign.save(commonAppendixDto); + FinBillFile finBillFile = new FinBillFile(); + finBillFile.setBillAppSid(sid); + finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); + finBillFile.setFileUrl(filePath); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); + CommonAppendixVo data = commonAppendixVoResultBean.getData(); + String sid1 = data.getSid(); + finBillFile.setFileSid(sid1); + finBillFileService.save(finBillFile); } - for (FinBillFileDto finBillFileDto : finBillFiles) { + for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { + BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); + String filePath = finBillApplicationAppendx.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); FinBillFile finBillFile = new FinBillFile(); - String fileUrl = finBillFileDto.getFileUrl(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - path = urlPrefix + fileUrl; finBillFile.setBillAppSid(sid); - finBillFile.setCreateByName(finBillFileDto.getCreateByName()); - finBillFile.setFileType(finBillFileDto.getFileType()); - finBillFile.setFileUrl(path); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(path); + finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); + finBillFile.setFileUrl(filePath); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); String sid1 = data.getSid(); finBillFile.setFileSid(sid1); @@ -249,32 +275,72 @@ public class FinBillApplicationService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(dtoSid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + FinBillFile finBillFile = new FinBillFile(); + finBillFile.setBillAppSid(dtoSid); + finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); + finBillFile.setFileUrl(filePath); + finBillFile.setCreateByName(commonAppendixDto.getName()); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); + CommonAppendixVo data = commonAppendixVoResultBean.getData(); + String sid1 = data.getSid(); + finBillFile.setFileSid(sid1); + finBillFileService.save(finBillFile); + } + for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) { + BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); String filePath = finBillApplicationAppendx.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - path = urlPrefix + filePath; + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } commonAppendixDto.setLinkSid(dtoSid); - commonAppendixDto.setFilePath(path); + commonAppendixDto.setFilePath(filePath); commonAppendixDto.setCreateBySid(dto.getStaffSid()); commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); commonAppendixFeign.save(commonAppendixDto); + FinBillFile finBillFile = new FinBillFile(); + finBillFile.setBillAppSid(dtoSid); + finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); + finBillFile.setFileUrl(filePath); + finBillFile.setCreateByName(commonAppendixDto.getName()); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); + CommonAppendixVo data = commonAppendixVoResultBean.getData(); + String sid1 = data.getSid(); + finBillFile.setFileSid(sid1); + finBillFileService.save(finBillFile); } - finBillFileService.deleteByFinAppSid(dtoSid); - for (FinBillFileDto finBillFileDto : finBillFiles) { + for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) { + BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto); + String filePath = finBillApplicationAppendx.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + commonAppendixDto.setLinkSid(dtoSid); + commonAppendixDto.setFilePath(filePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); FinBillFile finBillFile = new FinBillFile(); - String fileUrl = finBillFileDto.getFileUrl(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - path = urlPrefix + fileUrl; finBillFile.setBillAppSid(dtoSid); - finBillFile.setCreateByName(finBillFileDto.getCreateByName()); - finBillFile.setFileType(finBillFileDto.getFileType()); - finBillFile.setFileUrl(path); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(path); + finBillFile.setFileType(finBillApplicationAppendx.getAppendixName()); + finBillFile.setFileUrl(filePath); + finBillFile.setCreateByName(commonAppendixDto.getName()); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); String sid1 = data.getSid(); finBillFile.setFileSid(sid1); @@ -283,11 +349,19 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); vo.setFinBillVehicles(finBillVehicleVos); - List finBillFileVos = finBillFileService.fetchBillFileBySid(sid); - vo.setFinBillFiles(finBillFileVos); + List finBillFileVos = finBillFileService.groupByList(sid); + vo.setFinBillFileVos(finBillFileVos); return vo; } @@ -345,6 +425,17 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); variables.put("businessSid", businessSid); variables.put("orgSid", orgSid); //部门sid + String contractSid = dto.getContractSid(); + String oneBillMoney = dto.getOneBillMoney(); + ResultBean commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid); + CommonContractVo data1 = commonContractVoResultBean.getData(); + String busSid = data1.getBusSid(); + String price = busOrderModelFeign.getPriceByOrderSid(busSid); + if (price.equals(oneBillMoney)) { + variables.put("isHighAndLowOpen",false); + } else { + variables.put("isHighAndLowOpen",true); + } if (StringUtils.isBlank(dto.getTaskId())) { // 新提交 String proDefId = ProcDefEnum.SEALAPPLY.getProDefId(); ResultBean resultBean1 = flowableFeign.businessStart(ProcDefEnum.FINBILLAPPLICATION.getProDefId(), dto.getUserSid(), variables); @@ -413,11 +504,12 @@ public class FinBillApplicationService extends MybatisBaseService variables) { - BusinessVariables bv= BusinessVariables.builder().build(); + BusinessVariables bv = BusinessVariables.builder().build(); bv.setDetailUrl(""); bv.setHandleUrl(""); bv.setFormVariables(variables); @@ -448,6 +540,7 @@ public class FinBillApplicationService extends MybatisBaseService> resultBean = flowTaskFeign.revokeProcess(fl); if (!resultBean.getSuccess()) { @@ -480,8 +574,8 @@ public class FinBillApplicationService extends MybatisBaseService> resultBean = flowTaskFeign.taskReject(fl); if (!resultBean.getSuccess()) { return resultBean; @@ -516,13 +611,14 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); for (FinBillVehicleVo finBillVehicle : finBillVehicles) { String billTypeValue = finBillVehicle.getBillTypeValue(); String billName = finBillVehicle.getBillName(); - if (StringUtils.isBlank(billTypeValue) || StringUtils.isBlank(billName)){ + if (StringUtils.isBlank(billTypeValue) || StringUtils.isBlank(billName)) { rb.setMsg("该申请单信息不完善，请补充完整后提交"); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java index 2fa098b161..6d31543021 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java @@ -71,4 +71,6 @@ public interface FinBillFileMapper extends BaseMapper { List fetchBillFileBySid(String sid); List fetchFileBySid(@Param("billAppSid") String billAppSid, @Param("fileType") String fileType); + + List groupByList(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml index 03bce43768..ade3d0e421 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml @@ -28,4 +28,16 @@ WHERE billAppSid = #{billAppSid} AND fileType = #{fileType} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java index 963d9c1e36..5959c62422 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.fin.biz.finbillfile; +import com.yxt.anrui.fin.api.finbillfile.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.fin.api.finbillfile.FinBillFile; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileQuery; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileDetailsVo; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileFeign; /** * Project: anrui-fin(开票申请管理)
@@ -99,9 +94,9 @@ public class FinBillFileRest implements FinBillFileFeign { } @Override - public ResultBean> fetchFileBySid(String billAppSid, String fileType) { + public ResultBean> fetchFileBySid(String billAppSid, String fileType) { ResultBean rb = ResultBean.fireFail(); - List finBillFileDetailsVos = finBillFileService.fetchFileBySid(billAppSid, fileType); - return rb.success().setData(finBillFileDetailsVos); + List finBillFileAppendxVo = finBillFileService.fetchFileBySid(billAppSid, fileType); + return rb.success().setData(finBillFileAppendxVo); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 5c92e48f72..3969cec46b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -28,21 +28,21 @@ package com.yxt.anrui.fin.biz.finbillfile; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.fin.api.finbillfile.*; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.ResultBean; 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.vo.PagerVo; -import com.yxt.anrui.fin.api.finbillfile.FinBillFile; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileQuery; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileDetailsVo; -import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -63,6 +63,8 @@ public class FinBillFileService extends MybatisBaseService createQueryWrapper(FinBillFileQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -120,15 +122,27 @@ public class FinBillFileService extends MybatisBaseService fetchFileBySid(String billAppSid, String fileType) { + public List fetchFileBySid(String billAppSid, String fileType) { + FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo(); + ArrayList finBillFileAppendxVos = new ArrayList<>(); List finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType); String path = ""; for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) { String fileUrl = finBillFileDetailsVo.getFileUrl(); String urlPrefix = fileUploadComponent.getUrlPrefix(); path = urlPrefix + fileUrl; - finBillFileDetailsVo.setFileUrl(path); + String fileSid = finBillFileDetailsVo.getFileSid(); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchSid(fileSid); + CommonAppendixVo data = commonAppendixVoResultBean.getData(); + BeanUtil.copyProperties(data,finBillFileAppendxVo); + finBillFileAppendxVo.setFilePath(path); + finBillFileAppendxVo.setAppendixName(finBillFileDetailsVo.getFileType()); + finBillFileAppendxVos.add(finBillFileAppendxVo); } - return finBillFileDetailsVos; + return finBillFileAppendxVos; + } + + public List groupByList(String sid) { + return baseMapper.groupByList(sid); } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java index 3e13ae4120..6373fa22dd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -65,4 +66,7 @@ public interface FinBillVehicleMapper extends BaseMapper { @Select("select * from fin_bill_vehicle where billAppSid = #{sid}") List fetchVehBySid(String sid); + + @Delete("delete from fin_bill_vehicle where billAppSid = #{dtoSid}") + void delByBillAppSid(String dtoSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java index f794534a90..bb8d0bbe03 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java @@ -111,4 +111,8 @@ public class FinBillVehicleService extends MybatisBaseService fetchVehBySid(String sid) { return baseMapper.fetchVehBySid(sid); } + + public void delByBillAppSid(String dtoSid) { + baseMapper.delByBillAppSid(dtoSid); + } } \ No newline at end of file