code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hcss/formplugin/IncomeProofBillExPlugin.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  * 参数名称为 INCOMEPROOFBILL_CUSTOMITEMS 收入证明办理单，自定义收入证明项目编码 参数值为  000001,000002
  * 参数名称为 INCOMEPROOFBILL_SALARYITEMS 收入证明办理单，自定义收入证明获取员工薪酬金额的薪酬项目编码 参数值为  JT_283,JT_477  示例
  * @author turborao
- * @date 2025-12-03
+ * @date 2026-01-07
  * @desc
  */
 public class IncomeProofBillExPlugin extends AbstractHcssBaseFormPlugin {
@@ -139,8 +139,8 @@ public class IncomeProofBillExPlugin extends AbstractHcssBaseFormPlugin {
 
         }
         for (String customItem : customItems) {
-            if (!entryNumbers.contains(customItem)) {
-                return false;
+            if (entryNumbers.contains(customItem)) {
+                return true;
             }
         }
         return false;

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/utils/SwcUtils.java

@@ -129,17 +129,16 @@ public class SwcUtils {
                 "left join t_hsas_caltableentry g on g.fid = f.fid \n" +
                 "left join t_hsbs_salaryitem h on h.fid = g.fsalaryitemid \n" +
                 "where 1 = 1 and b1.ftaskstatus in ('4','7','8','9')  ---计算完成 9--已审核 7--审批处理中 8--审批通过 4 \n" +
-                "  and a.fiscurrentversion = '1'\n" +
                 "  and h.fnumber in ("+salaryitem+") \n");
         sb.append("and b1.fpaydate >= '"+startDateStr+"' \n");
         sb.append("and b1.fpaydate <= '"+endDateStr+"' \n");
         sb.append("and c.femployeeid in ("+empId+") \n");
+        //sb.append("and c.femployeeid in (2311775636290546688) \n");
         sb.append("group by c.femployeeid,d.fname, d.fempnumber");
 
         return sb;
     }
 
-
     public static List<Long> getExcludePayRollGroupIds(Date startDate) {
         List<Long> excludeGroupIds = new ArrayList<Long>();
         QFilter filter = new QFilter("nckd_calyear", QCP.equals, startDate);