Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -246,4 +246,6 @@ public class CwProjectReportData extends BaseDTO {
      * 报告文号
      */
     private String reportNo;
+
+    private String[] contractAmounts;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -73,7 +73,8 @@
         cw_prs2.proc_ins_id as proc_ins_id2,
         cw_prs2.process_definition_id as process_definition_id2,
         cw_prs2.status as status2,
-        cw_prs2.id as sid2
+        cw_prs2.id as sid2,
+        new_line.report_no as reportNo
         FROM cw_project_report a
         left join cw_project_records b on a.project_id = b.id
         LEFT JOIN sys_office c on a.office_id = c.id
@@ -81,6 +82,7 @@
         LEFT JOIN sys_user e on b.project_master_id = e.id
         LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
+        left join cw_project_report_new_line new_line on a.id = new_line.report_id
         ${ew.customSqlSegment}
     </select>
     <select id="queryById" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportData">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -361,6 +361,20 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
             queryWrapper.between("a.create_date", contractDates[0], contractDates[1]);
         }
+        //5、报告文号
+        if (StringUtils.isNotEmpty(projectReportData.getReportNo())) {
+            queryWrapper.like("new_line.report_no", projectReportData.getReportNo());
+        }
+        //6、审计收费
+        String[] contractAmounts = projectReportData.getContractAmounts();
+        if (contractAmounts != null) {
+            if (StringUtils.isNotEmpty(contractAmounts[0])) {
+                queryWrapper.ge("a.audit_fees",contractAmounts[0]);
+            }
+            if (StringUtils.isNotEmpty(contractAmounts[1])) {
+                queryWrapper.le("a.audit_fees", contractAmounts[1]);
+            }
+        }
 
         IPage<CwProjectReportData> list = reportMapper.findList(page, queryWrapper);
         return list;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/controller/CwReimbursementTypeController.java

@@ -120,6 +120,18 @@ public class CwReimbursementTypeController {
      * @return
      */
     @ApiOperation(value = "查询树形")
+    @GetMapping("/treeData1")
+    public ResponseEntity<List<CwReimbursementTypeInfo>> treeData1(@RequestParam(required = false) String extId, @RequestParam(required = false) String type) throws Exception{
+        List<CwReimbursementTypeInfo> infos = treeService.treeDataForType1(extId, type);
+        return ResponseEntity.ok(infos);
+    }
+
+    /**
+     * 查询树形
+     * @param extId 排除的ID
+     * @return
+     */
+    @ApiOperation(value = "查询树形")
     @GetMapping("/treeData2")
     public ResponseEntity<List<CwReimbursementTypeInfo>> treeData2(@RequestParam(required = false) String extId, @RequestParam(required = false) String type) throws Exception{
         List<CwReimbursementTypeInfo> infos = treeService.treeDataForType2(extId, type);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/service/CwReimbursementTypeForTreeDataService.java

@@ -34,6 +34,23 @@ public class CwReimbursementTypeForTreeDataService extends TreeService<CwReimbur
      */
     public List<CwReimbursementTypeInfo> treeDataForType(String extId, String type) throws Exception{
         //获取所有的业务类型为1的数据
+//        List<CwReimbursementTypeInfo> allList = typeMapper.getAllList("1");
+        List<CwReimbursementTypeInfo> allList = super.list (new LambdaQueryWrapper<>( (Class <CwReimbursementTypeInfo>) entityClass ).orderByAsc ( CwReimbursementTypeInfo::getSort ));
+        CwReimbursementTypeInfo root = entityClass.getConstructor ( ).newInstance ( );
+        root.setId ( TreeDTO.getRootId () );
+        List <CwReimbursementTypeInfo> rootTree = this.formatListToTreeForType ( root, allList, extId, type );
+        return rootTree;
+    }
+
+    /**
+     * 获取JSON树形数据。
+     *
+     * @param extId 排除的ID
+     * @param type 禁选类型
+     * @return
+     */
+    public List<CwReimbursementTypeInfo> treeDataForType1(String extId, String type) throws Exception{
+        //获取所有的业务类型为1的数据
         List<CwReimbursementTypeInfo> allList = typeMapper.getAllList("1");
 //        List<CwReimbursementTypeInfo> allList = super.list (new LambdaQueryWrapper<>( (Class <CwReimbursementTypeInfo>) entityClass ).orderByAsc ( CwReimbursementTypeInfo::getSort ));
         CwReimbursementTypeInfo root = entityClass.getConstructor ( ).newInstance ( );