Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java
This commit is contained in:
commit
1f767c3479
|
@ -82,7 +82,9 @@ public class KcDetectionMainController extends JeecgController<KcDetectionMain,
|
||||||
QueryWrapper<KcDetectionMain> queryWrapper = QueryGenerator.initQueryWrapper(kcDetectionMain, req.getParameterMap());
|
QueryWrapper<KcDetectionMain> queryWrapper = QueryGenerator.initQueryWrapper(kcDetectionMain, req.getParameterMap());
|
||||||
//补充搜索
|
//补充搜索
|
||||||
if(StringUtils.isNotBlank(kcDetectionMain.getSearchSkrq())){
|
if(StringUtils.isNotBlank(kcDetectionMain.getSearchSkrq())){
|
||||||
queryWrapper.eq("JSON_VALUE(ketangbiao_info,'$.skrq')", kcDetectionMain.getSearchSkrq());
|
//线上数据库不支持
|
||||||
|
//queryWrapper.eq("JSON_VALUE(ketangbiao_info,'$.skrq')", kcDetectionMain.getSearchSkrq());
|
||||||
|
queryWrapper.eq("ketangbiao_info ->'$.skrq'", kcDetectionMain.getSearchSkrq());
|
||||||
}
|
}
|
||||||
if(StringUtils.isNotBlank(kcDetectionMain.getSearchHh())){
|
if(StringUtils.isNotBlank(kcDetectionMain.getSearchHh())){
|
||||||
queryWrapper.eq("ketangbiao_info -> '$.hh'", kcDetectionMain.getSearchHh());
|
queryWrapper.eq("ketangbiao_info -> '$.hh'", kcDetectionMain.getSearchHh());
|
||||||
|
|
|
@ -188,7 +188,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getKcbhByRwbh" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
|
<select id="getKcbhByRwbh" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
|
||||||
select distinct rwbh,xqxn,kkdw,kcmc,skjs
|
select distinct kcbh,rwbh,xqxn,kkdw,kcmc,skjs
|
||||||
from kc_kechengbiao
|
from kc_kechengbiao
|
||||||
where rwbh = #{rwbh}
|
where rwbh = #{rwbh}
|
||||||
<if test="xqxn!=null and xqxn!=''">
|
<if test="xqxn!=null and xqxn!=''">
|
||||||
|
|
|
@ -378,6 +378,16 @@ public class ZyJxdgController extends JeecgController<ZyJxdg, IZyJxdgService> {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isAdd){
|
if(isAdd){
|
||||||
|
KcKechengbiao kcKechengbiao = new KcKechengbiao();
|
||||||
|
kcKechengbiao.setRwbh(zyJxdg.getRwbh());
|
||||||
|
kcKechengbiao.setXqxn(zyJxdg.getXqxn());
|
||||||
|
kcKechengbiao = kcKechengbiaoService.getKcbhByRwbh(kcKechengbiao);
|
||||||
|
if(kcKechengbiao != null){
|
||||||
|
zyJxdg.setKcbh(kcKechengbiao.getKcbh());
|
||||||
|
zyJxdg.setSkjs(kcKechengbiao.getSkjs());
|
||||||
|
}else{
|
||||||
|
zyJxdg.setKcbh("-1");
|
||||||
|
}
|
||||||
zyJxdgService.save(zyJxdg);
|
zyJxdgService.save(zyJxdg);
|
||||||
}else{
|
}else{
|
||||||
UpdateWrapper<ZyJxdg> updateWrapper = new UpdateWrapper<>();
|
UpdateWrapper<ZyJxdg> updateWrapper = new UpdateWrapper<>();
|
||||||
|
|
Loading…
Reference in New Issue