feat(swc): 薪酬年收入证明统计单表单逻辑优化

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hcdm/business/annualincome/AnnualIncomeService.java

@@ -97,6 +97,7 @@ public class AnnualIncomeService {
     private DynamicObjectCollection queryCalPersonByCalPayRollTask (List<Long> taskIds) {
         logger.info("开始查询核算人员数据，参数：{}", taskIds);
         QFilter filter = new QFilter("hsas_calpayrolltask.id", QCP.in, taskIds);
+        filter.and("calstatus", QCP.equals, "4");
         QueryEntityType queryEntityType = (QueryEntityType) EntityMetadataCache.getDataEntityType("hsas_salarycalresultqueryex");
         DataSet dataSet = HRQueryEntityHelper.getInstance().getQueryDataSet(queryEntityType, "id,hsbs_percre.number,hsbs_employee.id,hsbs_employee.empnumber,hsas_calpayrolltask.payrolldate", new QFilter[]{filter}, "id", false, 0, 1000);
         DynamicObjectCollection calPersonCols = ORM.create().toPlainDynamicObjectCollection(dataSet);

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/hcdm/formplugin/annualincome/SalAnnualIncomeBillEdit.java

@@ -65,6 +65,7 @@ public class SalAnnualIncomeBillEdit extends AbstractFormPlugin implements Plugi
         String key = afterDoOperationEventArgs.getOperateKey();
         switch (key) {
             case "donothing_query":
+                model.deleteEntryData("nckd_entryentity");
                 doQuery();
                 break;
         }