From 5d529622e5062eb768758fc84fb9f6c2c0a1a66c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 7 Jun 2024 09:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcKetangbiaoController.java | 25 ++++++++++++ .../modules/kc/ktgl/entity/KcKetangbiao.java | 6 +++ .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 3 +- .../wjxWjxx/controller/WjxWjxxController.java | 15 +++++++ .../kc/wjxWjxx/service/IWjxWjxxService.java | 7 ++++ .../service/impl/WjxWjxxServiceImpl.java | 32 +++++++++++++++ .../zyCcjg/controller/ZyCcjgController.java | 4 ++ .../service/impl/ZyCcjgServiceImpl.java | 8 ++++ .../zyDbtx/controller/ZyDbtxController.java | 1 + .../controller/ZyInfoStudentController.java | 1 + .../zyInfoStudent/entity/ZyInfoStudent.java | 2 + .../zyJxdg/controller/ZyJxdgController.java | 40 ++++++++++++++----- 12 files changed, 132 insertions(+), 12 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index 566b72d3..f6ec1b14 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -26,7 +26,9 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.SftpConfig; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.detection.entity.KcDetectionDetailed; import org.jeecg.modules.kc.detection.entity.KcDetectionMain; +import org.jeecg.modules.kc.detection.service.IKcDetectionDetailedService; import org.jeecg.modules.kc.detection.service.IKcDetectionMainService; import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang; @@ -91,6 +93,8 @@ public class KcKetangbiaoController extends JeecgController= '" + nowStr + " 00:00:00' and create_time <= '" + nowStr + " 23:59:59'"); kdmQw.lambda().eq(KcDetectionMain::getRwbh,rwbh); kdmQw.lambda().eq(KcDetectionMain::getXnxq,xqxn); +// kdmQw.eq("id","1791360521757487106"); + kdmQw.last("limit 1"); KcDetectionMain detectionMain = kcDetectionMainService.getOne(kdmQw); kcKetangbiao.setDetectionMain(detectionMain); + try { + if(detectionMain!=null){ + QueryWrapper rsQw = new QueryWrapper<>(); + rsQw.eq("pid",detectionMain.getId()); + rsQw.orderByDesc("create_time"); + rsQw.last("limit 1"); + KcDetectionDetailed kcDetectionDetailed = kcDetectionDetailedService.getOne(rsQw); + kcKetangbiao.setKcDetectionDetailed(kcDetectionDetailed); + QueryWrapper rsQwList = new QueryWrapper<>(); + rsQwList.eq("pid",detectionMain.getId()); + rsQwList.orderByDesc("create_time"); + List zqrsList = kcDetectionDetailedService.list(rsQwList); + kcKetangbiao.setZqrsList(zqrsList); + + } + }catch(Exception e){ + e.printStackTrace(); + } + return Result.OK(kcKetangbiao); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index 52fa3db3..9d734987 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -4,10 +4,12 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; +import java.util.List; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.kc.detection.entity.KcDetectionDetailed; import org.jeecg.modules.kc.detection.entity.KcDetectionMain; import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoshirongliang; import org.jeecg.modules.kc.zyJxdg.entity.ZyJxdg; @@ -348,6 +350,10 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private KcDetectionMain detectionMain; + @TableField(exist = false) + private KcDetectionDetailed kcDetectionDetailed; + @TableField(exist = false) + private List zqrsList; @TableField(exist = false) private ZyJxdg zyJxdg; 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 156b81e8..65432cd0 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 @@ -179,7 +179,8 @@ kkdw, kcxz, szkc, - xqxn + xqxn, + rwbh ORDER BY xqxn desc diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 4c1fb9cd..77c33ce3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -2,9 +2,11 @@ package org.jeecg.modules.kc.wjxWjxx.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; @@ -258,5 +260,18 @@ public class WjxWjxxController extends JeecgController return Result.OK(res); } + @ApiOperation(value="统计分析", notes="统计分析") + @GetMapping(value = "/wjxxTjfx") + public Result wjxxTjfx(@RequestParam(name="id",required=true) String id) { + JSONObject res = wjxWjxxService.wjxxTjfx(id); + return Result.OK(res); + } + + @ApiOperation(value="问卷下载", notes="问卷下载") + @GetMapping(value = "/wjxxDownLoad") + public Result wjxxDownLoad(@RequestParam(name="id",required=true) String id) { + JSONObject res = wjxWjxxService.wjxxDownLoad(id); + return Result.OK(res); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java index f0747834..3639fb32 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java @@ -1,9 +1,12 @@ package org.jeecg.modules.kc.wjxWjxx.service; +import com.alibaba.fastjson.JSONObject; import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.Map; + /** * @Description: 问卷信息 * @Author: jeecg-boot @@ -15,4 +18,8 @@ public interface IWjxWjxxService extends IService { Page findStuPage(WjxWjxx wjxWjxx,Page page); WjxWjxx kcxx(String rwbh,String xqxn); String fbwj(String id,String isKs); + + JSONObject wjxxTjfx(String id); + + JSONObject wjxxDownLoad(String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java index 00d1132f..397ad0f9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java @@ -1,10 +1,14 @@ package org.jeecg.modules.kc.wjxWjxx.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx; +import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx; import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx; import org.jeecg.modules.kc.wjxWjxx.mapper.WjxWjxxMapper; import org.jeecg.modules.kc.wjxWjxx.service.IWjxWjxxService; @@ -16,6 +20,8 @@ import org.jeecg.modules.kc.wjxWjxxTmlb.mapper.WjxWjxxTmxxMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.time.temporal.ChronoUnit; import java.util.*; /** @@ -290,5 +296,31 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl return "发布成功！"; } + @Override + public JSONObject wjxxTjfx(String id) { + + WjxWjxx wjxWjxx = baseMapper.selectById(id); + String vid = wjxWjxx.getVid(); + Map map = new HashMap<>(); + map.put("vid",Integer.valueOf(vid)); + //调用接口,提交 + String result = wjxUtil.openapi(map,"1001101"); + JSONObject jsonResult = JSONObject.parseObject(result); + return jsonResult; + } + + @Override + public JSONObject wjxxDownLoad(String id) { + WjxWjxx wjxWjxx = baseMapper.selectById(id); + String vid = wjxWjxx.getVid(); + Map map = new HashMap<>(); + map.put("vid",Integer.valueOf(vid)); + map.put("suffix",2); + //调用接口,提交 + String result = wjxUtil.openapi(map,"1001004"); + JSONObject jsonResult = JSONObject.parseObject(result); + return jsonResult; + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java index 396cbd9f..97feb147 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/controller/ZyCcjgController.java @@ -83,6 +83,10 @@ public class ZyCcjgController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + + //查询作业查重结果 + zyCcjgService.getCcjg(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",zyCcjg, req.getParameterMap()); if(StringUtils.isEmpty(zyCcjg.getFilestateid())){ queryWrapper.in("a.filestateid",1,3); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java index 1e0b2325..741dabdf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyCcjg/service/impl/ZyCcjgServiceImpl.java @@ -194,6 +194,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme Map map = new HashMap(); map.put("success","false"); map.put("message",object.getString("message")); + zyCcjg.setMessage(object.getString("message")); + baseMapper.updateById(zyCcjg); return map; } } @@ -286,6 +288,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme Map map = new HashMap(); map.put("success","false"); map.put("message",object.getString("message")); + zyCcjg.setMessage(object.getString("message")); + baseMapper.updateById(zyCcjg); return map; } } @@ -379,6 +383,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme Map map = new HashMap(); map.put("success","false"); map.put("message",object.getString("message")); + zyCcjg.setMessage(object.getString("message")); + baseMapper.updateById(zyCcjg); return map; } } @@ -472,6 +478,8 @@ public class ZyCcjgServiceImpl extends ServiceImpl impleme Map map = new HashMap(); map.put("success","false"); map.put("message",object.getString("message")); + zyCcjg.setMessage(object.getString("message")); + baseMapper.updateById(zyCcjg); return map; } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java index 073a9b96..b3c64216 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyDbtx/controller/ZyDbtxController.java @@ -185,6 +185,7 @@ public class ZyDbtxController extends JeecgController { UpdateWrapper zyDbtxDeleteMapping = new UpdateWrapper<>(); zyDbtxDeleteMapping.eq("rwbh", rwbh); zyDbtxDeleteMapping.eq("create_by", sysUser.getUsername()); + zyDbtxDeleteMapping.eq("fbr", zyDbtx.getFbr()); zyDbtxService.remove(zyDbtxDeleteMapping); return Result.OK(null); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index 604ce8c7..a5672683 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -403,6 +403,7 @@ public class ZyInfoStudentController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",zyInfoStudent, req.getParameterMap()); queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getTeacherNo()),"b.create_by",zyInfoStudent.getTeacherNo()); + queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getRwbh()),"b.rwbh",zyInfoStudent.getRwbh()); queryWrapper.like(StringUtils.isNotEmpty(zyInfoStudent.getZyname()),"b.title",zyInfoStudent.getZyname()); queryWrapper.isNotNull("cdlx"); Page page = new Page(pageNo, pageSize); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java index 04c71626..dabc9da4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/entity/ZyInfoStudent.java @@ -117,6 +117,8 @@ public class ZyInfoStudent implements Serializable { private String zyname; @TableField(exist = false) private String teacherNo; + @TableField(exist = false) + private String rwbh; @TableField(exist = false) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java index 85aa90b7..eae7433c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyJxdg/controller/ZyJxdgController.java @@ -66,6 +66,10 @@ public class ZyJxdgController extends JeecgController { @Value(value="${jeecg.uploadType}") private String uploadType; + + + @Autowired + private Global global; /** * 分页列表查询 * @@ -111,8 +115,7 @@ public class ZyJxdgController extends JeecgController { if(StringUtils.equals("pdf",nameLast)){ zyJxdg.setPdfPath(zyJxdg.getFilePath()); }else{ - if(StringUtils.equals("local",uploadType)){ - Global global = SpringContextHolder.getBean(Global.class); + if(StringUtils.equals("local",global.uploadType)){ FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); @@ -120,7 +123,7 @@ public class ZyJxdgController extends JeecgController { String pdfPath = global.getContractDickPath() + namePath; PDFUtil.office2PDF(docPath,pdfPath); zyJxdg.setPdfPath("contract/"+namePath); - }else if(StringUtils.equals("sftp",uploadType)){ + }else if(StringUtils.equals("sftp",global.uploadType)){ } } @@ -131,8 +134,7 @@ public class ZyJxdgController extends JeecgController { zyJxdg.setJxrlPdfPath(zyJxdg.getJxrlFilePath()); }else{ - if(StringUtils.equals("local",uploadType)){ - Global global = SpringContextHolder.getBean(Global.class); + if(StringUtils.equals("local",global.uploadType)){ FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); String docPath = upLoadPath+ File.separator+ zyJxdg.getJxrlFilePath(); @@ -182,7 +184,6 @@ public class ZyJxdgController extends JeecgController { update.set("pdf_path",zyJxdg.getFilePath()); }else{ if(StringUtils.equals("local",uploadType)) { - Global global = SpringContextHolder.getBean(Global.class); FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); String docPath = upLoadPath + File.separator + zyJxdg.getFilePath(); @@ -208,7 +209,6 @@ public class ZyJxdgController extends JeecgController { update.set("jxrl_pdf_path",zyJxdg.getJxrlFilePath()); }else{ if(StringUtils.equals("local",uploadType)) { - Global global = SpringContextHolder.getBean(Global.class); FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); String docPath = upLoadPath + File.separator + zyJxdg.getJxrlFilePath(); @@ -331,47 +331,65 @@ public class ZyJxdgController extends JeecgController { @ApiOperation(value="教学大纲-上传附件", notes="教学大纲-上传附件") @PostMapping(value = "/jxdgScfj") public Result jxdgScfj(@RequestBody ZyJxdg zyJxdg) { + System.out.println("------------教学大纲开始-----------------------"); boolean isAdd = false; if(StringUtils.isEmpty(zyJxdg.getId())){ isAdd = true; zyJxdg.setId((new DefaultIdentifierGenerator().nextId(new ZyJxdg())).toString()); } + System.out.println("------------11111111111----------------"); if(StringUtils.isNotEmpty(zyJxdg.getFilePath())){ + System.out.println("------------22222222222222----------------"); String nameLast = zyJxdg.getFilePath().substring(zyJxdg.getFilePath().lastIndexOf(".")+1); + System.out.println("nameLast-----------》"+nameLast); if(StringUtils.equals("pdf",nameLast)){ + System.out.println("------------33333333333333333----------------"); zyJxdg.setPdfPath(zyJxdg.getFilePath()); }else{ - if(StringUtils.equals("local",uploadType)) { - Global global = SpringContextHolder.getBean(Global.class); + System.out.println("uploadType-----------》"+global.uploadType); + if(StringUtils.equals("local",global.uploadType)) { + System.out.println("------------44444444444444444----------------"); FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); // String docPath = zyJxdg.getFilePath(); String docPath = upLoadPath + File.separator + zyJxdg.getFilePath(); + System.out.println("docPath-----------》"+docPath); String namePath = dd + ".pdf"; String pdfPath = global.getContractDickPath() + namePath; + System.out.println("pdfPath-----------》"+pdfPath); // Map map = zykService.downloadRemoteFile(docPath); PDFUtil.office2PDF(docPath, pdfPath); + System.out.println("------------5555555555----------------"); zyJxdg.setPdfPath("contract/" + namePath); - }else if(StringUtils.equals("sftp",uploadType)){ + System.out.println("------------666666666----------------"+zyJxdg.getPdfPath()); + }else if(StringUtils.equals("sftp",global.uploadType)){ + System.out.println("------------7777777777777----------------"); ZykInfo zykInfo = new ZykInfo(); zykInfo.setBizId(zyJxdg.getId()); zykInfo.setBizTable("zy_jxdg"); zykInfo.setWjlx(WjlxEnum.JXDG.getType()); zykInfo.setRwbh(zyJxdg.getRwbh()); zykInfo.setFileName(zyJxdg.getFilePath()); + System.out.println("zykInfo------------>"+zykInfo); Map map = zykService.saveToZykJxdg(zykInfo); + System.out.println("map------------>"+map); String fileName = map.get("data"); + System.out.println("fileName------------>"+fileName); String pdfName = map.get("pdfData"); + System.out.println("pdfName------------>"+pdfName); zyJxdg.setFilePath(fileName); zyJxdg.setPdfPath(pdfName); zykService.disConnect(); } } }else{ + System.out.println("------------8888888888888----------------"); zyJxdg.setPdfPath(null); } + System.out.println("------------99999999999999999----------------"); if(isAdd){ + System.out.println("------------00000000000000000000----------------"); KcKechengbiao kcKechengbiao = new KcKechengbiao(); kcKechengbiao.setRwbh(zyJxdg.getRwbh()); kcKechengbiao.setXqxn(zyJxdg.getXqxn()); @@ -384,6 +402,7 @@ public class ZyJxdgController extends JeecgController { } zyJxdgService.save(zyJxdg); }else{ + System.out.println("------------aaaaaaaaaaaaaaa----------------"); UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("file_path",zyJxdg.getFilePath()); updateWrapper.set("pdf_path",zyJxdg.getPdfPath()); @@ -405,7 +424,6 @@ public class ZyJxdgController extends JeecgController { }else{ if(StringUtils.equals("local",uploadType)) { - Global global = SpringContextHolder.getBean(Global.class); FileUtil.mkdir(global.getContractDickPath()); String dd = DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"); String docPath = upLoadPath + File.separator + zyJxdg.getJxrlFilePath();