日志修改

liusheng

7 小时以前 34a716e48e49743083953113bfc2e8011d52444f

日志修改

 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>

 ruoyi-admin/src/main/resources/application.yml

@@ -53,7 +53,7 @@
    # 国际化资源文件路径
    basename: i18n/messages
  profiles:
    active: druid
    active: srm
  # 文件上传
  servlet:
    multipart:

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceExternalperson.java

@@ -98,6 +98,10 @@
    /** 身份证号 */
    @ApiModelProperty("身份证号")
    private String idcardno;

    /** 公司税号 */
    @ApiModelProperty("公司税号")
    private String unitTaxNo;




 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();

 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();

 ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml

@@ -28,13 +28,39 @@
        <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>
@@ -49,6 +75,7 @@
            <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>