1.核算名单-逻辑调整

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hsas/calperson/CalPersonExtService.java

@@ -88,13 +88,13 @@ public class CalPersonExtService implements IAddCalPersonExtService {
         for(Map<String,Object> data : datas) {
             Long personId = Long.valueOf(data.get("person.id").toString());
             DynamicObject paySettingDyn = paySettingMap.get(personId);
-            if(ObjectUtils.isEmpty(paySettingDyn))
-                continue;
-            //银行卡信息塞值
-            if(perBankCardFields != null) {
-                for (String field : perBankCardFields) {
-                    Object fieldValue = paySettingDyn.get("entryentity.perbankcard." + field);
-                    data.put("hrpi_perbankcard" + "." + field, fieldValue);
+            if(!ObjectUtils.isEmpty(paySettingDyn)) {
+                //银行卡信息塞值
+                if (perBankCardFields != null) {
+                    for (String field : perBankCardFields) {
+                        Object fieldValue = paySettingDyn.get("entryentity.perbankcard." + field);
+                        data.put("hrpi_perbankcard" + "." + field, fieldValue);
+                    }
                 }
             }
             //合同信息塞值

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hsas/util/CalPersonUtil.java

@@ -87,15 +87,15 @@ public class CalPersonUtil {
         filter2.and("startdate", QCP.less_equals, lastDate);
         QFilter dateFilter = filter1.or(filter2);
         QFilter filter = personFilter.and(dateFilter);
-        String selectFields = "person.id,actualsigncompany.id";
-        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter});
+        String selectFields = "person.id,actualsigncompany.id,startdate";
+        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter},"startdate desc");
         //按照person.id提取
         Map contractMap = contractCols.stream().collect(Collectors.toMap((dyx) -> {
             return dyx.getLong("person.id");
         }, (dyx) -> {
             return dyx.getLong("actualsigncompany.id");
-        }, (key1, key2) -> {
-            return key2;
+        }, (value1, value2) -> {
+            return value1;
         }));
         return contractMap;
     }
@@ -118,15 +118,15 @@ public class CalPersonUtil {
         filter2.and("startdate", QCP.less_equals, date);
         QFilter dateFilter = filter1.or(filter2);
         QFilter filter = personFilter.and(dateFilter);
-        String selectFields = "person.id,actualsigncompany.id";
-        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter});
+        String selectFields = "person.id,actualsigncompany.id,startdate";
+        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter},"startdate desc");
         //按照person.id提取
         Map contractMap = contractCols.stream().collect(Collectors.toMap((dyx) -> {
             return dyx.getLong("person.id");
         }, (dyx) -> {
             return dyx.getLong("actualsigncompany.id");
-        }, (key1, key2) -> {
-            return key2;
+        }, (value1, value2) -> {
+            return value1;
         }));
         return contractMap;
     }