ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundShared.java
@@ -88,53 +88,53 @@ /** 税前金额合计 */ @ApiModelProperty("税前金额合计") @Excel(name = "税前金额合计") private BigDecimal pretaxcost; private Double pretaxcost; /** 税后金额合计 */ @ApiModelProperty("税后金额合计") @Excel(name = "税后金额合计") private BigDecimal taxedcost; private Double taxedcost; /** 费用总金额 */ @ApiModelProperty("费用总金额") @Excel(name = "费用总金额") private BigDecimal totalcost; private Double totalcost; /** 获取专家总费用 */ @ApiModelProperty("获取专家总费用") //数据库自增改成@TableId(type = IdType.AUTO) //@TableId(type = IdType.AUTO) private BigDecimal procurementcost; private Double procurementcost; /** 专家费用总金额 */ @ApiModelProperty("专家费用总金额") @Excel(name = "专家费用总金额") private BigDecimal expertcost; private Double expertcost; /** 伦理审查费用总金额 */ @ApiModelProperty("伦理审查费用总金额") @Excel(name = "伦理审查费用总金额") private BigDecimal ethicscost; private Double ethicscost; /** 捐献者医学成本总金额 */ @ApiModelProperty("捐献者医学成本总金额") @Excel(name = "捐献者医学成本总金额") private BigDecimal medicalcost; private Double medicalcost; /** 捐献者家属食宿费总金额 */ @ApiModelProperty("捐献者家属食宿费总金额") @Excel(name = "捐献者家属食宿费总金额") private BigDecimal familycost; private Double familycost; /** 捐献者善后成本总金额 */ @ApiModelProperty("捐献者善后成本总金额") @Excel(name = "捐献者善后成本总金额") private BigDecimal aftercarecost; private Double aftercarecost; /** 申请金额 */ @ApiModelProperty("申请金额") @Excel(name = "申请金额") private BigDecimal amountrequested; private Double amountrequested; /** 资金类别 见字典sys_ConsolationType */ @ApiModelProperty("资金类别 见字典sys_ConsolationType") ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -162,37 +162,37 @@ /** 数量 */ @ApiModelProperty("数量") @Excel(name = "数量") private BigDecimal quantity; private Double quantity; /** 价格 */ @ApiModelProperty("价格") @Excel(name = "价格") private BigDecimal price; private Double price; /** 申请金额 */ @ApiModelProperty("申请金额") @Excel(name = "申请金额") private BigDecimal amount; private Double amount; /** 扣税金额 */ @ApiModelProperty("扣税金额") @Excel(name = "扣税金额") private BigDecimal taxamount; private Double taxamount; /** 税后金额 */ @ApiModelProperty("税后金额") @Excel(name = "税后金额") private BigDecimal taxedamount; private Double taxedamount; /** 预支金额 */ @ApiModelProperty("预支金额") @Excel(name = "预支金额") private BigDecimal prepaidamount; private Double prepaidamount; /** 付款金额 */ @ApiModelProperty("付款金额") @Excel(name = "付款金额") private BigDecimal paidamount; private Double paidamount; /** 付款时间 */ @ApiModelProperty("付款时间") @@ -269,7 +269,7 @@ /** $column.columnComment */ @ApiModelProperty("$column.columnComment") @Excel(name = "上传时间") private BigDecimal reimbursementamount; private Double reimbursementamount; /** 金额 */ @ApiModelProperty("金额") ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -270,7 +270,7 @@ private Long flowlevel; /** * 99:审批驳回 100：上传医院 199：医院驳回 * 100：上传医院 199：医院驳回 */ @ApiModelProperty("退回时的审核级别") private Long backflowlevel; ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailSharedService.java
@@ -20,4 +20,12 @@ * @return 费用申请明细集合 */ public List<ServiceFunddetailShared> queryList(ServiceFunddetailShared serviceFunddetailShared); /** * 删除费用申请明细 * * @param serviceFunddetailShared 费用申请明细 * @return */ public Boolean delFunddetailShare(ServiceFunddetailShared serviceFunddetailShared) } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -774,6 +774,7 @@ String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes; List<RbDetailFile> parseArray2 = new ArrayList<>(); List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class); log.info("parseArray的值 : {}",parseArray); for (int i = 0; i < parseArray.size(); i++) { RbDetailFile rbDetailFile = parseArray.get(i); log.info("filePath的修改:{}", filePath); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailSharedServiceImpl.java
@@ -1,14 +1,17 @@ package com.ruoyi.project.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.ArrayList; import java.util.Map; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.project.mapper.ServiceFunddetailSharedMapper; import com.ruoyi.project.domain.ServiceFunddetailShared; @@ -21,8 +24,7 @@ * @date 2023-04-20 */ @Service public class ServiceFunddetailSharedServiceImpl extends ServiceImpl<ServiceFunddetailSharedMapper, ServiceFunddetailShared> implements IServiceFunddetailSharedService { public class ServiceFunddetailSharedServiceImpl extends ServiceImpl<ServiceFunddetailSharedMapper, ServiceFunddetailShared> implements IServiceFunddetailSharedService { /** @@ -184,4 +186,23 @@ return this.list(wrappers); } /** * 查询费用申请明细列表 * * @param serviceFunddetailShared 费用申请明细 * @return 费用申请明细 */ @Override public Boolean delFunddetailShare(ServiceFunddetailShared serviceFunddetailShared) { boolean update = false; LambdaQueryWrapper<ServiceFunddetailShared> wrappers = Wrappers.lambdaQuery(); if (serviceFunddetailShared.getFundid() != null) { wrappers.eq(ServiceFunddetailShared::getFundid, serviceFunddetailShared.getFundid()); update = update(wrappers); } return update; } } ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -34,6 +34,9 @@ @Autowired private IServiceFundSharedService serviceFundSharedService; @Autowired private IServiceFunddetailSharedService serviceFunddetailSharedService; @Autowired private IServiceFundService serviceFundService; @@ -66,6 +69,10 @@ String phone = serviceFundShared.getPhone(); //将分享里的该数据删除 serviceFundSharedService.delfundsharedInfoById(serviceFundShared.getId()); ServiceFunddetailShared serviceFunddetailShared = new ServiceFunddetailShared(); log.info("fundShared的ID:{}", serviceFundShared.getId()); serviceFunddetailShared.setFundid(serviceFundShared.getId()); serviceFunddetailSharedService.delFunddetailShare(serviceFunddetailShared); ServiceFund serviceFund = new ServiceFund(); serviceFund.setId(serviceFundShared.getSerfunid()); @@ -281,7 +288,11 @@ for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) { if (StringUtils.isNotBlank(serviceReimbursementShared.getOabdzt()) && serviceReimbursementShared.getOabdzt().equals("已撤销")) { String phone = serviceReimbursementShared.getPhone(); String[] split = serviceReimbursementShared.getCxrjyj().split("&"); String[] split = null; log.info("serviceReimbursementShared.getCxrjyj(): {}", serviceReimbursementShared.getCxrjyj()); if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) { split = serviceReimbursementShared.getCxrjyj().split("&"); } //将分享里的该数据删除 serviceReimbursementSharedService.delResharedInfoById(serviceReimbursementShared.getId()); @@ -517,17 +528,17 @@ serviceFundflow.setFundid(fundId); fundflowService.save(serviceFundflow); ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>(); ConcurrentHashMap map = new ConcurrentHashMap(); map.put("审批人", split[0]); map.put("审批时间", split[1]); map.put("意见", split[2]); contentList.add(map); DingTalkReqVo dingTalkReqVo = new DingTalkReqVo(); dingTalkReqVo.setTitle("财务系统驳回信息"); dingTalkReqVo.setNumber(phone); dingTalkReqVo.setContents(contentList); dingTalkService.sendNotification(dingTalkReqVo); // ArrayList<ConcurrentHashMap<String, String>> contentList = new ArrayList<>(); // ConcurrentHashMap map = new ConcurrentHashMap(); // map.put("审批人", split[0]); // map.put("审批时间", split[1]); // map.put("意见", split[2]); // contentList.add(map); // DingTalkReqVo dingTalkReqVo = new DingTalkReqVo(); // dingTalkReqVo.setTitle("财务系统驳回信息"); // dingTalkReqVo.setNumber(phone); // dingTalkReqVo.setContents(contentList); // dingTalkService.sendNotification(dingTalkReqVo); } }
