From d81b56d2fc266f4b94155793d4d8e3470b00d25f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 22 Nov 2023 13:59:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A0=B9=E6=8D=AEId=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...terpriseStandardRecheckPlanController.java | 20 +++++++++++--- .../vo/EnterpriseStandardRecheckPlanVo.java | 6 +++++ .../EnterpriseStandardRecheckPlanMapper.xml | 9 ++++++- .../EnterpriseStandardRecheckPlanService.java | 2 ++ ...erpriseStandardRecheckPlanServiceImpl.java | 26 +++++++++++++------ 5 files changed, 50 insertions(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java index 572b8814..adc0c77a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java @@ -4,6 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; @@ -13,10 +14,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -52,4 +50,18 @@ public class EnterpriseStandardRecheckPlanController extends JeroController getDataById(@PathVariable("id") @ApiParam("复审计划主键ID") String id) { + return Result.OK(recheckPlanService.getDataById(id)); + } } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java index 2c72d43d..f4101069 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java @@ -40,6 +40,12 @@ public class EnterpriseStandardRecheckPlanVo { @ApiModelProperty(value = "发布日期") private Date releaseDate; + /**实施日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实施日期") + private Date implementationDate; + /**复审日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml index ab88bb99..5a7dc0e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml @@ -32,7 +32,8 @@ p.recheck_date AS recheckDate, p.recheck_result AS recheckResult, s.main_drafting_user AS mainDraftingUser, - s.main_drafting_unit AS mainDraftingUnit + s.main_drafting_unit AS mainDraftingUnit, + s.implementation_date AS implementationDate FROM laws_enterprise_standard_recheck_plan AS p LEFT JOIN laws_enterprise_standard AS s ON s.id = p.standard_id @@ -53,6 +54,12 @@ AND p.recheck_date BETWEEN #{param.recheckStartDate} AND #{param.recheckEndDate} + + AND p.id IN + + #{item} + + ORDER BY p.create_time DESC diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java index ea6ae038..318938d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java @@ -22,4 +22,6 @@ public interface EnterpriseStandardRecheckPlanService extends IService queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize); + + EnterpriseStandardRecheckPlanVo getDataById(String id); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java index e49c390b..93a4f27b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java @@ -18,21 +18,19 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service实现 -* @createDate 2023-09-07 11:20:19 -*/ + * @author ThinkBook + * @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service实现 + * @createDate 2023-09-07 11:20:19 + */ @Service @Transactional(rollbackFor = JeroBootException.class) @Slf4j public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl - implements EnterpriseStandardRecheckPlanService{ + implements EnterpriseStandardRecheckPlanService { @Resource private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper; @@ -59,6 +57,18 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl idList = new ArrayList<>(Collections.singletonList(id)); + ESQueryCommonDTO esQueryCommonDTO = new ESQueryCommonDTO(); + esQueryCommonDTO.setIdList(idList); + List records = this.queryPageList(esQueryCommonDTO, 1, Integer.MAX_VALUE).getRecords(); + if (!records.isEmpty()) { + return records.get(0); + } + return null; + } }