新增SubjectTypeName

liusheng

2023-07-26 368d926041f342ed097e7f692927d9ae484f2a60

新增SubjectTypeName

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -741,7 +741,7 @@
        List<Double> sqljList = new ArrayList<>();
        List<Double> ksljList = new ArrayList<>();
        List<Double> shljList = new ArrayList<>();
        Map<String, Optional<ServiceFunddetailAssort>> result = fd.stream().collect(Collectors.groupingBy(ServiceFunddetail::getApplytypename, Collectors.mapping(obj -> new ServiceFunddetailAssort(obj.getAmount(), obj.getTaxamount(), obj.getTaxedamount()), Collectors.reducing(ServiceFunddetailAssort::add))));
        Map<String, Optional<ServiceFunddetailAssort>> result = fd.stream().collect(Collectors.groupingBy(ServiceFunddetail::getSubjectTypeName, Collectors.mapping(obj -> new ServiceFunddetailAssort(obj.getAmount(), obj.getTaxamount(), obj.getTaxedamount()), Collectors.reducing(ServiceFunddetailAssort::add))));
        result.forEach((FWFL, serviceFunddetailAssort) -> {
            Map<String, Object> map1 = new HashMap<String, Object>();
            map1.put("FWFL", FWFL);

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

@@ -230,6 +230,14 @@
    @Excel(name = "事由备注")
    private String remark;

    /** 事由备注 */
    @ApiModelProperty("科目类型：成本收入")
    private String SubjectType;

    /** 事由备注 */
    @ApiModelProperty("科目类型名称")
    private String SubjectTypeName;


}


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

@@ -54,6 +54,8 @@
        <result property="servicetypename" column="SERVICETYPENAME"/>
        <result property="orderno" column="OrderNo"/>
        <result property="itemcode" column="ItemCode"/>
        <result property="SubjectType" column="subjecttype"/>
        <result property="SubjectTypeName" column="subjecttypename"/>
    </resultMap>

    <sql id="selectServiceFunddetailVo">
@@ -105,7 +107,9 @@
               SERVICESSCOPE,
               SERVICESSCOPENAME,
               SERVICETYPE,
               SERVICETYPENAME
               SERVICETYPENAME,
               subjecttype,
               subjecttypename
        from service_funddetail
    </sql>

@@ -218,7 +222,9 @@
        a.SERVICESSCOPE,
        a.SERVICESSCOPENAME,
        a.SERVICETYPE,
        a.SERVICETYPENAME
        a.SERVICETYPENAME,
        a.subjecttype,
        a.subjecttypename
        from service_funddetail a,
        service_fund b
        where a.del_flag = '0'