From b812673b125089635c13bd857aca9504bf638982 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 06 九月 2023 23:55:59 +0800
Subject: [PATCH] 代码修改
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 23 ++++++++++-
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java | 8 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java | 3 +
ruoyi-admin/src/main/resources/template/差旅费报销申请单.ftl | 6 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java | 11 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 15 ++++---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UpdateUserPWD.java | 45 ++++++++++++++++++++++
8 files changed, 101 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java
index f729e52..b03c505 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/PersonType.java
@@ -44,4 +44,15 @@
}
return null;
}
+
+ public static String getCodeByInfo(String Info) {
+ PersonType[] personTypes = values();
+ for (int i = 0; i < personTypes.length; i++) {
+ PersonType personType = personTypes[i];
+ if (personType.getInfo().equals(Info)) {
+ return personType.getCode();
+ }
+ }
+ return null;
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index f7c93fe..f493da5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -31,6 +31,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.*;
@@ -154,6 +155,10 @@
}
//startPage();
List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ if (StringUtils.isNotBlank(spFinancialExpensesIn.getUsername())) {
+ list = list.stream().filter(reimbursementOut -> reimbursementOut.getUsername().contains(spFinancialExpensesIn.getUsername())).collect(Collectors.toList()); // 鎸塶ame瀛楁杩囨护
+ }
+
Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
@Override
public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
@@ -760,9 +765,15 @@
ServiceReimbursementEo serviceReimbursementEo = new ServiceReimbursementEo();
serviceReimbursementEo.setId(id);
List<ServiceReimbursementEo> rdInfoByItem = serviceReimbursementService.getRDInfoByItem(serviceReimbursementEo);
+ log.info("rdInfoByItem鏄惁涓虹┖ :{}", CollectionUtils.isEmpty(rdInfoByItem) ? null : rdInfoByItem.size());
+ for (int i = 0; i < rdInfoByItem.size(); i++) {
+ ServiceReimbursementEo serviceReimbursementEo1 = rdInfoByItem.get(i);
+ String codeByInfo = PersonType.getCodeByInfo(serviceReimbursementEo1.getPersontype());
+ serviceReimbursementEo1.setPersontype(codeByInfo);
+ }
//鑾峰彇鎶ラ攢鏀粯淇℃伅
List<ServiceReimbursementpayee> reimbursementpayeeInfo = reimbursementpayeeService.getReimbursementpayeeInfo(serviceReimbursementEo);
-
+ log.info("reimbursementpayeeInfo鏄惁涓虹┖ :{}", CollectionUtils.isEmpty(reimbursementpayeeInfo) ? null : reimbursementpayeeInfo.size());
Map<String, List<ServiceReimbursementEo>> listMap = rdInfoByItem.stream().collect(Collectors.groupingBy(ServiceReimbursementEo::getPersontype));
List<Map<String, BigDecimal>> list = new ArrayList<>();
StringBuffer FYXM1 = new StringBuffer();
@@ -779,7 +790,7 @@
BigDecimal keyOneMoney = new BigDecimal(0.00);
BigDecimal keyTwoMoney = new BigDecimal(0.00);
for (ServiceReimbursementEo serviceReimbursementEo1 : values) {
- otherMoney = otherMoney.add(serviceReimbursementEo1.getTrafficexpense()).add(serviceReimbursementEo1.getHotelexpense()).add(serviceReimbursementEo1.getFoodexpenses()).add(serviceReimbursementEo1.getFoodallowance()).add(serviceReimbursementEo1.getOtherexpense()).add(serviceReimbursementEo1.getOtherfeeamount());
+ otherMoney = otherMoney.add(serviceReimbursementEo1.getTrafficexpense()).add(serviceReimbursementEo1.getHotelexpense()).add(serviceReimbursementEo1.getCityfee()).add(serviceReimbursementEo1.getFoodexpenses()).add(serviceReimbursementEo1.getFoodallowance()).add(serviceReimbursementEo1.getOtherexpense()).add(serviceReimbursementEo1.getOtherfeeamount());
}
map.put(key, otherMoney);
list.add(map);
@@ -915,6 +926,14 @@
}
dataMap.put("BXBZ", remark);
+ dataMap.put("ZXFZR", StringUtils.isEmpty(rdInfoByItem.get(0).getOpochecker()) ? "" : rdInfoByItem.get(0).getOpochecker());
+//
+ dataMap.put("CWFYZ", StringUtils.isEmpty(rdInfoByItem.get(0).getFinvicepresident()) ? "" : rdInfoByItem.get(0).getFinvicepresident());
+ dataMap.put("YWFYZ", StringUtils.isEmpty(rdInfoByItem.get(0).getBusvicepresident()) ? "" : rdInfoByItem.get(0).getBusvicepresident());
+ dataMap.put("BGSZR", StringUtils.isEmpty(rdInfoByItem.get(0).getOfficedirector()) ? "" : rdInfoByItem.get(0).getOfficedirector());
+ dataMap.put("CWBZR", StringUtils.isEmpty(rdInfoByItem.get(0).getFinancedirector()) ? "" : rdInfoByItem.get(0).getFinancedirector());
+ dataMap.put("CWSH", StringUtils.isEmpty(rdInfoByItem.get(0).getFinancechecher()) ? "" : rdInfoByItem.get(0).getFinancechecher());
+
dataMap.put("YYMMDD", time);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index cfd903c..c70ba20 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -2,6 +2,7 @@
import java.io.IOException;
+import com.ruoyi.common.core.domain.entity.UpdateUserPWD;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -95,27 +96,27 @@
* 閲嶇疆瀵嗙爜
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping("/updatePwd")
- public AjaxResult updatePwd(String oldPassword, String newPassword)
+ @PostMapping("/updatePwd")
+ public AjaxResult updatePwd(@RequestBody UpdateUserPWD updateUserPWD)
{
LoginUser loginUser = getLoginUser();
String userName = loginUser.getUsername();
String password = loginUser.getPassword();
- if (!SecurityUtils.matchesPassword(oldPassword, password))
+ if (!SecurityUtils.matchesPassword(updateUserPWD.getOldPassword(), password))
{
return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
}
- if (SecurityUtils.matchesPassword(newPassword, password))
+ if (SecurityUtils.matchesPassword(updateUserPWD.getNewPassword(), password))
{
return AjaxResult.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
}
- if(!checkPasswordRule(newPassword)){
+ if(!checkPasswordRule(updateUserPWD.getNewPassword())){
return AjaxResult.error("瀵嗙爜鏍煎紡: 澶у皬鍐欏瓧姣嶃�佹暟瀛椼�佺壒娈婂瓧绗︿腑鐨勮嚦灏戜笁绉嶏紙闀垮害澶т簬绛変簬8浣嶏級");
}
- if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0 && checkPasswordRule(newPassword))
+ if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(updateUserPWD.getNewPassword())) > 0 && checkPasswordRule(updateUserPWD.getNewPassword()))
{
// 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
- loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+ loginUser.getUser().setPassword(SecurityUtils.encryptPassword(updateUserPWD.getNewPassword()));
tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
diff --git "a/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl" "b/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl"
index 025dc42..98b6829 100644
--- "a/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl"
+++ "b/ruoyi-admin/src/main/resources/template/\345\267\256\346\227\205\350\264\271\346\212\245\351\224\200\347\224\263\350\257\267\345\215\225.ftl"
@@ -1708,10 +1708,10 @@
<w:rPr>
<w:rFonts w:hint="eastAsia"/>
</w:rPr>
- <w:t>涓績璐熻矗浜猴細</w:t>
+ <w:t>涓績璐熻矗浜猴細${ZXFZR}</w:t>
</w:r>
<w:r w:rsidRPr="00D61E43">
- <w:t xml:space="preserve"> 璐㈠姟鍓櫌闀匡細 涓氬姟鍓櫌闀匡細 鍔炲叕瀹や富浠伙細 璐㈠姟閮ㄤ富浠伙細 璐㈠姟瀹℃牳锛�</w:t>
+ <w:t xml:space="preserve"> 璐㈠姟鍓櫌闀匡細${CWFYZ} 涓氬姟鍓櫌闀匡細${YWFYZ} 鍔炲叕瀹や富浠伙細${BGSZR} 璐㈠姟閮ㄤ富浠伙細${CWBZR} 璐㈠姟瀹℃牳锛�${CWSH}</w:t>
</w:r>
</w:p>
<w:p w:rsidR="00196045" w:rsidRDefault="00196045">
@@ -4887,7 +4887,7 @@
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
</w:rPr>
- <w:t xml:space="preserve">鍔炲叕瀹や富浠伙細 璐㈠姟閮ㄤ富浠伙細 璐㈠姟瀹℃牳锛� </w:t>
+ <w:t xml:space="preserve">鍔炲叕瀹や富浠伙細${BGSZR} 璐㈠姟閮ㄤ富浠伙細${CWBZR} 璐㈠姟瀹℃牳锛�${CWSH} </w:t>
</w:r>
</w:p>
</w:tc>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UpdateUserPWD.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UpdateUserPWD.java
new file mode 100644
index 0000000..14d786f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UpdateUserPWD.java
@@ -0,0 +1,45 @@
+package com.ruoyi.common.core.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.Excel.Type;
+import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏇存柊鐢ㄦ埛瀵嗙爜
+ *
+ * @author ruoyi
+ */
+
+@ApiModel("鏇存柊鐢ㄦ埛瀵嗙爜")
+@Data
+public class UpdateUserPWD extends BaseEntity {
+
+ /**
+ * 鐢ㄦ埛ID
+ */
+ @ApiModelProperty("鑰佸瘑鐮�")
+ private String oldPassword;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty("鏂板瘑鐮�")
+ private String newPassword;
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
index 6b4598d..370394c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementEo.java
@@ -347,5 +347,8 @@
@ApiModelProperty("涓嬭浇缂栧彿")
private String bh;
+
+ @ApiModelProperty("甯傚唴浜ら�氳垂")
+ private BigDecimal cityfee;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
index ac0a5d2..80ac4ee 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
@@ -21,6 +21,14 @@
private String APPLICANT;
/**
+ * 缁忓姙浜�
+ */
+ @ApiModelProperty("缁忓姙浜�")
+ @Excel(name = "缁忓姙浜�")
+ private String username;
+
+
+ /**
* 鐢宠寮�濮嬫棩鏈�
*/
@ApiModelProperty("鐢宠寮�濮嬫棩鏈�")
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 7bfcf22..e0a7502 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -167,11 +167,11 @@
<select id="getRDInfoByItem" resultType="com.ruoyi.project.domain.ServiceReimbursementEo">
SELECT a.id as id,a.UserNo as userno,a.FlowLevel as recordstatus,b.persontype as persontype,a.create_time as
- createTime,a.managername as managername,a.bh as bh,
+ createTime,a.managername as managername,a.bh as bh,a.OPOchecker as opochecker,a.FinVicePresident as finvicepresident,a.BusVicePresident as busvicepresident,a.OfficeDirector as officedirector,a.FinanceDirector as financedirector,a.FinanceChecher as financechecher,
a.UserName as username,b.personname as travelers,a.AmountRequested as amountrequested,a.Reason as reason,a.Phone
as phone,a.DepositBank as depositbank,a.BankCardNo as bankcardno,a.DonorName as donorname,b.trafficexpense as
trafficexpense,b.hotelexpense as hotelexpense,b.FoodExpenses as foodexpenses, b.foodallowance as foodallowance,
- b.otherexpense as otherexpense,b.otherfeeamount as otherfeeamount FROM service_reimbursement a LEFT JOIN
+ b.otherexpense as otherexpense,b.otherfeeamount as otherfeeamount,b.CityFee as cityfee FROM service_reimbursement a LEFT JOIN
service_reimbursementdetail b on a.id=b.RBID where a.del_flag != 1 and b.del_flag!=1
<if test="id != null">
and a.id = #{id}
--
Gitblit v1.9.3