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

修改bug

This commit is contained in:
yangjun 2024-05-21 17:53:44 +08:00
parent f7b644ecae
commit 52361b0606
11 changed files with 22 additions and 8 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/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml
View File

@ -9,7 +9,7 @@
WHERE ev.id = evs.evaluationid
AND ev.evaluationver = '3'
and ev.source != '2'
and ev.up_date > '2024-02-01'
<!-- and ev.up_date > '2024-02-01'-->
</select>
<select id="getYbtkbTwoSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
@ -18,7 +18,7 @@
WHERE ev.id = evs.evaluationid
AND ev.evaluationver = '3'
and ev.source = '2'
and ev.up_date > '2024-02-01'
<!-- and ev.up_date > '2024-02-01'-->
</select>
<select id="getXstkbSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
View File

@ -170,6 +170,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
}
queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());
queryWrapper.orderByDesc("skrq");
Page<KcKetangbiao> page = new Page<KcKetangbiao>(pageNo, pageSize);
Set<String> idSet = Sets.newHashSet();
@ -231,7 +232,6 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
}
/**
* 添加
*

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java
View File

@ -71,4 +71,5 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum kcKetangbiao);
}

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

@ -582,7 +582,7 @@
fen.avgscore as jspjPjf
from
kc_ketangbiao a
left join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.kechengbiaoid
inner join zongtipingjiapingjunfen fen on fen.kechengbiaoid = a.kechengbiaoid
${ew.customSqlSegment}
</select>

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java
View File

@ -73,4 +73,5 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
IPage<Map<String, Object>> getKccountList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao);
List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object);
}

1
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
View File

@ -185,4 +185,5 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
public List<KcKetangbiaoNum> getKccountExportList(KcKetangbiaoNum object) {
return baseMapper.getKccountExportList(object);
}
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
View File

@ -79,7 +79,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper(zyInfoStudent, req.getParameterMap());
QueryWrapper<ZyInfoStudent> queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap());
Page<ZyInfoStudent> page = new Page<ZyInfoStudent>(pageNo, pageSize);
IPage<ZyInfoStudent> pageList = zyInfoStudentService.page(page, queryWrapper);
return Result.OK(pageList);

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java
View File

@ -91,5 +91,11 @@ public class ZyInfoStudent implements Serializable {
@TableField(exist = false)
private String cateid;
@TableField(exist = false)
private String wwcc;
@TableField(exist = false)
private String nwcc;
@TableField(exist = false)
private String aigccc;
}

5
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/mapper/xml/ZyInfoStudentMapper.xml
View File

@ -5,4 +5,9 @@
<delete id="deleteMainId">
delete from zy_info_student where main_id = #{mainId}
</delete>
<select id="selectPage" resultType="org.jeecg.modules.kc.zyInfoStudent.entity.ZyInfoStudent">
select a.*,b.wwcc,b.nwcc,b.aigccc from zy_info_student a
left join zy_info b on a.main_id = b.id
${ew.customSqlSegment}
</select>
</mapper>

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java
View File

@ -123,7 +123,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
}
zyJxdgService.save(zyJxdg);
return Result.OK("添加成功！");
return Result.OK("提交成功！");
}
/**
@ -185,7 +185,7 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
}
update.eq("id",zyJxdg.getId());
zyJxdgService.update(update);
return Result.OK("编辑成功!");
return Result.OK("提交成功!");
}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
View File

@ -114,7 +114,7 @@ public class CommonController {
savePath = this.uploadLocal(file,bizPath);
}
*/
}if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)) {
}else if(CommonConstant.UPLOAD_TYPE_SFTP.equals(uploadType)) {
FileTypeFilter.fileTypeFilter(file);
savePath = this.uploadSftp(file,bizPath);
}else{