yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bg

This commit is contained in:
yangjun 2024-02-26 19:10:15 +08:00
parent 5862e348ab
commit a10f56f330
8 changed files with 108 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/KcExportConfigTpkwcqkjzglxMapper.java
View File

@ -40,4 +40,8 @@ public interface KcExportConfigTpkwcqkjzglxMapper extends BaseMapper<KcExportCon
List<KcExportConfigTpkwcqkjzglx> getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx1);
List<KcExportConfigTpkwcqkjzglxXytktj> getListByCodeXytktj(KcExportConfigTpkwcqkjzglxXytktj kcExportConfigTpkwcqkjzglxXytktj);
KcExportConfigTpkwcqkjzglx getDqxqtjlist(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
List<KcExportConfigTpkwcqkjzglx> getBxqSaveList(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
}

30
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml
View File

@ -249,4 +249,34 @@
</where>
</select>
<select id="getDqxqtjlist" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
select count(*) as znum from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn} and (zt = '在职' or zt= '退休')
</select>
<select id="getBxqSaveList" resultType="org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx">
SELECT
uuid() AS id,
create_by,
create_time,
update_by,
update_time,
sys_org_code,
gh,
tklx,
dwmc,
xm,
sf,
zt,
ytkcs,
rjzy,
#{xqxn} AS xqxn
FROM
kc_export_config_tpkwcqkjzglx
WHERE
xqxn = #{type}
</select>
</mapper>

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/IKcExportConfigTpkwcqkjzglxService.java
View File

@ -39,4 +39,7 @@ public interface IKcExportConfigTpkwcqkjzglxService extends IService<KcExportCon
List<KcExportConfigTpkwcqkjzglx> getListQtzrjsChar(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx);
List<KcExportConfigTpkwcqkjzglxXytktj> getListByCodeXytktj(QueryWrapper<KcExportConfigTpkwcqkjzglxXytktj> queryWrapper,KcExportConfigTpkwcqkjzglxXytktj KcExportConfigTpkwcqkjzglxXytktj);
//获取是否有本学期数据
List<KcExportConfigTpkwcqkjzglx> getSfybxqsj();
}

29
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/service/impl/KcExportConfigTpkwcqkjzglxServiceImpl.java
View File

@ -18,6 +18,7 @@ import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
import org.jeecg.modules.kc.kcXqxnHistory.service.IKcXqxnHistoryService;
import org.jeecg.modules.kc.tksf.kctksfyq.entity.KcTksfyq;
import org.jeecg.modules.kc.tksf.kctksfyq.service.IKcTksfyqService;
import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
@ -51,6 +52,9 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
@Autowired
private DictUtils dictUtils;
@Autowired
private IKcXqxnHistoryService kcXqxnHistoryService;
@Override
public void editAll(KcExportConfigTpkwcqkjzglx kcExportConfigTpkwcqkjzglx) {
//按学期筛选
@ -338,4 +342,29 @@ public class KcExportConfigTpkwcqkjzglxServiceImpl extends ServiceImpl<KcExportC
List<KcExportConfigTpkwcqkjzglxXytktj> infolist = baseMapper.getListByCodeXytktj(kcExportConfigTpkwcqkjzglxXytktj);
return infolist;
}
@Override
public List<KcExportConfigTpkwcqkjzglx> getSfybxqsj() {
try {
QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<>();
kcXqxnHistoryQueryWrapper.orderByDesc("start_time");
List<KcXqxnHistory> historyList = kcXqxnHistoryService.list(kcXqxnHistoryQueryWrapper);
String dqxq = historyList.get(0).getTitle();
KcExportConfigTpkwcqkjzglx KcExportConfigTpkwcqkjzglx = new KcExportConfigTpkwcqkjzglx();
KcExportConfigTpkwcqkjzglx.setXqxn(dqxq);
KcExportConfigTpkwcqkjzglx tjsj =baseMapper.getDqxqtjlist(KcExportConfigTpkwcqkjzglx);
String znum = tjsj.getZnum();
if(StringUtils.equals("0",znum)){
String syxq = historyList.get(1).getTitle();//上一学期
//获取本学期新增数据
KcExportConfigTpkwcqkjzglx.setType(syxq);
List<KcExportConfigTpkwcqkjzglx> savelist = baseMapper.getBxqSaveList(KcExportConfigTpkwcqkjzglx);
return savelist;
}
}catch (Exception e) {
e.printStackTrace();
}
return null;
}
}

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java
View File

