feat: 数据字典转换从手动切换为框架自带注解

laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java

@@ -47,6 +47,19 @@ public class EnterpriseStandardPlanController extends JeroController<EnterpriseS
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 企标详情
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "企标计划-企标详情")
+	@ApiOperation(value="企标计划-企标详情", notes="企标计划-企标详情")
+	@GetMapping(value = "/detail")
+	public Result<?> queryPageList(@RequestParam("id") String planId) {
+		EnterpriseStandardPlan detail = esPlanService.getDetailById(planId);
+		return Result.OK(detail);
+	}
+
 	/**
 	 * 通过id删除
 	 *

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;
 

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;
 

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;
 
     /**主起草人*/

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;
 

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<EnterpriseStandardPlan> {
 
     IPage<EnterpriseStandardPlanVo> page(IPage<EnterpriseStandardPlanVo> page, @Param("param") ESPlanQueryDTO esPlanQueryDTO);
+
+    EnterpriseStandardPlan getDetailById(@Param("id") String planId);
 }
 
 

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}
             </if>
     </select>
+
+    <select id="getDetailById" resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan">
+        SELECT
+            p.id,
+            p.application_category,
+            p.origin_en_standard_no,
+            p.origin_en_standard_name,
+            p.new_en_standard_no,
+            p.new_en_standard_name,
+            ad.authDeparts,
+            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,
+            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
+            LEFT JOIN sys_user AS u2 ON u2.id = p.main_drafting_unit_responsible_person
+            LEFT JOIN sys_user AS u3 ON u3.id = p.standard_promoter
+            LEFT JOIN sys_depart AS d ON d.id = p.main_drafting_unit
+            LEFT JOIN
+                (SELECT
+                ad.plan_id as id,
+                GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS authDeparts
+                FROM
+                laws_enterprise_standard_plan_auth_dept AS ad
+            LEFT JOIN sys_depart AS d ON d.id = ad.dept_id) AS ad ON ad.id = p.id
+            LEFT JOIN
+                (SELECT
+                cu.plan_id as id,
+                GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS cooperateDeparts
+                FROM
+                laws_enterprise_standard_plan_cooperate_unit AS cu
+            LEFT JOIN sys_depart AS d ON d.id = cu.dept_id) AS cu ON cu.id = p.id
+        WHERE p.id = #{id}
+    </select>
 </mapper>

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<EnterpriseStandardPlan> {
 
+    /**
+     * 列表接口
+     * @param esPlan
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
     IPage<EnterpriseStandardPlanVo> queryPageList(ESPlanQueryDTO esPlan, Integer pageNo, Integer pageSize);
 
+    /**
+     * 根据Id删除
+     * @param id
+     */
     void deleteById(String id);
+
+    /**
+     * 获取详情
+     * @param planId
+     * @return
+     */
+    EnterpriseStandardPlan getDetailById(String planId);
 }

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<EnterpriseStandardInspectMapper, EnterpriseStandardInspect>
     implements EnterpriseStandardInspectService {
 
-    @Resource
-    private ISysBaseAPI sysBaseAPI;
-
     @Resource
     private  EnterpriseStandardInspectMapper esInspectMapper;
 
@@ -42,23 +39,8 @@ public class EnterpriseStandardInspectServiceImpl extends ServiceImpl<Enterprise
     public IPage<EnterpriseStandardInspectVo> queryPageList(ESQueryCommonDTO esInspect, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardInspectVo> page = new Page<>(pageNo, pageSize);
         esInspectMapper.page(page, esInspect);
-        this.transInspectVo(page.getRecords());
         return page;
     }
-
-    // 转换列表中的状态值为中文
-    private void transInspectVo(List<EnterpriseStandardInspectVo> list) {
-        if (list.isEmpty()) {
-            return;
-        }
-        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("inspect_status");
-        list.forEach(e -> {
-            List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getInspectStatus())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                e.setInspectStatus(collect.get(0).getText());
-            }
-        });
-    }
 }
 
 

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<EnterpriseStandardPlanMapper, EnterpriseStandardPlan>
     implements EnterpriseStandardPlanService{
 
-    @Resource
-    private ISysBaseAPI sysBaseAPI;
-
     @Resource
     private EnterpriseStandardPlanMapper esPlanMapper;
 
@@ -42,7 +39,6 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
     public IPage<EnterpriseStandardPlanVo> queryPageList(ESPlanQueryDTO esPlanQueryDTO, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardPlanVo> 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<EnterpriseSta
         update(wrapper);
     }
 
-    // 转换列表中的状态值为中文
-    private void transESPlanVo(List<EnterpriseStandardPlanVo> list) {
-        if (list.isEmpty()) {
-            return;
-        }
-        // 转换申请类别
-        List<DictModel> acDictModelList = sysBaseAPI.getDictItems("esp_application_category");
-        list.forEach(e -> {
-            List<DictModel> collect = acDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getApplicationCategory())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                e.setApplicationCategory(collect.get(0).getText());
-            }
-        });
-        // 转换项目状态
-        List<DictModel> psDictModelList = sysBaseAPI.getDictItems("esp_project_status");
-        list.forEach(e -> {
-            List<DictModel> collect = psDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getProjectStatus())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                e.setProjectStatus(collect.get(0).getText());
-            }
-        });
-        // 转换变更类型
-        List<DictModel> csDictModelList = sysBaseAPI.getDictItems("esp_change_status");
-        list.forEach(e -> {
-            List<DictModel> collect = csDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getChangeStatus())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                e.setChangeStatus(collect.get(0).getText());
-            }
-        });
-        // 转换是否征求意见
-        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("yn");
-        list.forEach(e -> {
-            List<DictModel> 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);
     }
 }
 

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java

@@ -42,23 +42,8 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl<Enterp
     public IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardRecheckPlanVo> page = new Page<>(pageNo, pageSize);
         esRecheckPlanMapper.page(page, esRecheckPlan);
-        this.transRecheckPlanVo(page.getRecords());
         return page;
     }
-
-    // 转换列表中的状态值为中文
-    private void transRecheckPlanVo(List<EnterpriseStandardRecheckPlanVo> list) {
-        if (list.isEmpty()) {
-            return;
-        }
-        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("en_laws_recheck_result");
-        list.forEach(e -> {
-            List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRecheckResult())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                e.setRecheckResult(collect.get(0).getText());
-            }
-        });
-    }
 }
 
 

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<EnterpriseStandardReviewMeetingRecordMapper, EnterpriseStandardReviewMeetingRecord>
     implements EnterpriseStandardReviewMeetingRecordService {
 
-    @Resource
-    private ISysBaseAPI sysBaseAPI;
-
     @Resource
     private EnterpriseStandardReviewMeetingRecordMapper esReviewMeetingMapper;
 
@@ -50,7 +47,6 @@ public class EnterpriseStandardReviewMeetingRecordServiceImpl extends ServiceImp
     public IPage<EnterpriseStandardReviewMeetingVo> queryPageList(ESQueryCommonDTO esReviewMeeting, Integer pageNo, Integer pageSize) {
         IPage<EnterpriseStandardReviewMeetingVo> 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<EnterpriseStandardReviewMeetingVo> list) {
-        if (list.isEmpty()) {
-            return;
-        }
-        List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("yn");
-        list.forEach(e -> {
-            List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getQualityFlag())).collect(Collectors.toList());
-            if (!collect.isEmpty()) {
-                e.setQualityFlag(collect.get(0).getText());
-            }
-        });
-    }
 }