From 34a716e48e49743083953113bfc2e8011d52444f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 九月 2025 19:08:05 +0800
Subject: [PATCH] 日志修改
---
ruoyi-admin/pom.xml | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 5 +
ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml | 109 ++++++++++++++++++++++-------------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 4
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalperson.java | 6 +
6 files changed, 81 insertions(+), 49 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 7c12d6c..88518bd 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,8 +8,8 @@
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <!-- <packaging>war</packaging>-->
- <packaging>jar</packaging>
+ <packaging>war</packaging>
+<!-- <packaging>jar</packaging>-->
<artifactId>smartor-opo</artifactId>
<description>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cd33931..6d46c20 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,7 +53,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: srm
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalperson.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalperson.java
index 9485bd0..9555e08 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalperson.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalperson.java
@@ -10,7 +10,7 @@
/**
* 澶栧洿鍗曚綅浜哄憳瀵硅薄 service_externalperson
- *
+ *
* @author ruoyi
* @date 2021-11-24
*/
@@ -99,6 +99,10 @@
@ApiModelProperty("韬唤璇佸彿")
private String idcardno;
+ /** 鍏徃绋庡彿 */
+ @ApiModelProperty("鍏徃绋庡彿")
+ private String unitTaxNo;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 556c138..63b10ef 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -806,8 +806,9 @@
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + sd.format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃";
}
-
- Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> managerName.contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime));
+ //鍘讳竴涓嬬┖鏍�
+ String mn = managerName.trim();
+ Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> mn.trim().contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime));
if (lastApproval.isPresent()) {
ServiceFundflow flow = lastApproval.get();
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index b8f9d63..b8ed172 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -529,8 +529,8 @@
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + sd.format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃";
}
-
- Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(managerName)).max(Comparator.comparing(ServiceFundflow::getCreateTime));
+ String mn = managerName.trim();
+ Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(mn)).max(Comparator.comparing(ServiceFundflow::getCreateTime));
if (lastApproval.isPresent()) {
ServiceFundflow flow = lastApproval.get();
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml
index 99084a2..bda7727 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml
@@ -1,54 +1,81 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceExternalpersonMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceExternalperson" id="ServiceExternalpersonResult">
- <result property="id" column="ID" />
- <result property="userno" column="UserNo" />
- <result property="username" column="UserName" />
- <result property="userstatus" column="UserStatus" />
- <result property="usertype" column="UserType" />
- <result property="idcardno" column="IDCardNo" />
- <result property="personnelunitno" column="PersonnelUnitNo" />
- <result property="sex" column="Sex" />
- <result property="telephone" column="Telephone" />
- <result property="address" column="Address" />
- <result property="unitno" column="UnitNo" />
- <result property="unitname" column="UnitName" />
- <result property="title" column="Title" />
- <result property="depositbank" column="DepositBank" />
- <result property="branchbankname" column="BranchBankName" />
- <result property="bankcardno" column="BankCardNo" />
- <result property="del_flag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="pym" column="PYM" />
- <result property="wbm" column="WBM" />
+ <result property="id" column="ID"/>
+ <result property="userno" column="UserNo"/>
+ <result property="username" column="UserName"/>
+ <result property="userstatus" column="UserStatus"/>
+ <result property="usertype" column="UserType"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="personnelunitno" column="PersonnelUnitNo"/>
+ <result property="sex" column="Sex"/>
+ <result property="telephone" column="Telephone"/>
+ <result property="address" column="Address"/>
+ <result property="unitno" column="UnitNo"/>
+ <result property="unitname" column="UnitName"/>
+ <result property="title" column="Title"/>
+ <result property="depositbank" column="DepositBank"/>
+ <result property="branchbankname" column="BranchBankName"/>
+ <result property="bankcardno" column="BankCardNo"/>
+ <result property="del_flag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="pym" column="PYM"/>
+ <result property="wbm" column="WBM"/>
+ <result property="unitTaxNo" column="UnitTaxNo"/>
</resultMap>
<sql id="selectServiceExternalpersonVo">
- select ID, UserNo, UserName, UserStatus, IDCardNo, UserType, PersonnelUnitNo, Sex, Telephone, Address, UnitNo, UnitName, Title, DepositBank, BranchBankName, BankCardNo, del_flag, create_by, create_time, update_by, update_time, PYM, WBM from service_externalperson
+ select ID,
+ UserNo,
+ UnitTaxNo,
+ UserName,
+ UserStatus,
+ IDCardNo,
+ UserType,
+ PersonnelUnitNo,
+ Sex,
+ Telephone,
+ Address,
+ UnitNo,
+ UnitName,
+ Title,
+ DepositBank,
+ BranchBankName,
+ BankCardNo,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ PYM,
+ WBM
+ from service_externalperson
</sql>
- <select id="selectServiceExternalpersonList" parameterType="com.ruoyi.project.domain.ServiceExternalperson" resultMap="ServiceExternalpersonResult">
+ <select id="selectServiceExternalpersonList" parameterType="com.ruoyi.project.domain.ServiceExternalperson"
+ resultMap="ServiceExternalpersonResult">
<include refid="selectServiceExternalpersonVo"/>
<where>
- <if test="userno != null and userno != ''"> and UserNo = #{userno}</if>
- <if test="username != null and username != ''"> and UserName like concat('%', #{username}, '%')</if>
- <if test="usertype != null and usertype != ''"> and UserType = #{usertype}</if>
- <if test="sex != null and sex != ''"> and Sex = #{sex}</if>
- <if test="telephone != null and telephone != ''"> and Telephone = #{telephone}</if>
- <if test="address != null and address != ''"> and Address = #{address}</if>
- <if test="unitno != null and unitno != ''"> and UnitNo = #{unitno}</if>
- <if test="unitname != null and unitname != ''"> and UnitName = #{unitname}</if>
- <if test="title != null and title != ''"> and Title = #{title}</if>
- <if test="depositbank != null and depositbank != ''"> and DepositBank = #{depositbank}</if>
- <if test="branchbankname != null and branchbankname != ''"> and BranchBankName = #{branchbankname}</if>
- <if test="bankcardno != null and bankcardno != ''"> and BankCardNo = #{bankcardno}</if>
+ <if test="userno != null and userno != ''">and UserNo = #{userno}</if>
+ <if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</if>
+ <if test="usertype != null and usertype != ''">and UserType = #{usertype}</if>
+ <if test="sex != null and sex != ''">and Sex = #{sex}</if>
+ <if test="telephone != null and telephone != ''">and Telephone = #{telephone}</if>
+ <if test="address != null and address != ''">and Address = #{address}</if>
+ <if test="unitno != null and unitno != ''">and UnitNo = #{unitno}</if>
+ <if test="unitname != null and unitname != ''">and UnitName = #{unitname}</if>
+ <if test="title != null and title != ''">and Title = #{title}</if>
+ <if test="depositbank != null and depositbank != ''">and DepositBank = #{depositbank}</if>
+ <if test="branchbankname != null and branchbankname != ''">and BranchBankName = #{branchbankname}</if>
+ <if test="bankcardno != null and bankcardno != ''">and BankCardNo = #{bankcardno}</if>
+ <if test="unitTaxNo != null and unitTaxNo != ''">and UnitTaxNo = #{unitTaxNo}</if>
</where>
</select>
@@ -63,4 +90,4 @@
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3