合同关联发票bug、报告作废展示报告号

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractInfoService.java

@@ -699,7 +699,7 @@ public class ContractInfoService {
                         QueryWrapper<ContractInfo> queryWrapper = new QueryWrapper<>();
                         queryWrapper.in("cw_wci.id",ids);
                         queryWrapper.eq("cw_wci.del_flag","0");
-                        queryWrapper.eq("cw_wci.status","5");
+//                        queryWrapper.eq("cw_wci.status","5");  //  取消查询审核通过(status=5)的合同数据，只要求数据有效(del_flag=0)就可以
                         queryWrapper.orderByDesc("cw_wci.create_date");
                         if(ObjectUtil.isNotEmpty(contractInfo)){
                             if(StringUtils.isNotBlank(contractInfo.getContractName())){

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -280,16 +280,16 @@
         a.invoice_id
         from
         (select distinct
-            invoice_id
+            cw_fib.invoice_id
         from cw_finance_invoice_base cw_fib
         where cw_fib.del_flag = '0'
         and cw_fib.program_id in (select cw_pr.id from cw_project_records cw_pr where cw_pr.contract_id = #{id} and cw_pr.del_flag = '0')
         union
         select distinct
-            invoice_id
+            fi.invoice_id
         from cw_finance_invoice_base fi
-        where program_id is null or program_id = ''
-        and contract_id = #{id}
+        where (fi.program_id is null or fi.program_id = '')
+        and fi.contract_id = #{id}
         AND fi.del_flag = '0') a
     </select>
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -78,7 +78,9 @@
 				cw_ar.process_definition_id as cwProDefId,
 				d.real_header as projectMaster2Id,
                 k.name as projectMaster2Name,
-                art.ID_ as task_id
+                art.ID_ as task_id,
+                b.report_no as report_no,
+                b.report_id as report_id
 
 				FROM cw_project_report_cancell_apply a
 				LEFT JOIN cw_project_report_new_line b

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/dto/ReportInfoDto.java

@@ -130,4 +130,9 @@ public class ReportInfoDto extends BaseDTO {
      * 数据审核人  纸质归档
      */
     private List<String> auditUserIds;
+
+    /**
+     * 报告id
+     */
+    private String reportId;
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/OfficeController.java

@@ -48,7 +48,7 @@ public class OfficeController {
      * @return
      */
     @ApiLog("查询部门")
-    @PreAuthorize("hasAnyAuthority('sys:office:view','sys:office:add','sys:office:edit')")
+//    @PreAuthorize("hasAnyAuthority('sys:office:view','sys:office:add','sys:office:edit')")
     @GetMapping("queryById")
     public ResponseEntity queryById(@RequestParam String id) {
         OfficeDTO officeDTO = officeWrapper.toDTO (officeService.getById (id));