新增字段

liusheng

2023-08-14 64199ade0ca5dc5af5a10038a51b0d54accc0f05

新增字段

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

@@ -129,6 +129,11 @@
    @Excel(name = "中心签字")
    private String opochecker;

    /** 院长签字 */
    @ApiModelProperty("院长签字")
    @Excel(name = "院长签字")
    private String president;

    /** 财务副院长签字 */
    @ApiModelProperty("财务副院长签字")
    @Excel(name = "财务副院长签字")

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

@@ -186,6 +186,12 @@
    @Excel(name = "财务副院长签字")
    private String finvicepresident;

    /** 院长签字 */
    @ApiModelProperty("院长签字")
    @Excel(name = "院长签字")
    private String president;


    /** 业务副院长签字 */
    @ApiModelProperty("业务副院长签字")
    @Excel(name = "业务副院长签字")

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

@@ -163,8 +163,13 @@
    @Excel(name = "中心签字")
    private String opochecker;

    /** 财务副院长签字 */
    @ApiModelProperty("院长签字")
    @Excel(name = "院长签字")
    private String president;

    /**
     * 财务副院长签字
     * 院长签字
     */
    @ApiModelProperty("财务副院长签字")
    @Excel(name = "财务副院长签字")

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

@@ -179,6 +179,11 @@
    @Excel(name = "财务副院长签字")
    private String finvicepresident;

    /** 院长签字 */
    @ApiModelProperty("院长签字")
    @Excel(name = "院长签字")
    private String president;

    /**
     * 业务副院长签字
     */

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

@@ -33,6 +33,7 @@
        <result property="deptmentname" column="DeptmentName"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="president" column="president"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="officedirector" column="OfficeDirector"/>
        <result property="financedirector" column="FinanceDirector"/>
@@ -87,6 +88,7 @@
               DeptmentName,
               OPOchecker,
               FinVicePresident,
               president,
               BusVicePresident,
               OfficeDirector,
               FinanceDirector,

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

@@ -42,6 +42,7 @@
        <result property="deptmentname" column="DeptmentName"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="president" column="president"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="officedirector" column="OfficeDirector"/>
        <result property="financedirector" column="FinanceDirector"/>
@@ -97,6 +98,7 @@
               DeptmentName,
               OPOchecker,
               FinVicePresident,
               president,
               BusVicePresident,
               OfficeDirector,
               FinanceDirector,

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

@@ -31,6 +31,7 @@
        <result property="deptmentname" column="DeptmentName"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="president" column="president"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="officedirector" column="OfficeDirector"/>
        <result property="financedirector" column="FinanceDirector"/>
@@ -87,6 +88,7 @@
               DeptmentName,
               OPOchecker,
               FinVicePresident,
               president,
               BusVicePresident,
               OfficeDirector,
               FinanceDirector,

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

@@ -32,6 +32,7 @@
        <result property="deptmentname" column="DeptmentName"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="president" column="president"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="officedirector" column="OfficeDirector"/>
        <result property="financedirector" column="FinanceDirector"/>
@@ -91,6 +92,7 @@
               DeptmentName,
               OPOchecker,
               FinVicePresident,
               president,
               BusVicePresident,
               OfficeDirector,
               FinanceDirector,

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -84,6 +84,9 @@
                    ServiceFund serviceFund = new ServiceFund();
                    serviceFund.setId(serviceFundShared.getSerfunid());
                    serviceFund.setZffs(serviceFundShared.getZffs());
                    if (StringUtils.isNotBlank(serviceFundShared.getPresident())) {
                        serviceFund.setPresident(serviceFundShared.getPresident());
                    }
                    if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
                        serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
                    }
@@ -304,6 +307,9 @@
                    serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
                    serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());

                    if (StringUtils.isNotBlank(serviceReimbursementShared.getPresident())) {
                        serviceReimbursement.setPresident(serviceReimbursementShared.getPresident());
                    }
                    if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
                        serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
                    }