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

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/api/service/impl/ConDepartmentApiServiceImpl.java

@@ -253,7 +253,7 @@ public class ConDepartmentApiServiceImpl implements ConDepartmentApiService {
         String allChildKey = "consulation:departmentHaveDoctor:AllLevelTwo";
 
 
-        if(!CollectionUtils.isEmpty(list)){
+            if(!CollectionUtils.isEmpty(list)){
             redisUtil.del(key);
             redisUtil.del(allChildKey);
             for (ConDepartmentDO conDepartmentDO : list) {

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/HelperSchedulingHistoryJob.java

@@ -31,11 +31,7 @@ public class HelperSchedulingHistoryJob {
 
     @XxlJob(value = "helperSchedulingHistoryJob")
     public ReturnT<String> helperSchedulingHistory() {
-        String param = XxlJobHelper.getJobParam();
-        JSONObject jsonObject = JSONObject.parseObject(param);
-        String clientSign = jsonObject.getString("clientSign");
 
-        ClientSignThreadLocal.setClientSign(clientSign);
         XxlJobHelper.log("开始记录全科医生排班历史");
         log.info("开始记录全科医生排班历史");
         try {

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/task/SyncScheduleJob.java

@@ -32,7 +32,7 @@ public class SyncScheduleJob {
 
 
     @XxlJob(value = "endUserAndProfessiorHelper")
-    public ReturnT<String> endUserAndProfessiorHelper(String time) {
+    public ReturnT<String> endUserAndProfessiorHelper() {
         String expireHour = "168";
 
         String param = XxlJobHelper.getJobParam();

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml

@@ -38,10 +38,10 @@
             order by tian asc
         </if>
         <if test="dbType == 'oracle' || dbType == 'oracle12c' || dbType == 'dm'">
-            select count(*) as visit
-            ,count(distinct(ip)) as ip
-            ,to_char(create_time, 'yyyy-mm-dd') as tian
-            ,to_char(create_time, 'mm-dd') as type
+            select count(*) as "visit"
+            ,count(distinct(ip)) as "ip"
+            ,to_char(create_time, 'yyyy-mm-dd') as "tian"
+            ,to_char(create_time, 'mm-dd') as "type"
             from QH_SYS_LOG
             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')

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -403,7 +403,7 @@
         where INSTR(',' || #{userIds} || ',', ',' || id || ',') > 0
     </select>
     <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
         WHERE org_code LIKE
         <foreach collection="orgCodeList" item="orgCode" separator=" OR " open="(" close=")">