ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -686,7 +686,8 @@ dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount()); dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname()); dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername()); dataMap.put("FYXM1", "支付专家费用，其中税前金额" + serviceFund.getPretaxcost() + "元，税后金额" + serviceFund.getTaxedcost() + "元。"); // dataMap.put("FYXM1", "支付专家费用，其中税前金额" + serviceFund.getPretaxcost() + "元，税后金额" + serviceFund.getTaxedcost() + "元。"); dataMap.put("FYXM1", "人体器官捐献专家劳务费:" + serviceFund.getTaxedcost() + "元 (其中税后费用由中心承担税费)。"); dataMap.put("FYXM2", ""); dataMap.put("FYXM3", ""); dataMap.put("JEXS", serviceFund.getAmountrequested()); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -773,18 +773,30 @@ FYXM1.delete(0, FYXM1.length()); //再新增 otherMoneyall = otherMoneyall.add(otherMoney); FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " "); FYXM1.append("OP0 工作人员报销差旅费" + ":" + otherMoneyall + " "); } else { if (flag == 0) { key1 = key; flag = 1; } if (key1 == key) { FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney); allMoney = allMoney.add(otherMoney); if (key.equals("3")) { // FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney); FYXM2.append("专家报销差旅费 :" + otherMoney); allMoney = allMoney.add(otherMoney); } else { FYXM2.append("家属报销差旅费及误工费用 : " + otherMoney); allMoney = allMoney.add(otherMoney); } } else { FYXM3.append(PersonType.getInfoByCode(key) + ":" + otherMoney); allMoney = allMoney.add(otherMoney); if (key.equals("3")) { // FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney); FYXM3.append("专家报销差旅费 :" + otherMoney); allMoney = allMoney.add(otherMoney); } else { FYXM3.append("家属报销差旅费及误工费用 : " + otherMoney); allMoney = allMoney.add(otherMoney); } } } } else { @@ -793,18 +805,30 @@ FYXM1.delete(0, FYXM1.length()); //再新增 otherMoneyall = otherMoneyall.add(otherMoney); FYXM1.append("OPO工作人员" + ":" + otherMoneyall + " "); FYXM1.append("OP0 工作人员报销差旅费" + ":" + otherMoneyall + " "); } else { if (flag == 0) { key1 = key; flag = 1; } if (key1 == key) { FYXM2.append(key + ":" + otherMoney); allMoney = allMoney.add(otherMoney); if (key.equals("专家")) { // FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney); FYXM2.append("专家报销差旅费 :" + otherMoney); allMoney = allMoney.add(otherMoney); } else { FYXM2.append("家属报销差旅费及误工费用 : " + otherMoney); allMoney = allMoney.add(otherMoney); } } else { FYXM3.append(key + ":" + otherMoney); allMoney = allMoney.add(otherMoney); if (key.equals("专家")) { // FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney); FYXM3.append("专家报销差旅费 :" + otherMoney); allMoney = allMoney.add(otherMoney); } else { FYXM3.append("家属报销差旅费及误工费用 : " + otherMoney); allMoney = allMoney.add(otherMoney); } } } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -103,7 +103,7 @@ @RepeatSubmit public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) { ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class); if (StringUtils.isNotBlank(serviceReimbursementdetailVO.getAnnexfilesList().toString())) { if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) { serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList())); } return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail)); ruoyi-admin/src/main/resources/application.yml
@@ -10,9 +10,9 @@ demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 开发环境 window # profile: D:/lihusoft/OPO/WEB/Upload profile: D:/lihusoft/OPO/WEB/Upload # 开发环境 linux profile: /home/smartor/uploadFile # profile: /home/smartor/uploadFile # 医院环境 #profile: E:/OPO/WEB/Upload # 获取ip地址开关 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ItemTypeVO.java
@@ -1,16 +1,28 @@ package com.ruoyi.project.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel("收入费用科目类型") public class ItemTypeVO { @ApiModelProperty("项目类型") private String itemType; @ApiModelProperty("项目类型编号") private String itemTypeName; @ApiModelProperty("科目类型名称") private String subjecttypename; @ApiModelProperty("科目类型：成本收入") private String subjecttype; @ApiModelProperty("项目具体信息") private List<ItemDetailVO> itemDetails;
@@ -97,6 +97,8 @@ ItemTypeVO itemTypeVO = new ItemTypeVO(); itemTypeVO.setItemType(b.getItemtype()); itemTypeVO.setItemTypeName(b.getItemtypename()); itemTypeVO.setSubjecttype(b.getSubjecttype()); itemTypeVO.setSubjecttypename(b.getSubjecttypename()); ItemDetailVO id = new ItemDetailVO(); id.setId(b.getId());
