会计-项目管理,报告管理,筛选项新增,导出新增列,报告新增审定金额

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -268,6 +268,12 @@ public class CwProjectRecordsController {
         if(result.size()>0){
             String cwStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_status");
             Map<String,Object> cwStatusDictValueDTOs = JSON.parseObject(cwStatusDatas, new TypeReference<Map<String,Object>>() {});
+            //报备类型
+            String filingType = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_work_client_report_type");
+            Map<String,Object> filingTypeDictValueDTOs = JSON.parseObject(filingType, new TypeReference<Map<String,Object>>() {});
+            //项目分类
+            String projectClassification = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("project_classification");
+            Map<String,Object> projectClassificationDictValueDTOs = JSON.parseObject(projectClassification, new TypeReference<Map<String,Object>>() {});
 
             for (CwProjectRecordsDTO info : result) {
                 if(StringUtils.isNotBlank(info.getStatus())){
@@ -278,6 +284,25 @@ public class CwProjectRecordsController {
                         }
                     }
                 }
+
+                if(StringUtils.isNotBlank(info.getReportType())){
+                    for (String key : filingTypeDictValueDTOs.keySet()) {
+                        if(info.getReportType().equals(key)){
+                            info.setReportType(String.valueOf(filingTypeDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+
+                if(StringUtils.isNotBlank(info.getProjectClassification())){
+                    for (String key : projectClassificationDictValueDTOs.keySet()) {
+                        if(info.getProjectClassification().equals(key)){
+                            info.setProjectClassification(String.valueOf(projectClassificationDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+
             }
         }
         /*result.stream().forEach(item -> {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -287,6 +287,8 @@
         cw_wci.payment_method,
         cw_wcb.name as client_contacts_name,
         cw_pbt.name as business_type_name,
+        nl.report_date,
+        nl.report_type as cwReportType,
         b.member_count
         from cw_project_records a
         left join sys_user su on su.id = a.create_by_id and su.del_flag = '0'
@@ -303,6 +305,8 @@
         left join cw_project_members cpm on a.id = cpm.project_id
         left join sys_user sub on cpm.user_id = sub.id
         left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
+        LEFT JOIN cw_project_report pr on a.id = pr.project_id
+        LEFT JOIN cw_project_report_new_line  nl on pr.id = nl.report_id
         ${ew.customSqlSegment}
         ORDER BY a.create_time DESC
     </select>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -130,6 +130,18 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                     queryWrapper.in("a.create_by_id",cwProjectRecordsDTO.getCreateBy().getName()).or().like("su.name",cwProjectRecordsDTO.getCreateBy().getName());
                 }
             }
+            //报告日期
+            if (ArrayUtil.isNotEmpty(cwProjectRecordsDTO.getReportDates())) {
+                queryWrapper.between("nl.report_date", cwProjectRecordsDTO.getReportDates()[0], cwProjectRecordsDTO.getReportDates()[1]);
+            }
+            //报告类型
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCwReportType())){
+                queryWrapper.eq("nl.report_type", cwProjectRecordsDTO.getCwReportType());
+            }
+            //项目分类
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getProjectClassification())){
+                queryWrapper.eq("a.project_classification", cwProjectRecordsDTO.getProjectClassification());
+            }
         }
 
         IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page, queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -42,7 +42,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 项目名称
      */
-    @Excel(name = "项目名称",width = 25,orderNum = "0")
+    @Excel(name = "项目名称",width = 40,orderNum = "0")
     private String projectName;
 
     /**
@@ -210,11 +210,13 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 报备类型
      */
+    @Excel(name = "报备类型",width = 25,orderNum = "6")
     private String reportType;
 
     /**
      * 项目分类（专项审计业务）
      */
+    @Excel(name = "项目分类",width = 25,orderNum = "7")
     private String projectClassification;
 
     /**
@@ -271,6 +273,17 @@ public class CwProjectRecordsDTO extends BaseDTO {
 
     private String createById;
 
+    /**
+     * 报告类型
+     */
+    private String cwReportType;
+
+
+    /**
+     * 报告日期
+     */
+    private String[] reportDates;
+
 
 
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportController.java

@@ -644,6 +644,14 @@ public class CwProjectReportController {
             String cwProjectReportSignStatusDatas = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_project_report_sign_status");
             Map<String,Object> cwProjectReportSignStatusDictValueDTOs = JSON.parseObject(cwProjectReportSignStatusDatas, new TypeReference<Map<String,Object>>() {});
 
+            //报备类型
+            String filingType = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("cw_work_client_report_type");
+            Map<String,Object> filingTypeDictValueDTOs = JSON.parseObject(filingType, new TypeReference<Map<String,Object>>() {});
+            //项目分类
+            String projectClassification = SpringUtil.getBean ( IDictApi.class ).getDictListMapByDict ("project_classification");
+            Map<String,Object> projectClassificationDictValueDTOs = JSON.parseObject(projectClassification, new TypeReference<Map<String,Object>>() {});
+
+
             for (CwProjectReportData info : result) {
 //                if(StringUtils.isNotBlank(info.getStatus())){
 //                    info.setStatus(DictUtils.getDictLabel(info.getStatus(), "cw_status", ""));
@@ -700,6 +708,24 @@ public class CwProjectReportController {
                     }
                 }
 
+                if(StringUtils.isNotBlank(info.getProjectType())){
+                    for (String key : filingTypeDictValueDTOs.keySet()) {
+                        if(info.getProjectType().equals(key)){
+                            info.setProjectType(String.valueOf(filingTypeDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+
+                if(StringUtils.isNotBlank(info.getProjectClassification())){
+                    for (String key : projectClassificationDictValueDTOs.keySet()) {
+                        if(info.getProjectClassification().equals(key)){
+                            info.setProjectClassification(String.valueOf(projectClassificationDictValueDTOs.get(key)));
+                            break;
+                        }
+                    }
+                }
+
             }
         }
         EasyPoiUtil.exportExcel ( result, "报告信息",  options.getSheetName ( ), CwProjectReportData.class, fileName, response );

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectInfoData.java

@@ -104,4 +104,14 @@ public class CwProjectInfoData extends BaseEntity {
      */
     @TableField(exist = false)
     private String documentStatus;
+
+    /**
+     * 审定金额(不含税)
+     */
+    private String approvedNoIncludingTax;
+
+    /**
+     * 审定金额(含税)
+     */
+    private String approvedIncludingTax;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReport.java

@@ -289,4 +289,16 @@ public class CwProjectReport extends BaseEntity {
      */
     private String isCompleteInvoice;
 
+    /**
+     * 审定金额(不含税)
+     */
+    @TableField(exist = false)
+    private String approvedNoIncludingTax;
+
+    /**
+     * 审定金额(含税)
+     */
+    @TableField(exist = false)
+    private String approvedIncludingTax;
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -304,6 +304,7 @@ public class CwProjectReportData extends BaseDTO {
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
+    @Excel(name = "报告日期",width = 25,orderNum = "17",exportFormat = "yyyy-MM-dd")
     private Date reportDate;
 
     /**
@@ -630,4 +631,32 @@ public class CwProjectReportData extends BaseDTO {
     private String realCreateName;
 
     private String isPreInvoice;
+
+    /**
+     * 项目分类
+     */
+    @Excel(name = "项目分类",width = 20,orderNum = "18")
+    private String projectClassification;
+
+    /**
+     * 报备类型
+     */
+    @Excel(name = "报备类型",width = 20,orderNum = "19")
+    private String projectType;
+
+    /**
+     * 报告日期
+     */
+    private String[] reportDates;
+
+    /**
+     * 审定金额(不含税)
+     */
+    private String approvedNoIncludingTax;
+
+    /**
+     * 审定金额(含税)
+     */
+    private String approvedIncludingTax;
+
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectInfoMapper.xml

@@ -107,6 +107,12 @@
         <if test="deleteSign != null and deleteSign != ''">
             delete_sign = #{deleteSign},
         </if>
+        <if test="approvedNoIncludingTax != null and approvedNoIncludingTax != ''">
+            approved_no_including_tax = #{approvedNoIncludingTax},
+        </if>
+        <if test="approvedIncludingTax != null and approvedIncludingTax != ''">
+            approved_including_tax = #{approvedIncludingTax},
+        </if>
         <if test="tenantId != null and tenantId != ''">
             tenant_id = #{tenantId},
         </if>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -68,6 +68,8 @@
         ifnull(cw_pa.audit_money,"0") as "auditFees",
         e.name as projectMasterName,
         b.real_header as projectMaster2Id,
+        b.project_classification,
+        b.report_type as projectType,
         f.name as projectMaster2Name,
         cw_prs1.proc_ins_id as proc_ins_id1,
         cw_prs1.process_definition_id as process_definition_id1,
@@ -86,6 +88,7 @@
         cw_rev.new_type as newType,
         cw_rev.audit_time as auditTime,
         new_line.report_no as reportNo,
+        new_line.report_date,
         cwcb.name as servedUnitName,
         art.ID_ as rev_task_id,
         arta.ID_ as rev_task_id2,
@@ -171,6 +174,8 @@
         b.project_name as projectName,
         b.project_master_id as projectMasterId,
         b.real_header as projectMasterId2,
+        b.project_classification,
+        b.report_type as projectType,
         c.name as departmentName,
         d.name as userName,
         ifnull(cw_pa.audit_money,"0") as "auditFees",
@@ -194,6 +199,7 @@
         cw_rev.new_type as newType,
         cw_rev.audit_time as auditTime,
         new_line.report_no as reportNo,
+        new_line.report_date,
         cwcb.name as servedUnitName,
         art.ID_ as rev_task_id,
         arta.ID_ as rev_task_id2,
@@ -300,6 +306,8 @@
         new_line.report_no as reportNo,
         new_line.opinion_type as opinionType,
         new_line.seal_type as sealType,
+        new_line.approved_no_including_tax as approvedNoIncludingTax,
+        new_line.approved_including_tax as approvedIncludingTax,
         cw_re.proc_ins_id as procInsId3,
         ifnull(cw_re.review_status,'0') as reviewStatus,
         cw_re.audit_time as auditTime,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -192,6 +192,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setSealType(report.getSealType());
         infoData.setServedUnitId(report.getServedUnitId());
         infoData.setUpdateById(userDTO.getId());
+        infoData.setApprovedIncludingTax(report.getApprovedIncludingTax());
+        infoData.setApprovedNoIncludingTax(report.getApprovedNoIncludingTax());
 //        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
         infoMapper.updateCwProjectInfoDataById(infoData);
@@ -290,6 +292,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setSealType(report.getSealType());
         infoData.setServedUnitId(report.getServedUnitId());
         infoData.setUpdateById(userDTO.getId());
+        infoData.setApprovedNoIncludingTax(report.getApprovedNoIncludingTax());
+        infoData.setApprovedIncludingTax(report.getApprovedIncludingTax());
 //        infoData.setUpdateById(UserUtils.getCurrentUserDTO().getId());
         infoData.setUpdateTime(new Date());
         infoMapper.updateCwProjectInfoDataById(infoData);
@@ -415,6 +419,8 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         infoData.setOpinionType(report.getOpinionType());
         infoData.setSealType(report.getSealType());
         infoData.setServedUnitId(report.getServedUnitId());
+        infoData.setApprovedIncludingTax(report.getApprovedIncludingTax());
+        infoData.setApprovedNoIncludingTax(report.getApprovedNoIncludingTax());
 //        //报告文号生成
 //        String documentNo = "";
 //        try {
@@ -675,6 +681,19 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         if (ArrayUtil.isNotEmpty(projectReportData.getCreateDates())) {
             queryWrapper.between("a.create_time", projectReportData.getCreateDates()[0], projectReportData.getCreateDates()[1]);
         }
+        //报告日期
+        if (ArrayUtil.isNotEmpty(projectReportData.getReportDates())) {
+            queryWrapper.between("new_line.report_date", projectReportData.getReportDates()[0], projectReportData.getReportDates()[1]);
+        }
+        //项目分类
+        if (StringUtils.isNotEmpty(projectReportData.getProjectClassification())) {
+            queryWrapper.eq("b.project_classification", projectReportData.getProjectClassification());
+        }
+        //报告类型
+        if (StringUtils.isNotEmpty(projectReportData.getReportType())) {
+            queryWrapper.eq("new_line.report_type", projectReportData.getReportType());
+        }
+
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
         //UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -13,7 +13,9 @@
         su.name as user_name,
         su2.name as project_master_name,
         suu.name as project_master2_name,
-        b.id as report_new_line_id
+        b.id as report_new_line_id,
+        b.approved_no_including_tax as approvedNoIncludingTax,
+        b.approved_including_tax as approvedIncludingTax
         FROM cw_project_report a
         left join cw_project_report_new_line b
         on a.id = b.report_id and b.del_flag = '0'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/dto/ReportInfoDto.java

@@ -165,5 +165,17 @@ public class ReportInfoDto extends BaseDTO {
     private CwProjectReportData reportDetail;
 
 
+    /**
+     * 审定金额(不含税)
+     */
+    @TableField(exist = false)
+    private String approvedNoIncludingTax;
+
+    /**
+     * 审定金额(含税)
+     */
+    @TableField(exist = false)
+    private String approvedIncludingTax;
+
 
 }