diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsOldStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsOldStat.java index 10516618..aaa93b41 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsOldStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsOldStat.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat; import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +20,9 @@ public class SyncEvaluationsOldStat extends BaseSync { private IKcEvaluationsStatService kcEvaluationsStatService; + @Autowired + private IKcSysConfigService kcSysConfigService; + /** * 若参数变量名修改 QuartzJobController中也需对应修改 */ @@ -38,7 +43,9 @@ public class SyncEvaluationsOldStat extends BaseSync { kcEvaluationsStatService.updateHuanhang();//修改换行数据 List lbpjblist = kcEvaluationsStatService.getLbpjbSyncList(); + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); for(KcEvaluationsStat KcEvaluationsStat:lbpjblist){ + KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1()); List entityList = kcEvaluationsStatService.getLbpjbJxsjSyncList(KcEvaluationsStat); if(entityList!=null && entityList.size()>0){ KcEvaluationsStat entity = entityList.get(0); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsThpjbStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsThpjbStat.java index 222c1d15..8176a51e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsThpjbStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsThpjbStat.java @@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat; import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +18,8 @@ public class SyncEvaluationsThpjbStat extends BaseSync { @Autowired private IKcEvaluationsStatService kcEvaluationsStatService; + @Autowired + private IKcSysConfigService kcSysConfigService; /** * 若参数变量名修改 QuartzJobController中也需对应修改 @@ -35,7 +39,12 @@ public class SyncEvaluationsThpjbStat extends BaseSync { */ public void run(Map param){ List thpjblist = kcEvaluationsStatService.getThpjbSyncList(); + + + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + for(KcEvaluationsStat KcEvaluationsStat:thpjblist){ + KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1()); List entityList = kcEvaluationsStatService.getThpjbJxsjSyncList(KcEvaluationsStat); if(entityList!=null && entityList.size()>0){ KcEvaluationsStat entity = entityList.get(0); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsXstkbStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsXstkbStat.java index b6c21e59..dd6b9804 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsXstkbStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsXstkbStat.java @@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat; import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +19,9 @@ public class SyncEvaluationsXstkbStat extends BaseSync { private IKcEvaluationsStatService kcEvaluationsStatService; + @Autowired + private IKcSysConfigService kcSysConfigService; + /** * 若参数变量名修改 QuartzJobController中也需对应修改 */ @@ -35,8 +40,10 @@ public class SyncEvaluationsXstkbStat extends BaseSync { */ public void run(Map param){ + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); List xstkblist = kcEvaluationsStatService.getXstkbSyncList(); for(KcEvaluationsStat KcEvaluationsStat:xstkblist){ + KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1()); List entityList = kcEvaluationsStatService.getXstkbJxsjSyncList(KcEvaluationsStat); if(entityList!=null && entityList.size()>0){ KcEvaluationsStat entity = entityList.get(0); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsYbtkbStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsYbtkbStat.java index 1b7fc690..38da8746 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsYbtkbStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsYbtkbStat.java @@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat; import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService; +import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig; +import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +19,9 @@ public class SyncEvaluationsYbtkbStat extends BaseSync { private IKcEvaluationsStatService kcEvaluationsStatService; + @Autowired + private IKcSysConfigService kcSysConfigService; + /** * 若参数变量名修改 QuartzJobController中也需对应修改 */ @@ -37,7 +42,9 @@ public class SyncEvaluationsYbtkbStat extends BaseSync { kcEvaluationsStatService.updateHuanhang();//修改换行数据 List ybtkblist = kcEvaluationsStatService.getYbtkbSyncList(); + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); for(KcEvaluationsStat KcEvaluationsStat:ybtkblist){ + KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1()); List entityList = kcEvaluationsStatService.getYbtkbJxsjSyncList(KcEvaluationsStat); if(entityList!=null && entityList.size()>0){ KcEvaluationsStat entity = entityList.get(0); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java index a99e013e..bd339464 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -259,4 +257,7 @@ public class KcEvaluationsStat implements Serializable { private java.lang.String col57; private java.lang.String col58; private java.lang.String col59; + + @TableField(exist = false) + private java.lang.String xqxn; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index 7b4cb3b2..a670dc85 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -290,7 +290,8 @@ ON EVS.KETANGBIAOID = KT.ID LEFT JOIN KC_KECHENGBIAO KC ON KT.kechengbiaoid = KC.ID - left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh + left join (select * from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} and id in (select id from ( +select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} GROUP BY gh,xqxn)b )) rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME @@ -300,6 +301,7 @@ FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE AND B.DICT_ID = '1682386362753224705' + and a.xqxn = #{xqxn} GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE @@ -592,7 +594,8 @@ ON EVS.KETANGBIAOID = KT.ID LEFT JOIN KC_KECHENGBIAO KC ON KT.kechengbiaoid = KC.ID - left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh + left join (select * from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} and id in (select id from ( +select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} GROUP BY gh,xqxn)b )) rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME @@ -602,6 +605,7 @@ FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE AND B.DICT_ID = '1682386362753224705' + and a.xqxn = #{xqxn} GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE @@ -866,7 +870,8 @@ ON EVS.KETANGBIAOID = KT.ID LEFT JOIN KC_KECHENGBIAO KC ON KT.kechengbiaoid = KC.ID - left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh + left join (select * from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} and id in (select id from ( +select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} GROUP BY gh,xqxn)b )) rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME @@ -876,6 +881,7 @@ FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE AND B.DICT_ID = '1682386362753224705' + and a.xqxn = #{xqxn} GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE @@ -1082,7 +1088,8 @@ ON EVS.KETANGBIAOID = KT.ID LEFT JOIN KC_KECHENGBIAO KC ON KT.kechengbiaoid = KC.ID - left join kc_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh + left join (select * from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} and id in (select id from ( +select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} GROUP BY gh,xqxn)b )) rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME @@ -1092,6 +1099,7 @@ FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE AND B.DICT_ID = '1682386362753224705' + and a.xqxn = #{xqxn} GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE