修改合同查询排序和岗位生效审批逻辑

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hcdm/formplugin/web/AdjustJobBillEffectOp.java

@@ -119,6 +119,12 @@ public class AdjustJobBillEffectOp extends AbstractOperationServicePlugIn implem
                     SaveServiceHelper.save(new DynamicObject[]{bill});
                 }
             }
+            else {
+                bill.set("billstatus", "C");
+                bill.set("auditor", UserServiceHelper.getCurrentUserId());
+                bill.set("auditdate",new Date());
+                SaveServiceHelper.save(new DynamicObject[]{bill});
+            }
         }
 
         //职级生效

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hcdm/task/AdjustJobBillEffectTask.java

@@ -36,11 +36,11 @@ public class AdjustJobBillEffectTask extends AbstractTask implements Plugin {
     public void execute(RequestContext requestContext, Map<String, Object> map1) throws KDException {
         Date nowDateTime = HRDateTimeUtils.getNowDateTime();
         QFilter billStatus = new QFilter("billstatus", "=", "C");
-        QFilter auditStatus = new QFilter("auditstatus", "=", "C");
+        //QFilter auditStatus = new QFilter("auditstatus", "=", "C");
         QFilter changeOver = new QFilter("changeover", "=", "0");
         QFilter effectFilter = new QFilter("changeentry.changeeffdate", "<=", nowDateTime);
         QFilter changeStatus = new QFilter("changeentry.changestatus", "=", "0");
-        DynamicObject[] batchJobObj = BillHelper.loadDynamicObjectArray(new QFilter[]{billStatus, auditStatus, changeOver, effectFilter, changeStatus});
+        DynamicObject[] batchJobObj = BillHelper.loadDynamicObjectArray(new QFilter[]{billStatus, changeOver, effectFilter, changeStatus});
         if (!HRArrayUtils.isEmpty(batchJobObj)) {
             List<DynamicObject> allEntryObjs = new ArrayList(16);
             DynamicObject[] var11 = batchJobObj;

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

@@ -97,7 +97,7 @@ public class CalPersonUtil {
         QFilter dateFilter = filter1.or(filter2);
         QFilter filter = personFilter.and(dateFilter);
         String selectFields = "person.id,actualsigncompany.id,startdate,signstatus,signeddate";
-        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter},"signeddate desc,signstatus desc");
+        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter},"fstartdate desc,signstatus desc");
         //按照person.id提取
         Map contractMap = contractCols.stream().collect(Collectors.toMap((dyx) -> {
             return dyx.getLong("person.id");
@@ -132,7 +132,7 @@ public class CalPersonUtil {
         QFilter dateFilter = filter1.or(filter2);
         QFilter filter = personFilter.and(dateFilter);
         String selectFields = "person.id,actualsigncompany.id,startdate,signstatus,signeddate";
-        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter},"signeddate desc,signstatus desc");
+        DynamicObjectCollection contractCols = QueryServiceHelper.query(CONTRACT_ENTITY, selectFields, new QFilter[]{filter},"fstartdate desc,signstatus desc");
         //按照person.id提取
         Map contractMap = contractCols.stream().collect(Collectors.toMap((dyx) -> {
             return dyx.getLong("person.id");