1.考勤公式日志

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hrmp/hbpm/opplugin/web/position/AutoEndPartTimeTask.java

@@ -34,24 +34,24 @@ public class AutoEndPartTimeTask extends AbstractTask implements Plugin {
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
         log.info(" -------- 自动取消兼岗开始 -------- ");
         StringBuilder sb = new StringBuilder();
-        sb.append(" /*dialect*/ select a.fpositionid,max(a.fisprimary) maxp,min(a.fisprimary) minp \n");
+
+        sb.append(" /*dialect*/ select * from (\n");
+        sb.append(" select a.fpositionid,max(a.fisprimary) maxp,min(a.fisprimary) minp \n");
         sb.append(" from t_hrpi_empposorgrel a \n");
         sb.append(" left join t_hrpi_pernontsprop b on a.fpersonid = b.fpersonid and b.fiscurrentversion = '1' \n");
         sb.append(" left join t_hbss_laborrelstatus c on c.fid = b.fk_nckd_ygzt \n");
         sb.append(" where a.fiscurrentversion = '1' \n");
         sb.append("   and a.fbusinessstatus = '1' \n");
         sb.append("   and (c.fnumber <> '9010_S' or c.fnumber is null) \n");
-        sb.append(" group by a.fpositionid");
+        sb.append(" group by a.fpositionid \n");
+        sb.append(" ) a where a.maxp = '1' and a.minp = '0' ");
         log.info(" -------- sql : " +sb.toString()+ " -------- ");
         DataSet dataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("hr"), sb.toString());
 
         List<Long> positionIds = new ArrayList<Long>();
         while(dataSet.hasNext()) {
             Row rowData = dataSet.next();
-            //取同时有兼职和主职的岗位
-            if(rowData.getInteger("maxp") == 1 && rowData.getInteger("minp") == 0) {
-                positionIds.add(rowData.getLong("fpositionid"));
-            }
+            positionIds.add(rowData.getLong("fpositionid"));
         }
 
         //取出岗位下所有兼职

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/wtc/wtbs/util/PrintLogInfoUtils.java

@@ -0,0 +1,19 @@
+package nckd.jimin.jyyy.hr.wtc.wtbs.util;
+
+import kd.bos.logging.Log;
+import kd.bos.logging.LogFactory;
+
+/**
+ * 考勤公式中打印日志
+ * @author Tyx
+ * @since 2025-06-24 15:44
+ */
+public final class PrintLogInfoUtils {
+
+    private static final Log log = LogFactory.getLog(PrintLogInfoUtils.class);
+
+    private static boolean printLog(String key, Object value) {
+        log.info(" 考勤日志 key : {}, value : {}", key, value);
+        return true;
+    }
+}