From 0c077de068e6d64eef4c56e8b7f986fb48809b5c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 15 May 2024 21:12:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcKechengbiaoController.java | 1 + .../kc/wjxDjxx/mapper/WjxDjxxMapper.java | 1 + .../kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml | 13 ++++ .../service/impl/WjxDjxxServiceImpl.java | 15 ++++- .../modules/kc/wjxWjxx/entity/WjxWjxx.java | 17 ++++-- .../zyJxdg/controller/ZyJxdgController.java | 59 ++++++++++++++----- 6 files changed, 85 insertions(+), 21 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index 286d01d0..5a52ad3a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -255,6 +255,7 @@ public class KcKechengbiaoController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = kcKechengbiaoService.getKechengbiaolist(page, queryWrapper); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java index ff4d016d..8e54970a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java @@ -28,4 +28,5 @@ public interface WjxDjxxMapper extends BaseMapper { List findDjtmxx(@Param("vid")String vid,@Param("jid")String jid); List findDjjgsPage(Page page, WjxDjxx params); List findUnDjjgsPage(Page page, WjxDjxx params); + List findAllDjjgsPage(Page page, WjxDjxx params); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml index 5f457932..adf358d2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml @@ -138,4 +138,17 @@ order by y.xh + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index 96ce7ed7..c43d57b6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxx; @@ -329,17 +330,27 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl @Override public Page findDjjgsPage(WjxDjxx wjxDjxx, Page page){ - if(wjxDjxx.getIsFinished().equals("1")){ + if(StringUtils.equals("1",wjxDjxx.getIsFinished())){ //完成答卷的 List list = baseMapper.findDjjgsPage(page,wjxDjxx); for(WjxDjxx djxx:list){ djxx.setAnswerSfm(convertSecondsToHMS(djxx.getAnswerSeconds())); } page.setRecords(list); - }else{ + }else if(StringUtils.equals("0",wjxDjxx.getIsFinished())){ //未完成答卷的 List list = baseMapper.findUnDjjgsPage(page,wjxDjxx); page.setRecords(list); + }else{ + //全部 + List list = baseMapper.findAllDjjgsPage(page,wjxDjxx); + for(WjxDjxx djxx:list){ + if(djxx.getAnswerSeconds()!=-1){ + djxx.setAnswerSfm(convertSecondsToHMS(djxx.getAnswerSeconds())); + } + } + page.setRecords(list); + } return page; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java index 145847db..120770f4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java @@ -95,12 +95,12 @@ public class WjxWjxx implements Serializable { @TableField(exist = false) private Integer wwcrs; @ApiModelProperty(value = "开始时间") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date startTime; @ApiModelProperty(value = "结束时间") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date endTime; @ApiModelProperty(value = "答卷状态标识") @TableField(exist = false) @@ -111,4 +111,13 @@ public class WjxWjxx implements Serializable { @ApiModelProperty(value = "答卷ID") @TableField(exist = false) private String djId; + + @ApiModelProperty(value = "开始时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date zyStartTime; + @ApiModelProperty(value = "结束时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date zyEndTime; } 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 cf6b3342..ac75f8a3 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 @@ -2,6 +2,7 @@ package org.jeecg.modules.kc.zyJxdg.controller; import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -84,20 +85,6 @@ public class ZyJxdgController extends JeecgController { @ApiOperation(value="教学大纲-添加", notes="教学大纲-添加") @PostMapping(value = "/add") public Result add(@RequestBody ZyJxdg zyJxdg) { - zyJxdgService.save(zyJxdg); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param zyJxdg - * @return - */ - @AutoLog(value = "教学大纲-编辑") - @ApiOperation(value="教学大纲-编辑", notes="教学大纲-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ZyJxdg zyJxdg) { if(StringUtils.isNotEmpty(zyJxdg.getFilePath())){ @@ -119,7 +106,49 @@ public class ZyJxdgController extends JeecgController { } } - zyJxdgService.updateById(zyJxdg); + zyJxdgService.save(zyJxdg); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyJxdg + * @return + */ + @AutoLog(value = "教学大纲-编辑") + @ApiOperation(value="教学大纲-编辑", notes="教学大纲-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ZyJxdg zyJxdg) { + + UpdateWrapper update = new UpdateWrapper(); + if(StringUtils.isNotEmpty(zyJxdg.getFilePath())){ + String nameLast = zyJxdg.getFilePath().substring(zyJxdg.getFilePath().lastIndexOf(".")+1); + if(StringUtils.equals("pdf",nameLast)){ + zyJxdg.setPdfPath(zyJxdg.getFilePath()); + update.set("file_path",zyJxdg.getFilePath()); + update.set("pdf_path",zyJxdg.getFilePath()); + }else{ + Global global = SpringContextHolder.getBean(Global.class); + FileUtil.mkdir(global.getContractDickPath()); + String dd = DateUtils.formatDate(new Date(),"yyyyMMddHHmmss"); + String docPath = upLoadPath+ File.separator+ zyJxdg.getFilePath(); + String namePath = dd + ".pdf"; + String pdfPath = global.getContractDickPath() + namePath; + System.out.println("filPath:"+zyJxdg.getFilePath()); + System.out.println("docPath:"+docPath); + System.out.println("pdfPath:"+pdfPath); + PDFUtil.office2PDF(docPath,pdfPath); + zyJxdg.setPdfPath("contract/"+namePath); + + update.set("file_path",zyJxdg.getFilePath()); + update.set("pdf_path",zyJxdg.getPdfPath()); + } + }else{ + update.set("kcjs",zyJxdg.getKcjs()); + } + update.eq("id",zyJxdg.getId()); + zyJxdgService.update(update); return Result.OK("编辑成功!"); }