From 6ebcb18c74d7690c043423a84ce4d591b0b23063 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 2 Aug 2024 17:24:28 +0800 Subject: [PATCH] bugfix --- .../impl/BmsTemplateRecordServiceImpl.java | 4 +- .../JDevelopmentReportController.java | 156 ++++++++++-------- .../controller/JSmartRemindersController.java | 17 +- .../jjh/ent/entity/JDevelopmentReport.java | 20 ++- .../request/JRemindChiefAllRequest.java | 31 ++++ .../response/JTemplateMetricsResponse.java | 2 +- .../ent/mapper/JSmartDeclarationMapper.java | 6 +- .../ent/service/JSmartDeclarationService.java | 6 +- .../impl/JSmartDeclarationServiceImpl.java | 10 +- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../jjh/ent/JDevelopmentReportMapper.xml | 127 +++++++------- .../jjh/ent/JSmartDeclarationMapper.xml | 12 +- .../resources/template/~$发展报告模板.docx | Bin 162 -> 0 bytes 14 files changed, 231 insertions(+), 164 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JRemindChiefAllRequest.java delete mode 100644 ruoyi-admin/src/main/resources/template/~$发展报告模板.docx diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java index a311490..378cdf4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java @@ -227,8 +227,10 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl 0) { enterpriseDirectoryList.forEach(x -> { - getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode(), tp.getTemplateJson()); + getDeclarationRecordsList(bmsTemplateRecordAddDto, drlist, x.getCreditCode().trim(), tp.getTemplateJson()); x.setTemplateRecordId(bmsTemplateRecordAddDto.getId()); + x.setCreditCode(x.getCreditCode().trim()); + x.setEnterpriseName(x.getEnterpriseName().trim()); }); enterpriseDirectoryService.saveBatch(enterpriseDirectoryList); } else { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDevelopmentReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDevelopmentReportController.java index 0ad0456..538e2eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDevelopmentReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDevelopmentReportController.java @@ -5,16 +5,20 @@ import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.poi.word.Word07Writer; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.jjh.ent.entity.JDevelopmentReport; import com.ruoyi.jjh.ent.entity.response.JTemplateMetricsResponse; import com.ruoyi.jjh.ent.service.JDevelopmentReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; @@ -22,17 +26,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.awt.*; import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.List; /** * 服务业发展报告（j_template_metrics）表控制层 @@ -46,18 +47,51 @@ import java.nio.file.Paths; public class JDevelopmentReportController extends BaseController { + + @Value("${ruoyi.profile}") + private String fileAddress; + + @Autowired private JDevelopmentReportService jDevelopmentReportService; + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "获取当前用户的模板", response = JDevelopmentReport.class) + @PostMapping("/getId") + public AjaxResult getId() { + Long userId = null; + try { + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + throw new ServiceException("获取当前用户失败!"); + } + List list = jDevelopmentReportService.lambdaQuery().eq(JDevelopmentReport::getCreateId, userId).list(); + if(!list.isEmpty()){ + return success(list.get(0)); + }else { + return success(); + } + } /** * 新增服务业发展报告 */ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") - @ApiOperation(value = "新增服务业发展报告", response = JDevelopmentReport.class) + @ApiOperation(value = "新增或者修改服务业发展报告", response = JDevelopmentReport.class) @PostMapping public AjaxResult add(@RequestBody JDevelopmentReport jDevelopmentReport) { - return toAjax(jDevelopmentReportService.save(jDevelopmentReport)); + Long userId = null; + try { + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + throw new ServiceException("获取当前用户失败!"); + } + List list = jDevelopmentReportService.lambdaQuery().eq(JDevelopmentReport::getCreateId, userId).list(); + if(!list.isEmpty()){ + return toAjax(jDevelopmentReportService.updateById(jDevelopmentReport)); + }else { + return toAjax(jDevelopmentReportService.save(jDevelopmentReport)); + } } /** @@ -65,76 +99,52 @@ public class JDevelopmentReportController extends BaseController { */ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "模板指标自定义选择", response = JTemplateMetricsResponse.class) - @GetMapping("/templateMetrics") - public AjaxResult getTemplateMetrics(String year) { + @GetMapping("/templateMetrics/{year}") + public AjaxResult getTemplateMetrics(@PathVariable("year") String year) { return success(jDevelopmentReportService.getTemplateMetrics(year)); } + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "下载发展模板") - @GetMapping("/downloadLocal") - public ResponseEntity downloadLocal() { - String filePath = System.getProperty("user.dir") + "/ruoyi-admin/src/main/resources/template/发展报告模板.docx"; - // 创建文件资源 - Path path = Paths.get(filePath); - FileSystemResource resource = new FileSystemResource(path.toFile()); - // 设置响应头 - HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + "moban"); - headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE); - // 返回 ResponseEntity - return ResponseEntity.ok() - .headers(headers) - .body(resource); + @PostMapping("/downloadTemplate") + public ResponseEntity downloadTemplate(@RequestBody JDevelopmentReport s) { + // 创建父文件目录 + String fatherFile = fileAddress + "/" + "moban.docx"; + // 创建文件 + File touch = FileUtil.touch(fatherFile); + // 创建 Word07Writer 实例 + Word07Writer writer = new Word07Writer(); + try { + // 添加段落（标题） + writer.addText(ParagraphAlignment.CENTER,new Font("宋体", Font.PLAIN, 18), s.getTitle()); + // 添加副标题 + writer.addText(ParagraphAlignment.CENTER,new Font("宋体", Font.PLAIN, 14), s.getSubheading()); + // 使用 Jsoup 解析页面内容 + Document doc = Jsoup.parse(s.getContent(), "UTF-8"); + // 获取页面内容中的段落 + Elements paragraphs = doc.select("p"); + for (Element paragraph : paragraphs) { + writer.addText(new Font("仿宋", Font.PLAIN, 12), paragraph.text()); + } + // 写出到文件 + writer.flush(touch); + // 设置响应头 + HttpHeaders headers = new HttpHeaders(); + headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=moban.docx"); + headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE); + // 封装为 ResponseEntity + FileSystemResource resource = new FileSystemResource(touch); + return ResponseEntity.ok() + .headers(headers) + .body(resource); + } catch (Exception e) { + // 处理异常情况，例如日志记录或者其他错误处理 + e.printStackTrace(); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); + } finally { + // 关闭资源 + writer.close(); + } } - -// @ApiOperation(value = "下载发展模板") -// @PostMapping("/downloadTemplate") -// public ResponseEntity downloadTemplate(@RequestBody JDevelopmentReport s) { -// // 定义文件路径 -// ClassPathResource filePath = new ClassPathResource("/template/moban.docx"); -// File touch = filePath.getFile(); -// // 创建 Word07Writer 实例 -// Word07Writer writer = new Word07Writer(); -// -// try { -// // 添加段落（标题） -// writer.addText(new Font("宋体", Font.PLAIN, 22), s.getTitle()); -// -// // 添加副标题 -// writer.addText(new Font("宋体", Font.PLAIN, 18), s.getSubheading()); -// -// // 使用 Jsoup 解析页面内容 -// Document doc = Jsoup.parse(s.getContent(), "UTF-8"); -// -// // 获取页面内容中的段落 -// Elements paragraphs = doc.select("p"); -// for (Element paragraph : paragraphs) { -// writer.addText(new Font("仿宋", Font.PLAIN, 16), paragraph.text()); -// } -// -// // 写出到文件 -// writer.flush(touch); -// -// // 设置响应头 -// HttpHeaders headers = new HttpHeaders(); -// headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"发展报告模板1.docx\""); -// headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE); -// -// // 封装为 ResponseEntity -// FileSystemResource resource = new FileSystemResource(touch); -// return ResponseEntity.ok() -// .headers(headers) -// .body(resource); -// } catch (Exception e) { -// // 处理异常情况，例如日志记录或者其他错误处理 -// e.printStackTrace(); -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); -// } finally { -// // 关闭资源 -// writer.close(); -// // 删除临时文件 -// FileUtil.del((Path) filePath); -// } -// } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java index e22f41f..db3c2ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java @@ -7,9 +7,11 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.jjh.declaration.regular.TimeChange; +import com.ruoyi.jjh.ent.entity.HomeRequestSmart; import com.ruoyi.jjh.ent.entity.JSmartDeclaration; import com.ruoyi.jjh.ent.entity.JSmartReminders; import com.ruoyi.jjh.ent.entity.request.JAddJobSmart; +import com.ruoyi.jjh.ent.entity.request.JRemindChiefAllRequest; import com.ruoyi.jjh.ent.entity.request.JSmartRemindersDq; import com.ruoyi.jjh.ent.entity.request.JSmartRemindersNDq; import com.ruoyi.jjh.ent.mapper.JSmartRemindersMapper; @@ -86,7 +88,7 @@ public class JSmartRemindersController extends BaseController { @PreAuthorize("@ss.hasAnyRoles('ent')") @ApiOperation(value = "企业端首页智能提醒查询所有数据", response = JSmartDeclaration.class) @GetMapping("/enterpriseAll") - public AjaxResult enterpriseAll() { + public AjaxResult enterpriseAll(Page page) { // 获取当前登录用户是否是企业端 boolean admin = false; String str = null; @@ -98,7 +100,7 @@ public class JSmartRemindersController extends BaseController { if (admin) { str = null; } - return success(jSmartDeclarationService.selectEnterpriseAllList(str)); + return success(jSmartDeclarationService.selectEnterpriseAllList(page,str)); } @@ -108,21 +110,20 @@ public class JSmartRemindersController extends BaseController { * @return 所有数据 */ @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") - @ApiOperation(value = "政务端首页智能提醒查询所有数据", response = JSmartDeclaration.class) + @ApiOperation(value = "政务端首页智能提醒查询数据", response = JSmartDeclaration.class) @GetMapping("/chiefAll") - public AjaxResult chiefAll(Long projectId) { + public AjaxResult chiefAll(Page page, JRemindChiefAllRequest req) { // 获取当前登录用户是否是政务端 boolean admin = false; - Long userId = null; try { admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); - userId = SecurityUtils.getUserId(); + req.setUserId(SecurityUtils.getUserId()); } catch (Exception ignored) { } if (admin) { - userId = null; + req.setUserId(null); } - return success(jSmartDeclarationService.chiefAll(userId, projectId)); + return success(jSmartDeclarationService.chiefAll(page,req)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JDevelopmentReport.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JDevelopmentReport.java index b5a7053..20844c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JDevelopmentReport.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JDevelopmentReport.java @@ -1,8 +1,6 @@ package com.ruoyi.jjh.ent.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.ruoyi.jjh.common.entity.BaseInfoEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -48,4 +46,20 @@ public class JDevelopmentReport extends BaseInfoEntity { @NotBlank @ApiModelProperty("内容") private String content; + + + /** + * 创建ID + */ + @ApiModelProperty("创建ID") + @TableField(fill = FieldFill.INSERT) + private Long createId; + + /** + * 更新者ID + */ + @ApiModelProperty("更新者ID") + @TableField(fill = FieldFill.UPDATE) + private Long updateId; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JRemindChiefAllRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JRemindChiefAllRequest.java new file mode 100644 index 0000000..79f36d9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JRemindChiefAllRequest.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.ent.entity.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 政务端首页智能提醒查询请求体 + * @author du + * @since 2024/8/2 10:36 + */ +@Data +public class JRemindChiefAllRequest { + + /** + * 智能提醒内容 + */ + @ApiModelProperty("智能提醒内容") + private String content; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private Long projectId; + + /** + * 用户id + */ + @ApiModelProperty("用户id") + private Long userId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JTemplateMetricsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JTemplateMetricsResponse.java index ea446eb..5777887 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JTemplateMetricsResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/response/JTemplateMetricsResponse.java @@ -30,5 +30,5 @@ public class JTemplateMetricsResponse { * 数值 */ @ApiModelProperty("数值") - private Integer count; + private String count; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartDeclarationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartDeclarationMapper.java index 111a98c..f995d65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartDeclarationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartDeclarationMapper.java @@ -1,8 +1,10 @@ package com.ruoyi.jjh.ent.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.jjh.ent.entity.HomeRequestSmart; import com.ruoyi.jjh.ent.entity.JSmartDeclaration; +import com.ruoyi.jjh.ent.entity.request.JRemindChiefAllRequest; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,13 +22,13 @@ public interface JSmartDeclarationMapper extends BaseMapper { * * @return 所有数据 */ - List selectEnterpriseAllList(@Param("userName") String userName); + Page selectEnterpriseAllList(Page page,@Param("userName") String userName); /** * 政务端首页智能提醒查询所有数据 * * @return 所有数据 */ - List chiefAll(@Param("userId") Long userId, @Param("projectId") Long projectId); + Page chiefAll(Page page,@Param("req") JRemindChiefAllRequest req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartDeclarationService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartDeclarationService.java index af2bd3e..a448724 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartDeclarationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartDeclarationService.java @@ -1,8 +1,10 @@ package com.ruoyi.jjh.ent.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.jjh.ent.entity.HomeRequestSmart; import com.ruoyi.jjh.ent.entity.JSmartDeclaration; +import com.ruoyi.jjh.ent.entity.request.JRemindChiefAllRequest; import java.util.List; @@ -20,7 +22,7 @@ public interface JSmartDeclarationService extends IService { * * @return 所有数据 */ - List selectEnterpriseAllList(String userName); + Page selectEnterpriseAllList(Page page,String userName); /** @@ -28,6 +30,6 @@ public interface JSmartDeclarationService extends IService { * * @return 所有数据 */ - List chiefAll(Long userId, Long projectId); + Page chiefAll(Page page, JRemindChiefAllRequest req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartDeclarationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartDeclarationServiceImpl.java index 7347515..e91b7e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartDeclarationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartDeclarationServiceImpl.java @@ -1,8 +1,10 @@ package com.ruoyi.jjh.ent.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.jjh.ent.entity.HomeRequestSmart; import com.ruoyi.jjh.ent.entity.JSmartDeclaration; +import com.ruoyi.jjh.ent.entity.request.JRemindChiefAllRequest; import com.ruoyi.jjh.ent.mapper.JSmartDeclarationMapper; import com.ruoyi.jjh.ent.service.JSmartDeclarationService; import org.springframework.stereotype.Service; @@ -24,8 +26,8 @@ public class JSmartDeclarationServiceImpl extends ServiceImpl selectEnterpriseAllList(String userName) { - return baseMapper.selectEnterpriseAllList(userName); + public Page selectEnterpriseAllList(Page page,String userName) { + return baseMapper.selectEnterpriseAllList(page,userName); } /** @@ -34,8 +36,8 @@ public class JSmartDeclarationServiceImpl extends ServiceImpl chiefAll(Long userId, Long projectId) { - return baseMapper.chiefAll(userId, projectId); + public Page chiefAll(Page page, JRemindChiefAllRequest req) { + return baseMapper.chiefAll(page, req); } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 7a8165e..fb93cb9 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -63,7 +63,7 @@ spring: multi-statement-allow: true #自己客户端地址 returnUrl: http://39.101.188.84:9999/demo/JinJiHu -#returnUrl: http://192.168.0.110:80 +#returnUrl: http://192.168.0.113:80 #定时任务更新企业信息和联系人的开启 isTiming: false diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f04e035..ba65377 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -34,7 +34,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: internet # 文件上传 servlet: multipart: diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDevelopmentReportMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDevelopmentReportMapper.xml index 6b76b93..d1e21f6 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDevelopmentReportMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDevelopmentReportMapper.xml @@ -5,74 +5,77 @@ diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml index 1c3b415..e864881 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartDeclarationMapper.xml @@ -28,7 +28,7 @@ and a.alert_time < NOW() - order by a.alert_time desc; + order by a.alert_time desc diff --git a/ruoyi-admin/src/main/resources/template/~$发展报告模板.docx b/ruoyi-admin/src/main/resources/template/~$发展报告模板.docx deleted file mode 100644 index e066214c67301551698699d4f097185e6b7b4ac9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 ecmZSEc68VJ%kLOS1I!FD>3;*;qe;_6o@xLV;s>Gt