renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/xc' into xc

Browse Source
This commit is contained in:
hejiayang
2026-03-19 15:29:48 +08:00
parent f7f27c34c9 a975e9d223
commit 307cc42437
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java
-4
View File
@@ -31,11 +31,7 @@ public class HelperSchedulingHistoryJob {
@XxlJob(value = "helperSchedulingHistoryJob") @XxlJob(value = "helperSchedulingHistoryJob")
public ReturnT<String> helperSchedulingHistory() { public ReturnT<String> helperSchedulingHistory() {
String param = XxlJobHelper.getJobParam();
JSONObject jsonObject = JSONObject.parseObject(param);
String clientSign = jsonObject.getString("clientSign");
ClientSignThreadLocal.setClientSign(clientSign);
XxlJobHelper.log("开始记录全科医生排班历史"); XxlJobHelper.log("开始记录全科医生排班历史");
log.info("开始记录全科医生排班历史"); log.info("开始记录全科医生排班历史");
try { try {
health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/SyncScheduleJob.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class SyncScheduleJob {
@XxlJob(value = "endUserAndProfessiorHelper") @XxlJob(value = "endUserAndProfessiorHelper")
public ReturnT<String> endUserAndProfessiorHelper(String time) { public ReturnT<String> endUserAndProfessiorHelper() {
String expireHour = "168"; String expireHour = "168";
String param = XxlJobHelper.getJobParam(); String param = XxlJobHelper.getJobParam();
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
+4 -4
View File
@@ -38,10 +38,10 @@
order by tian asc order by tian asc
</if> </if>
<if test="dbType == 'oracle' || dbType == 'oracle12c' || dbType == 'dm'"> <if test="dbType == 'oracle' || dbType == 'oracle12c' || dbType == 'dm'">
select count(*) as visit select count(*) as "visit"
,count(distinct(ip)) as ip ,count(distinct(ip)) as "ip"
,to_char(create_time, 'yyyy-mm-dd') as tian ,to_char(create_time, 'yyyy-mm-dd') as "tian"
,to_char(create_time, 'mm-dd') as type ,to_char(create_time, 'mm-dd') as "type"
from QH_SYS_LOG from QH_SYS_LOG
where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd} where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
group by to_char(create_time, 'yyyy-mm-dd'),to_char(create_time, 'mm-dd') group by to_char(create_time, 'yyyy-mm-dd'),to_char(create_time, 'mm-dd')
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+1 -1
View File
@@ -403,7 +403,7 @@
where INSTR(',' || #{userIds} || ',', ',' || id || ',') > 0 where INSTR(',' || #{userIds} || ',', ',' || id || ',') > 0
</select> </select>
<select id="getUserNumByOrgCodeList" resultType="java.util.HashMap"> <select id="getUserNumByOrgCodeList" resultType="java.util.HashMap">
SELECT org_code as orgCode, count(org_code) as num SELECT org_code as "orgCode", count(org_code) as "num"
FROM QH_SYS_USER FROM QH_SYS_USER
WHERE org_code LIKE WHERE org_code LIKE
<foreach collection="orgCodeList" item="orgCode" separator=" OR " open="(" close=")"> <foreach collection="orgCodeList" item="orgCode" separator=" OR " open="(" close=")">