代码提交

liusheng

2024-03-11 4920ea5372b919f8b8f27cd709e1ab4040fe8d2b

代码提交

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

@@ -334,14 +334,6 @@
    private Integer checkstatus;

    /**
     * 绩效：1、月度、2季度、3年度
     */
    @ApiModelProperty("绩效：1、月度、2季度、3年度")
    @Excel(name = "绩效：1、月度、2季度、3年度")
    private Integer performancetype;


    /**
     * 是否算税：0未算税，1已算税
     */
    @ApiModelProperty("是否算税：0未算税，1已算税")
@@ -371,5 +363,23 @@
     */
    @ApiModelProperty("来用记录插入分享表失败")
    private String notes;


    /**
     * 绩效日期
     */
    @ApiModelProperty("绩效日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "绩效日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date jxrq;

    /**
     * 绩效：1、月度、2季度、3年度
     */
    @ApiModelProperty("绩效：1、月度、2季度、3年度")
    @Excel(name = "绩效：1、月度、2季度、3年度")
    private Integer performancetype;


}


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

@@ -370,5 +370,17 @@
    @ApiModelProperty("项目名称说明")
    private String itemdescribe;

    /**
     * 部门id
     */
    @ApiModelProperty("部门id")
    private Long deptId;

    /**
     * 部门名称
     */
    @ApiModelProperty("部门名称")
    private String deptName;

}


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

@@ -373,5 +373,18 @@
    @ApiModelProperty("项目名称说明")
    private String itemdescribe;


    /**
     * 部门id
     */
    @ApiModelProperty("部门id")
    private Long deptId;

    /**
     * 部门名称
     */
    @ApiModelProperty("部门名称")
    private String deptName;

}


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -115,6 +115,9 @@
        if (serviceFund.getFlowlevel() != null) {
            wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
        }
        if (serviceFund.getJxrq() != null) {
            wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq());
        }
        return this.list(wrappers);
    }


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java

@@ -99,6 +99,12 @@
        if (serviceFunddetail.getDel_flag() != null) {
            wrappers.eq(ServiceFunddetail::getDel_flag, serviceFunddetail.getDel_flag());
        }
        if (serviceFunddetail.getDeptId() != null) {
            wrappers.eq(ServiceFunddetail::getDeptId, serviceFunddetail.getDeptId());
        }
        if (serviceFunddetail.getDeptName() != null) {
            wrappers.eq(ServiceFunddetail::getDeptName, serviceFunddetail.getDeptName());
        }
        return this.list(wrappers);
    }


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

@@ -63,6 +63,7 @@
        <result property="applyTime" column="apply_time"/>
        <result property="uploadStates" column="upload_states"/>
        <result property="notes" column="notes"/>
        <result property="jxrq" column="jxrq"/>
    </resultMap>

    <sql id="selectServiceFundVo">
@@ -123,6 +124,7 @@
               apply_time,
               fundtaxtime,
               upload_states,
               jxrq,
               notes
        from service_fund
    </sql>
@@ -145,6 +147,7 @@
        <if test="createBy != null  and createBy != '' ">and create_by = #{createBy}</if>
        <if test="infoid != null ">and InfoID = #{infoid}</if>
        <if test="donorno != null   and donorno != '' ">and DonorNo = #{donorno}</if>
        <if test="jxrq != null ">and jxrq = #{jxrq}</if>
    </select>

    <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -203,6 +206,7 @@
        `service_fund`.`uploadtime` AS `uploadtime`,
        `service_fund`.`PretaxCost` AS `pretaxcost`,
        `service_fund`.`TaxedCost` AS `taxedcost`,
        `service_fund`.`jxrq` AS `jxrq`,
        `service_funddetail`.`ID` AS `fdid`,
        `service_funddetail`.`fundID` AS `fundid`,
        `service_funddetail`.`BeneficiaryName` AS `beneficiaryname`,

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

@@ -62,6 +62,8 @@
        <result property="taxTime" column="tax_time"/>
        <result property="jxrq" column="jxrq"/>
        <result property="invoicefiles" column="InvoiceFiles"/>
        <result property="deptId" column="dept_id"/>
        <result property="deptName" column="dept_name"/>
    </resultMap>

    <sql id="selectServiceFunddetailVo">
@@ -69,6 +71,8 @@
               fundID,
               InfoId,
               DonorNo,
               dept_id,
               dept_name,
               DonorName,
               BeneficiaryName,
               BeneficiaryNo,
@@ -142,6 +146,8 @@
            <if test="uploadflag != null  and uploadflag != ''">and uploadflag = #{uploadflag}</if>
            <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
            <if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
            <if test="deptId != null  ">and dept_id = #{deptId}</if>
            <if test="deptName != null and deptName != '' ">and dept_name = #{deptName}</if>

        </where>
    </select>
@@ -235,6 +241,8 @@
        a.SERVICETYPE,
        a.SERVICETYPENAME,
        a.subjecttype,
        a.dept_id,
        a.dept_name,
        a.subjecttypename
        from service_funddetail a,
        service_fund b