From 0a68fdd51bbbf0787b4d78b754d538148081ac00 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 14 Sep 2023 17:13:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=BB=8E=E6=89=8B=E5=8A=A8=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=E6=A1=86=E6=9E=B6=E8=87=AA=E5=B8=A6=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardPlanController.java | 13 +++ .../vo/EnterpriseStandardInspectVo.java | 2 + .../entity/vo/EnterpriseStandardPlanVo.java | 5 ++ .../vo/EnterpriseStandardRecheckPlanVo.java | 2 + .../vo/EnterpriseStandardReviewMeetingVo.java | 2 + .../mapper/EnterpriseStandardPlanMapper.java | 2 + .../xml/EnterpriseStandardPlanMapper.xml | 84 +++++++++++++++---- .../EnterpriseStandardPlanService.java | 18 ++++ .../EnterpriseStandardInspectServiceImpl.java | 18 ---- .../EnterpriseStandardPlanServiceImpl.java | 44 +--------- ...erpriseStandardRecheckPlanServiceImpl.java | 15 ---- ...tandardReviewMeetingRecordServiceImpl.java | 18 ---- 12 files changed, 114 insertions(+), 109 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index 11684402..8a3235ef 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -47,6 +47,19 @@ public class EnterpriseStandardPlanController extends JeroController queryPageList(@RequestParam("id") String planId) { + EnterpriseStandardPlan detail = esPlanService.getDetailById(planId); + return Result.OK(detail); + } + /** * 通过id删除 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java index d7e00479..0cd34d09 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -63,6 +64,7 @@ public class EnterpriseStandardInspectVo { private String actualInspectUser; /** 稽查状态 */ + @Dict(dicCode = "inspect_status") @ApiModelProperty(value = "稽查状态") private String inspectStatus; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index e5e01095..6d0e4bc0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -22,6 +23,7 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "主键ID") private String id; + @Dict(dicCode = "esp_application_category") @ApiModelProperty(value = "申请类别（制订/修订，立项/变更）") private String applicationCategory; @@ -83,6 +85,7 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "提交草稿日期") private Date draftSubmissionDate; + @Dict(dicCode = "yn") @ApiModelProperty(value = "是否征求意见") private String solicitationOpinionEnabled; @@ -106,9 +109,11 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "发布日期") private Date releaseDate; + @Dict(dicCode = "esp_project_status") @ApiModelProperty(value = "项目状态") private String projectStatus; + @Dict(dicCode = "esp_change_status") @ApiModelProperty(value = "变更状态") private String changeStatus; 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 372a20e7..64054cf2 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 @@ -1,6 +1,7 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -45,6 +46,7 @@ public class EnterpriseStandardRecheckPlanVo { /**复审结果*/ @ApiModelProperty(value = "复审结果") + @Dict(dicCode = "en_laws_recheck_result") private String recheckResult; /**主起草人*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java index f422e613..f316a448 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -47,6 +48,7 @@ public class EnterpriseStandardReviewMeetingVo { private String avgScore; /**是否为优质标准*/ + @Dict(dicCode = "yn") @ApiModelProperty(value = "是否为优质标准") private String qualityFlag; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardPlanMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardPlanMapper.java index 9a2e3540..6b6ef385 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardPlanMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardPlanMapper.java @@ -16,6 +16,8 @@ import org.apache.ibatis.annotations.Param; public interface EnterpriseStandardPlanMapper extends BaseMapper { IPage page(IPage page, @Param("param") ESPlanQueryDTO esPlanQueryDTO); + + EnterpriseStandardPlan getDetailById(@Param("id") String planId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 32e0192b..aa247e67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -82,29 +82,29 @@ SELECT p.id, p.application_category, - origin_en_standard_no, - origin_en_standard_name, - new_en_standard_no, - new_en_standard_name, + p.origin_en_standard_no, + p.origin_en_standard_name, + p.new_en_standard_no, + p.new_en_standard_name, ad.authDeparts, - en_standard_code, + p.en_standard_code, cu.cooperateDeparts, u1.name_work_no AS mainDraftingUser, d.depart_name AS mainDraftingUnit, u2.name_work_no AS mainDraftingUnitResponsiblePerson, u3.name_work_no AS standardPromoter, - draft_planned_complete_date, - solicitation_draft_plan_complete_date, - plan_approval_date, - draft_completion_date, - draft_submission_date, - solicitation_opinion_enabled, - solicitation_draft_completion_date, - review_date, - approval_date, - release_date, - project_status, - change_status + p.draft_planned_complete_date, + p.solicitation_draft_plan_complete_date, + p.plan_approval_date, + p.draft_completion_date, + p.draft_submission_date, + p.solicitation_opinion_enabled, + p.solicitation_draft_completion_date, + p.review_date, + p.approval_date, + p.release_date, + p.project_status, + p.change_status FROM `laws_enterprise_standard_plan` AS p LEFT JOIN sys_user AS u1 ON u1.id = p.main_drafting_user @@ -183,4 +183,54 @@ AND p.create_time BETWEEN #{param.createStartDate} AND #{param.createEndDate} + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java index 75ea3954..7c83bcb9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardPlanService.java @@ -13,7 +13,25 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardPlanService extends IService { + /** + * 列表接口 + * @param esPlan + * @param pageNo + * @param pageSize + * @return + */ IPage queryPageList(ESPlanQueryDTO esPlan, Integer pageNo, Integer pageSize); + /** + * 根据Id删除 + * @param id + */ void deleteById(String id); + + /** + * 获取详情 + * @param planId + * @return + */ + EnterpriseStandardPlan getDetailById(String planId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java index c43696e4..84f53659 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java @@ -32,9 +32,6 @@ import java.util.stream.Collectors; public class EnterpriseStandardInspectServiceImpl extends ServiceImpl implements EnterpriseStandardInspectService { - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource private EnterpriseStandardInspectMapper esInspectMapper; @@ -42,23 +39,8 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esInspectMapper.page(page, esInspect); - this.transInspectVo(page.getRecords()); return page; } - - // 转换列表中的状态值为中文 - private void transInspectVo(List list) { - if (list.isEmpty()) { - return; - } - List ynDictModelList = sysBaseAPI.getDictItems("inspect_status"); - list.forEach(e -> { - List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getInspectStatus())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setInspectStatus(collect.get(0).getText()); - } - }); - } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java index 5abfad43..74fe9f57 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java @@ -32,9 +32,6 @@ import java.util.stream.Collectors; public class EnterpriseStandardPlanServiceImpl extends ServiceImpl implements EnterpriseStandardPlanService{ - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource private EnterpriseStandardPlanMapper esPlanMapper; @@ -42,7 +39,6 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl queryPageList(ESPlanQueryDTO esPlanQueryDTO, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esPlanMapper.page(page, esPlanQueryDTO); - this.transESPlanVo(page.getRecords()); // TODO 判断其能否删除 主起草人在待办中未进行操作，该计划允许删除(目前都设为允许删除) page.getRecords().forEach(p -> p.setAllowDel(true)); return page; @@ -56,43 +52,9 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl list) { - if (list.isEmpty()) { - return; - } - // 转换申请类别 - List acDictModelList = sysBaseAPI.getDictItems("esp_application_category"); - list.forEach(e -> { - List collect = acDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getApplicationCategory())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setApplicationCategory(collect.get(0).getText()); - } - }); - // 转换项目状态 - List psDictModelList = sysBaseAPI.getDictItems("esp_project_status"); - list.forEach(e -> { - List collect = psDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getProjectStatus())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setProjectStatus(collect.get(0).getText()); - } - }); - // 转换变更类型 - List csDictModelList = sysBaseAPI.getDictItems("esp_change_status"); - list.forEach(e -> { - List collect = csDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getChangeStatus())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setChangeStatus(collect.get(0).getText()); - } - }); - // 转换是否征求意见 - List ynDictModelList = sysBaseAPI.getDictItems("yn"); - list.forEach(e -> { - List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getSolicitationOpinionEnabled())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setSolicitationOpinionEnabled(collect.get(0).getText()); - } - }); + @Override + public EnterpriseStandardPlan getDetailById(String planId) { + return esPlanMapper.getDetailById(planId); } } 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 c5701c5e..43c7a335 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 @@ -42,23 +42,8 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esRecheckPlanMapper.page(page, esRecheckPlan); - this.transRecheckPlanVo(page.getRecords()); return page; } - - // 转换列表中的状态值为中文 - private void transRecheckPlanVo(List list) { - if (list.isEmpty()) { - return; - } - List ynDictModelList = sysBaseAPI.getDictItems("en_laws_recheck_result"); - list.forEach(e -> { - List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRecheckResult())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setRecheckResult(collect.get(0).getText()); - } - }); - } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java index 8bcf88c8..9d729f6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardReviewMeetingRecordServiceImpl.java @@ -37,9 +37,6 @@ import java.util.stream.Collectors; public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImpl implements EnterpriseStandardReviewMeetingRecordService { - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource private EnterpriseStandardReviewMeetingRecordMapper esReviewMeetingMapper; @@ -50,7 +47,6 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp public IPage queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) { IPage page = new Page<>(pageNo, pageSize); esReviewMeetingMapper.page(page, esReviewMeeting); - this.transReviewMeetingVo(page.getRecords()); return page; } @@ -72,20 +68,6 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp // 设置为优质标准 esPlanService.update(espWrapper); } - - // 转换列表中的状态值为中文 - private void transReviewMeetingVo(List list) { - if (list.isEmpty()) { - return; - } - List ynDictModelList = sysBaseAPI.getDictItems("yn"); - list.forEach(e -> { - List collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getQualityFlag())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - e.setQualityFlag(collect.get(0).getText()); - } - }); - } }