ID2025122416395602

src/custom/restcontroller/R.java

@@ -7763,6 +7763,21 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2026011009120502 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID2026011009311302 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID2026011013200502 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/common/adspace/adspace.java

@@ -7,6 +7,7 @@ import common.YosException;
 import common.annotation.API;
 import common.data.*;
 import common.parameter.parameter;
+import restcontroller.R;
 
 import java.util.ArrayList;
 
@@ -21,7 +22,7 @@ public class adspace extends Controller {
      *
      * @return
      */
-    @API(title = "广告查询")
+    @API(title = "广告查询",apiversion = R.ID2026011009120502.v1.class)
     public String query_adspacelist() throws YosException {
         SQLFactory adspaceSQL = new SQLFactory(this, "广告位查询");
         adspaceSQL.addParameter("systemclient", systemclient);

src/custom/restcontroller/common/usercenter/SQL/查询个人信息.sql

@@ -0,0 +1,15 @@
+SELECT t1.userid,
+       if(LENGTH(t2.name) > 0, t2.name, t1.name)                      name,
+       if(LENGTH(t2.phonenumber) > 0, t2.phonenumber, t1.phonenumber) phonenumber,
+       t2.position,
+       t3.areanames,
+       t4.depname
+from sys_users t1
+         LEFT JOIN sys_hr t2 ON t2.userid = t1.userid
+         LEFT JOIN (SELECT t2.hrid, GROUP_CONCAT(DISTINCT t1.areaname) areanames, t1.siteid
+                    from sa_salearea t1
+                             INNER JOIN sa_salearea_hr t2 ON t2.sa_saleareaid = t1.sa_saleareaid
+                    GROUP BY t2.hrid, t1.siteid) t3 ON t3.hrid = t2.hrid
+         LEFT JOIN sys_department t4 ON t4.departmentid = t2.departmentid
+WHERE t2.siteid = $siteid$
+  and t1.userid = $userid$

src/custom/restcontroller/common/usercenter/SQL/查询医院数.sql

@@ -0,0 +1,5 @@
+SELECT count(sa_customersid) count
+from sa_customers t1
+    INNER JOIN sys_datateam t2
+ON t2.ownertable='sa_customers' and ownerid=t1.sa_customersid and t2.isleader=1
+WHERE t1.siteid=$siteid$ and t2.userid=$userid$ and datastatus in (0, 1) and $where$

src/custom/restcontroller/common/usercenter/usercenter.java

@@ -87,6 +87,37 @@ public class usercenter extends Controller {
         }
     }
 
+    @API(title = "查询个人信息", apiversion = R.ID2026011009311302.v1.class)
+    public String queryUserInfo() throws YosException {
+
+        SQLFactory sqlFactory = new SQLFactory(this, "查询个人信息");
+        sqlFactory.addParameter("siteid", siteid);
+        sqlFactory.addParameter("userid", userid);
+        Rows userrows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        for (Row row : userrows) {
+            row.put("attinfos", getAttachmentUrl("sys_users", userid));
+        }
+        Row userrow = userrows.isNotEmpty() ? userrows.get(0) : new Row();
+
+        String sql = " SELECT count(sa_customersid) count from sa_customers t1 " +
+                " INNER JOIN sys_datateam t2 ON t2.ownertable='sa_customers' AND ownerid=t1.sa_customersid AND t2.isleader=1 " +
+                " WHERE t1.siteid='" + siteid + "' AND t2.userid=" + userid + " AND datastatus IN (0,1)";
+        Rows rows = dbConnect.runSqlQuery(sql);
+        userrow.put("customers", rows.isEmpty() ? 0 : rows.get(0).getInteger("count"));
+        sql = sql + " and t1.status ='已开发'";
+        rows = dbConnect.runSqlQuery(sql);
+        userrow.put("dev_customers", rows.isEmpty() ? 0 : rows.get(0).getInteger("count"));
+
+        sql = " SELECT count(DISTINCT t1.sa_agentsid) count from sys_enterprise_tradefield t1 " +
+                " INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
+                " WHERE t2.siteid='" + siteid + "' AND t2.userid='" + userid + "'";
+        rows = dbConnect.runSqlQuery(sql);
+        userrow.put("agents", rows.isEmpty() ? 0 : rows.get(0).getInteger("count"));
+
+        return getSucReturnObject().setData(userrow).toString();
+    }
+
+
     @API(title = "账户密码修改")
     public String changePassWord() throws YosException {
         String password = content.getString("password");//MD5加密
@@ -142,7 +173,7 @@ public class usercenter extends Controller {
             JSONObject object = new JSONObject();
             object.put("code", 1);
             object.put("msg", "手机验证码为：" + password);
-            return getReturnObject().setCode("0015", new String[] {password}).toString(); //手机验证码为：
+            return getReturnObject().setCode("0015", new String[]{password}).toString(); //手机验证码为：
         } else {
             JSONObject object = new JSONObject();
             Sms sms = new Sms();
@@ -215,7 +246,7 @@ public class usercenter extends Controller {
             JSONObject object = new JSONObject();
             object.put("code", 1);
             object.put("msg", "手机验证码为：" + password);
-            return getReturnObject().setCode("0015", new String[] {password}).toString(); //手机验证码为：
+            return getReturnObject().setCode("0015", new String[]{password}).toString(); //手机验证码为：
         } else {
             JSONObject object = new JSONObject();
             Sms sms = new Sms();

src/custom/restcontroller/webmanage/sale/salestarget2/salestargetbill.java

@@ -11,8 +11,7 @@ import common.data.*;
 import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
-import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.*;
 
 /**
  * 目标编制
@@ -161,7 +160,7 @@ public class salestargetbill extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, sqlFactory, "t5", "t5.sa_salestargetbillid=t1.sa_salestargetbillid ",
                 "amount");
         querySQL.addQueryFields("hospitalname", "t3.enterprisename");
-        querySQL.setWhere("createuserid",userid);
+        querySQL.setWhere("createuserid", userid);
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where);
 
@@ -341,9 +340,17 @@ public class salestargetbill extends Controller {
     @API(title = "查询年份", apiversion = R.ID2025122416395602.v1.class)
     public String queryYears() throws YosException {
 
+        Calendar calendar = Calendar.getInstance();
+        int currentYear = calendar.get(Calendar.YEAR);
+
         Rows rows = dbConnect.runSqlQuery("SELECT DISTINCT year from sa_salestargetbill WHERE siteid='" + siteid + "' order by year desc");
 
-        ArrayList<Long> years = rows.toArrayList("year",new ArrayList<>());
+        Set<Integer> yearSet = new LinkedHashSet<>(rows.toArrayList("year", new ArrayList<>()));
+        yearSet.add(currentYear); // 确保包含今年
+
+        List<Integer> years = new ArrayList<>(yearSet);
+        years.sort(Collections.reverseOrder()); // 保持降序
+
 
         return getSucReturnObject().setData(years).toString();
     }