@ -73,6 +73,7 @@ public class SyncKcktStat extends BaseSync {
//-----------------修改课程表数据------------------------
KcKechengbiao kcKechengbiao = new KcKechengbiao();
kcKechengbiao.setXqxn(kcSysConfig.getFlag1());
kcKechengbiao.setSkjs("刘婷");
List<KcKechengbiao> kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao);
for(KcKechengbiao KcKechengbiaoPar:kckblist){
QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();

49
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java
View File

@ -64,6 +64,10 @@ public class SyncTJzgXskc extends BaseSync {
* @param param
*/
public void run(Map<String, Object> param){
//查询数据
List<TJzgXskc> inDataList = expService.list();
List<Xxhbxskc> outDataList = Lists.newArrayList();
@ -77,6 +81,7 @@ public class SyncTJzgXskc extends BaseSync {
//清洗数据
inDataList.forEach(x -> {
String timestamps = DateUtil.format(x.getTimestamps(), DatePattern.NORM_DATETIME_PATTERN);
String gh = x.getGh();
outDataList.add(BeanUtil.toBean(x, Xxhbxskc.class));
Xxhbuser outUserData = BeanUtil.toBean(x, Xxhbuser.class);
outUserData.setTimestamps(timestamps);
@ -186,22 +191,36 @@ public class SyncTJzgXskc extends BaseSync {
if(saveList != null){
try {
exportConfigTpkwcqkjzglxService.saveBatch(saveList);
}catch (Exception e){
e.printStackTrace();
errorMessage = e.getMessage();
}
Xxhbsynclog updateLog = new Xxhbsynclog();
updateLog.setSyncRowNum(String.valueOf(outDataList.size()));
updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx，新增数据");//oracle表名
updateLog.setOratabnum(inDataList.size());//oracle表数量
updateLog.setTablenum(0);//mysql表数量
updateLog.setSyncnum(saveList.size());//本次同步数据量
updateLog.setSynctype("0");//同步类型 0全量 1增量
updateLog.setErrormessage(errorMessage);
saveLog(xxhbsynclog,Xxhbxskc.class);
List<KcExportConfigTpkwcqkjzglx> listA = exportConfigTpkwcqkjzglxService.getSfybxqsj();
if(listA != null){
exportConfigTpkwcqkjzglxService.saveBatch(listA);
Xxhbsynclog updateLog = new Xxhbsynclog();
updateLog.setSyncRowNum(String.valueOf(listA.size()));
updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx，新增数据");//oracle表名
updateLog.setOratabnum(listA.size());//oracle表数量
updateLog.setTablenum(0);//mysql表数量
updateLog.setSyncnum(listA.size());//本次同步数据量
updateLog.setSynctype("0");//同步类型 0全量 1增量
updateLog.setErrormessage(errorMessage);
saveLog(xxhbsynclog,Xxhbxskc.class);
}else{
try {
exportConfigTpkwcqkjzglxService.saveBatch(saveList);
}catch (Exception e){
e.printStackTrace();
errorMessage = e.getMessage();
}
Xxhbsynclog updateLog = new Xxhbsynclog();
updateLog.setSyncRowNum(String.valueOf(outDataList.size()));
updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx，新增数据");//oracle表名
updateLog.setOratabnum(inDataList.size());//oracle表数量
updateLog.setTablenum(0);//mysql表数量
updateLog.setSyncnum(saveList.size());//本次同步数据量
updateLog.setSynctype("0");//同步类型 0全量 1增量
updateLog.setErrormessage(errorMessage);
saveLog(xxhbsynclog,Xxhbxskc.class);
}
}
}

3
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcJiaoshirongliangController.java
View File

@ -66,6 +66,9 @@ public class KcJiaoshirongliangController extends JeecgController<KcJiaoshirongl
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcJiaoshirongliang> queryWrapper = QueryGenerator.initQueryWrapper(kcJiaoshirongliang, req.getParameterMap());
queryWrapper.orderByAsc("jzwmc");
queryWrapper.orderByAsc("lc");
queryWrapper.orderByAsc("jsmc");
Page<KcJiaoshirongliang> page = new Page<KcJiaoshirongliang>(pageNo, pageSize);
IPage<KcJiaoshirongliang> pageList = kcJiaoshirongliangService.page(page, queryWrapper);
return Result.OK(pageList);

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml
View File

@ -78,6 +78,10 @@
ELSE '' END as xq,
jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl,#{xqxn} as xqxn
from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci and t.kcdl != '毕业设计' and (t.jgh is not null or t.JKZC is not null)
<if test="skjs!=null and skjs!=''">
and t.xm =#{skjs}
</if>
</select>
<insert id="saveOne">