From 3b601869b1eeca467d5b4bf9bce9dde55ed256d8 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 5 Dec 2023 17:37:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fb/entity/ProcessFbStandardConsultation.java | 4 ++-- .../impl/ProcessFbStandardConsultationServiceImpl.java | 4 +++- .../controller/ConsultationController.java | 1 - .../service/impl/ConsultationServiceImpl.java | 10 ++++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java index 16911005..b95c3566 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbStandardConsultation.java @@ -46,8 +46,8 @@ public class ProcessFbStandardConsultation implements Serializable { @ApiModelProperty(value = "更新人") private java.lang.String updateBy; /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private java.util.Date updateTime; /**所属部门*/ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index edaecd8f..2fcd3bd2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -570,9 +570,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl() .eq(ProcessFbStandardConsultation::getId, businessId) - .set(ProcessFbStandardConsultation::getConsultationEndDate, new Date())); + .set(ProcessFbStandardConsultation::getConsultationEndDate, date) + .set(ProcessFbStandardConsultation::getUpdateTime, date)); } else { List taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); log.info("还剩 {} 个任务待完成", taskList.size()); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java index d58c23ad..0f45fc09 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/consultation/controller/ConsultationController.java @@ -45,7 +45,6 @@ public class ConsultationController { @AutoLog(value = "征求意见-分页查询") @ApiOperation(value="征求意见-分页查询", notes="征求意见-分页查询") @GetMapping(value = "/queryByPage") - @Translation @RequiresPermissions("askForAdvice:search") public Result> queryByPage(ProcessFbStandardConsultation processFbStandardConsultation, @ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java index 145597f2..d9abd62a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysDictService; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; @@ -55,19 +56,22 @@ public class ConsultationServiceImpl implements IConsultationService { private final ILawsEnterpriseStandardService lawsEnterpriseStandardService; private final ISysDepartService sysDepartService; private final IOSSFileService ossFileService; + private final ISysDictService sysDictService; public ConsultationServiceImpl(IProcessFbStandardConsultationService processFbStandardConsultationService, IProcessFbConsultationListService processFbConsultationListService, ILawsDomesticStandardService lawsDomesticStandardService, ILawsEnterpriseStandardService lawsEnterpriseStandardService, ISysDepartService sysDepartService, - IOSSFileService ossFileService) { + IOSSFileService ossFileService, + ISysDictService sysDictService) { this.processFbStandardConsultationService = processFbStandardConsultationService; this.processFbConsultationListService = processFbConsultationListService; this.lawsDomesticStandardService = lawsDomesticStandardService; this.lawsEnterpriseStandardService = lawsEnterpriseStandardService; this.sysDepartService = sysDepartService; this.ossFileService = ossFileService; + this.sysDictService = sysDictService; } @Override @@ -83,6 +87,7 @@ public class ConsultationServiceImpl implements IConsultationService { queryWrapper.and(qw -> qw.like(ProcessFbStandardConsultation::getStandardNumber, processFbStandardConsultation.getStandardNameNumber()) .or().like(ProcessFbStandardConsultation::getStandardName, processFbStandardConsultation.getStandardNameNumber())); } + queryWrapper.orderByDesc(ProcessFbStandardConsultation::getConsultationEndDate).orderByDesc(ProcessFbStandardConsultation::getUpdateTime); IPage page = processFbStandardConsultationService.page(new Page<>(pageNo, pageSize), queryWrapper); List records = page.getRecords(); fillProperty(records); @@ -228,7 +233,8 @@ public class ConsultationServiceImpl implements IConsultationService { cell7.setCellStyle(cellStyle); // 处理意见 Cell cell8 = headerRow.createCell(7); - cell8.setCellValue(processFbConsultation.getIsAdopt_dictText()); + String isAdopt = sysDictService.queryDictTextByKey("consultation_opinion", processFbConsultation.getIsAdopt()); + cell8.setCellValue(isAdopt); cell8.setCellStyle(cellStyle); // 依据描述 Cell cell9 = headerRow.createCell(8);