SFTP上传,输入参数优化，增加任务编号字段获取学期、单位、课程、教师

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

@@ -188,10 +188,12 @@
     </select>
 
     <select id="getKcbhByRwbh" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
-        select distinct kcbh,rwbh,xqxn,skjs
+        select distinct rwbh,xqxn,kkdw,kcmc,skjs
         from kc_kechengbiao
         where rwbh = #{rwbh}
+        <if test="xqxn!=null and xqxn!=''">
             and xqxn = #{xqxn}
+        </if>
     </select>
 
 </mapper>

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<ZykMapper, ZykInfo> implements I
     @Autowired
     private FileHandleUtil fileHandleUtil;
 
+    @Autowired
+    IKcKechengbiaoService kcKechengbiaoService;
+
     @Autowired
     private ZykMapper zykMapper;
 
+
+
     @Override
     public Page<ZykInfo> findPage(ZykInfo zykInfo, Page<ZykInfo> page){
         List<ZykInfo> list = zykMapper.findPage(page,zykInfo);
@@ -189,6 +196,13 @@ public class ZykServiceImpl extends ServiceImpl<ZykMapper, ZykInfo> implements I
      */
     @Override
     public Map<String,String> 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<String,String> map = fileHandleUtil.uploadFile(zykInfo);
         Map<String,String> map = fileHandleUtil.moveFiles(zykInfo);
         if(!map.get("code").equals("0")){