会计发票导入调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -1415,7 +1415,7 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
                             }
                         }
                     }else {
-                        return "项目编号——"+cwFinanceImportDTO.getProjectNo()+"不是当前登录人所创建,请重新填写";
+                        return "项目编号——"+cwFinanceImportDTO.getProjectNo()+"不是当前登录人所创建或该项目下存在报告,请重新填写";
                     }
                 }
                 if ((StringUtils.isNotBlank(cwFinanceImportDTO.getReportNo()) && StringUtils.isBlank(cwFinanceImportDTO.getProjectNo())) ||(StringUtils.isNotBlank(cwFinanceImportDTO.getReportNo()) && StringUtils.isNotBlank(cwFinanceImportDTO.getProjectNo()))){

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

@@ -744,6 +744,8 @@
         left join cw_project_report pr on a.id =pr.project_id and pr.del_flag = '0'
         left join cw_project_report_new_line new_line on pr.id = new_line.report_id and new_line.del_flag = '0'
         where a.del_flag = '0' and a.create_by_id = #{userId}
+        and ((a.create_time >=(SELECT dv.label FROM sys_dict_type dt LEFT JOIN sys_dict_value dv on dt.id = dv.dict_type_id where dt.type='new_project_time')
+        and a.is_have_report = '0') or a.create_time < (SELECT dv.label FROM sys_dict_type dt LEFT JOIN sys_dict_value dv on dt.id = dv.dict_type_id where dt.type='new_project_time'))
         <if test="projectNoList != null">
             and a.project_number in
             <foreach collection="projectNoList" item="item" separator="," open="(" close=")" index="index">