#E10-40# 增加项目查询的接口

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitProjectDataCmd.java

@@ -8,6 +8,7 @@ import com.weaver.project.entity.SimpleMainline;
 import com.weaver.project.service.RemoteMainlineService;
 import com.weaver.seconddev.cockpit.util.DatabaseUtils;
 import com.weaver.teams.domain.user.SimpleEmployee;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,12 +36,14 @@ public class CockpitProjectDataCmd {
 
         Map<String, Object> recordMap = new HashMap<String, Object>();
 
+        String userid = String.valueOf(paramMap.get("userid"));
         List<Map<String,Object>> projectDate2 = new ArrayList<Map<String,Object>>();
         List<Map<String,Object>> projectDate3 = new ArrayList<Map<String,Object>>();
 
         try {
-            projectDate2 = getProjectDate2(employee,tenantKey);
-            projectDate3 = getProjectDate3(employee,tenantKey);
+
+            projectDate2 = getProjectDate2(employee,tenantKey,userid);
+            projectDate3 = getProjectDate3(employee,tenantKey,userid);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -52,14 +55,18 @@ public class CockpitProjectDataCmd {
         return recordMap;
     }
 
-    public List<Map<String,Object>> getProjectDate2(SimpleEmployee employee, String tenantKey) {
+    public List<Map<String,Object>> getProjectDate2(SimpleEmployee employee, String tenantKey,String userid) {
 
         List<Map<String,Object>> projectList = new ArrayList<Map<String,Object>>();
         String groupId = "weaver-project-service";
         String sourceType = "LOGIC";
 
         long employeeid = employee.getEmployeeId();
-
+        log.error("employeeid:"+employeeid);
+        if(StringUtils.isNotBlank(userid)){
+            employeeid = Long.parseLong(userid);
+        }
+        log.error("employeeid2:"+employeeid);
         try {
 
             String sql =" select w.* from (\n" +
@@ -109,7 +116,7 @@ public class CockpitProjectDataCmd {
     }
 
 
-    public List<Map<String,Object>> getProjectDate3(SimpleEmployee employee, String tenantKey) {
+    public List<Map<String,Object>> getProjectDate3(SimpleEmployee employee, String tenantKey,String userid) {
 
         List<Map<String,Object>> projectList = new ArrayList<Map<String,Object>>();
         String groupId = "weaver-project-service";
@@ -117,6 +124,11 @@ public class CockpitProjectDataCmd {
 
         String groupid = "4527875868755238091";
         long employeeid = employee.getEmployeeId();
+        log.error("employeeid:"+employeeid);
+        if(StringUtils.isNotBlank(userid)){
+            employeeid = Long.parseLong(userid);
+        }
+        log.error("employeeid2:"+employeeid);
 
         try {
 

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java

@@ -43,15 +43,19 @@ public class CockpitUserDataCmd {
             String username = employee.getName();
             log.error("username:"+username);
 
-            String deptnme = employee.getDepartment().getName();
-            log.error("deptnme:"+deptnme);
-            long subCompanyid = employee.getDepartment().getSubCompanyId();
+            String deptname = employee.getDepartment().getName();
+            log.error("deptname:"+deptname);
+            Long deptid = employee.getDepartment().getId();
+            log.error("deptid:"+deptid);
+//            long subCompanyid = employee.getDepartment().getSubCompanyId();
 
             String positionname = employee.getPosition().getName();
             log.error("positionname:"+positionname);
             String gradename = employee.getGrade().getName();
             log.error("gradename:"+gradename);
 
+
+
             String personnelstatusname = "" ;
             String personnelstatus = employee.getPersonnelStatus();
             log.error("personnelstatus:"+personnelstatus);
@@ -91,17 +95,21 @@ public class CockpitUserDataCmd {
             long jobcallid = employee.getJobCall();
             log.error("jobcallid:"+jobcallid);
 
-            if(StringUtils.isNotBlank(subCompanyid+"")){
-                String sql = " select name " +
-                             " from department " +
-                             " where id= ? and type='subcompany' " +
-                             " and delete_type=0 and TENANT_KEY = ? ";
+            if(StringUtils.isNotBlank(deptid+"")){
+                String sql =" select name from department where id in( " +
+                            " select subcompanyid from department where id = ? and delete_type=0 and tenant_key = ?" +
+                            " ) and delete_type=0 and tenant_key = ?";
 
                 log.error("sql:"+sql);
                 List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
                 SqlParamEntity sqlParamEntity = new SqlParamEntity();
                 sqlParamEntity.setParamType(SqlParamType.LONG);
-                sqlParamEntity.setValue(subCompanyid+"");
+                sqlParamEntity.setValue(deptid+"");
+                sqlparam.add(sqlParamEntity);
+
+                sqlParamEntity = new SqlParamEntity();
+                sqlParamEntity.setParamType(SqlParamType.VARCHAR);
+                sqlParamEntity.setValue(tenantKey);
                 sqlparam.add(sqlParamEntity);
 
                 sqlParamEntity = new SqlParamEntity();
@@ -173,7 +181,7 @@ public class CockpitUserDataCmd {
             log.error("field69:"+field69);
             recordMap.put("employeeId",employeeId);
             recordMap.put("username",username);
-            recordMap.put("deptmentnnme",subcompanynme+"-"+deptnme);
+            recordMap.put("deptmentnnme",subcompanynme+"-"+deptname);
             recordMap.put("positionname",positionname);
             recordMap.put("userimageurl",userimageurl);
             recordMap.put("jobcallname",jobcallname);