Merge remote-tracking branch 'origin/main'

src/com/customization/jucailinkq/workflow/KQDoRepossessedProxyCmd.java

@@ -1,7 +1,6 @@
-package com.engine.jucailinkq.attendance.workflow.proxy;
+package com.customization.jucailinkq.workflow;
 
 import com.engine.core.cfg.annotation.CommandDynamicProxy;
-import com.engine.core.impl.aop.AbstractServiceProxy;
 import com.engine.core.interceptor.AbstractCommandProxy;
 import com.engine.core.interceptor.Command;
 import com.engine.workflow.cmd.monitor.DoRepossessedCmd;

src/com/engine/jucailinkq/attendance/workflow/proxy/KQDodeleteCmdProxy.java

@@ -1,29 +0,0 @@
-package com.engine.jucailinkq.attendance.workflow.proxy;
-
-
-import com.engine.core.cfg.annotation.CommandDynamicProxy;
-import com.engine.core.interceptor.AbstractCommandProxy;
-import com.engine.core.interceptor.Command;
-import com.engine.workflow.cmd.monitor.DoDeleteCmd;
-import weaver.conn.RecordSet;
-import weaver.general.BaseBean;
-import weaver.workflow.workflow.RequestForceDrawBack;
-
-import java.util.Map;
-
-@CommandDynamicProxy(target = DoDeleteCmd.class, desc = "流程监控删除流程==清除文号")
-public class KQDodeleteCmdProxy extends AbstractCommandProxy<Map<String, Object>> {
-    @Override
-    public Map<String, Object> execute(Command<Map<String, Object>> command) {
-        BaseBean bb = new BaseBean();
-        bb.writeLog("KQDodeleteCmdProxy start");
-        Map<String, Object> resultMap = nextExecute(command);
-
-        RecordSet rs = new RecordSet();
-        Map<String, Object> requestMap = (Map<String, Object>)resultMap.get("result");
-        bb.writeLog("KQDodeleteCmdProxy requestMap"+requestMap.toString());
-
-
-        return resultMap;
-    }
-}

src/com/engine/jucailinkq/attendance/workflow/proxy/TestProxy.java

@@ -1,29 +0,0 @@
-package com.engine.jucailinkq.attendance.workflow.proxy;
-
-
-import com.engine.core.cfg.annotation.CommandDynamicProxy;
-import com.engine.core.interceptor.AbstractCommandProxy;
-import com.engine.core.interceptor.Command;
-import com.engine.jucailinkq.attendance.attendanceplan.cmd.GetAttendanceItemsByPersonDataCmd;
-import weaver.conn.RecordSet;
-import weaver.general.BaseBean;
-
-
-import java.util.Map;
-
-@CommandDynamicProxy(target = GetAttendanceItemsByPersonDataCmd.class, desc = "流程监控删除流程==清除文号")
-public class TestProxy extends AbstractCommandProxy<Map<String, Object>> {
-    @Override
-    public Map<String, Object> execute(Command<Map<String, Object>> command) {
-        BaseBean bb = new BaseBean();
-        bb.writeLog("TestProxy start");
-        Map<String, Object> resultMap = nextExecute(command);
-
-        RecordSet rs = new RecordSet();
-        Map<String, Object> requestMap = (Map<String, Object>)resultMap.get("data");
-        bb.writeLog("TestProxy requestMap"+requestMap.toString());
-
-
-        return resultMap;
-    }
-}

src/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.java

@@ -260,7 +260,7 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
                 }
             }else if ("2".equals(list_type) && !"".equals(sqltj)){
                 sqltj = Utils.converSQL(sqltj);
-                log.info("getPersonnelGroupingByPerson sqltj : [{}]",sqltj);
+                log.debug("getPersonnelGroupingByPerson sqltj : [{}]",sqltj);
                 List<Map<String,Object>> dataList = DbTools.getSqlToList(sqltj);
                 for (Map<String,Object> dataMap :dataList){
                     String hrmId = Util.null2String(dataMap.get("id"));