diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index 1773672b..9608bf90 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -188,10 +188,12 @@ \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java index 39ba7278..508a5149 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/zyk/service/impl/ZykServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.text.StringUtils; +import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao; +import org.jeecg.modules.kc.ktgl.service.IKcKechengbiaoService; import org.jeecg.modules.zyk.entity.ZykInfo; import org.jeecg.modules.zyk.mapper.ZykMapper; import org.jeecg.modules.zyk.service.IZykService; @@ -32,9 +34,14 @@ public class ZykServiceImpl extends ServiceImpl implements I @Autowired private FileHandleUtil fileHandleUtil; + @Autowired + IKcKechengbiaoService kcKechengbiaoService; + @Autowired private ZykMapper zykMapper; + + @Override public Page findPage(ZykInfo zykInfo, Page page){ List list = zykMapper.findPage(page,zykInfo); @@ -189,6 +196,13 @@ public class ZykServiceImpl extends ServiceImpl implements I */ @Override public Map saveToZyk(ZykInfo zykInfo){ + KcKechengbiao kcb = new KcKechengbiao(); + kcb.setRwbh(zykInfo.getRwbh()); + kcb = kcKechengbiaoService.getKcbhByRwbh(kcb); + zykInfo.setXqxn(kcb.getXqxn()); + zykInfo.setKkdw(kcb.getKkdw()); + zykInfo.setKcmc(kcb.getKcmc()); + zykInfo.setSkjs(kcb.getSkjs()); // Map map = fileHandleUtil.uploadFile(zykInfo); Map map = fileHandleUtil.moveFiles(zykInfo); if(!map.get("code").equals("0")){