ci: 企标计划字段翻译更正

ci: 企标计划字段翻译更正

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

@@ -3,6 +3,7 @@ package com.jero.modules.laws.enterprise.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.MessageUtils;
@@ -17,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -63,6 +65,7 @@ public class EnterpriseStandardPlanController extends JeroController<EnterpriseS
 	@AutoLog(value = "企标计划-企标详情")
 	@ApiOperation(value="企标计划-企标详情", notes="企标计划-企标详情")
 	@GetMapping(value = "/detail")
+	@Translation
 	public Result<?> getDetailById(@RequestParam("id") String planId) {
 		EnterpriseStandardPlan detail = esPlanService.getDetailById(planId);
 		return Result.OK(detail);

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java

@@ -1,10 +1,12 @@
 package com.jero.modules.laws.enterprise.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -71,14 +73,10 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dicCode = "esp_application_category")
     @ApiModelProperty(value = "申请类别")
     private String applicationCategory;
-    @TableField(exist = false)
-    private String applicationCategory_dictText;
 
     @Dict(dicCode = "esp_project_type")
     @ApiModelProperty(value = "项目类型")
     private String projectType;
-    @TableField(exist = false)
-    private String projectType_dictText;;
 
     @ApiModelProperty(value = "原企标编号")
     private String originEnStandardNo;
@@ -113,8 +111,6 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dicCode = "esp_standard_type")
     @ApiModelProperty(value = "标准类型")
     private String standardType;
-    @TableField(exist = false)
-    private String standardType_dictText;
 
     @ApiModelProperty(value = "企标等级分类")
     private String enStandardClassification;
@@ -137,8 +133,6 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dicCode = "esp_project_status")
     @ApiModelProperty(value = "项目状态")
     private String projectStatus;
-    @TableField(exist = false)
-    private String projectStatus_dictText;
 
     @ApiModelProperty(value = "编制说明")
     private String compilationDescription;
@@ -157,25 +151,29 @@ public class EnterpriseStandardPlan implements Serializable {
     private String mainDraftingUser;
     @TableField(exist = false)
     @ApiModelProperty(value = "主起草人用户名")
-    private String mainDraftingUser_dictText;
+    @JsonProperty("mainDraftingUser_dictText")
+    private String mainDraftingUserDictText;
 
     @ApiModelProperty(value = "主起草单位Id")
     private String mainDraftingUnit;
     @ApiModelProperty(value = "主起草单位")
     @TableField(exist = false)
-    private String mainDraftingUnit_dictText;
+    @JsonProperty("mainDraftingUnit_dictText")
+    private String mainDraftingUnitDictText;
 
     @ApiModelProperty(value = "主起草单位责任人Id")
     private String mainDraftingUnitResponsiblePerson;
     @TableField(exist = false)
     @ApiModelProperty(value = "主起草单位责任人用户名")
-    private String mainDraftingUnitResponsiblePerson_dictText;
+    @JsonProperty("mainDraftingUnitResponsiblePerson_dictText")
+    private String mainDraftingUnitResponsiblePersonDictText;
 
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
     @TableField(exist = false)
     @ApiModelProperty(value = "标准推进人")
-    private String standardPromoter_dictText;
+    @JsonProperty("standardPromoter_dictText")
+    private String standardPromoterDictText;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -190,8 +188,6 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否征求意见")
     private String solicitationOpinionEnabled;
-    @TableField(exist = false)
-    private String solicitationOpinionEnabled_dictText;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -216,8 +212,6 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dicCode = "esp_change_status")
     @ApiModelProperty(value = "变更状态")
     private String changeStatus;
-    @TableField(exist = false)
-    private String changeStatus_dictText;
 
     @ApiModelProperty(value = "立项背景、立项依据")
     private String projectBackground;
@@ -247,8 +241,6 @@ public class EnterpriseStandardPlan implements Serializable {
     @Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否为优质标准")
     private String qualityFlag;
-    @TableField(exist = false)
-    private String qualityFlag_dictText;
 
     @ApiModelProperty(value = "配合单位")
     private String cooperationUnit;

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.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -62,28 +63,32 @@ public class EnterpriseStandardPlanVo {
 
     @Excel(name = "主起草人", width = 15, orderNum = "1")
     @ApiModelProperty(value = "主起草人用户名")
-    private String mainDraftingUser_dictText;
+    @JsonProperty("mainDraftingUser_dictText")
+    private String mainDraftingUserDictText;
 
     @ApiModelProperty(value = "主起草单位Id")
     private String mainDraftingUnit;
 
     @Excel(name = "主起草单位", width = 15, orderNum = "1")
     @ApiModelProperty(value = "主起草单位名")
-    private String mainDraftingUnit_dictText;
+    @JsonProperty("mainDraftingUnit_dictText")
+    private String mainDraftingUnitDictText;
 
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
     @Excel(name = "主起草单位责任人", width = 15, orderNum = "1")
     @ApiModelProperty(value = "主起草单位责任人用户名")
-    private String mainDraftingUnitResponsiblePerson_dictText;
+    @JsonProperty("mainDraftingUnitResponsiblePerson_dictText")
+    private String mainDraftingUnitResponsiblePersonDictText;
 
     @ApiModelProperty(value = "标准推进人Id")
     private String standardPromoter;
 
     @Excel(name = "标准推进人", width = 15, orderNum = "1")
     @ApiModelProperty(value = "标准推进人用户名")
-    private String standardPromoter_dictText;
+    @JsonProperty("standardPromoter_dictText")
+    private String standardPromoterDictText;
 
     @Excel(name = "草稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml

@@ -91,13 +91,13 @@
             p.en_standard_code,
             cu.cooperateDeparts,
             u1.id AS mainDraftingUser,
-            u1.username AS mainDraftingUser_dictText,
+            u1.username AS mainDraftingUserDictText,
             d.id AS mainDraftingUnit,
-            d.depart_name AS mainDraftingUnit_dictText,
+            d.depart_name AS mainDraftingUnitDictText,
             u2.id AS mainDraftingUnitResponsiblePerson,
-            u2.username AS mainDraftingUnitResponsiblePerson_dictText,
+            u2.username AS mainDraftingUnitResponsiblePersonDictText,
             u3.id AS standardPromoter,
-            u3.username AS standardPromoter_dictText,
+            u3.username AS standardPromoterDictText,
             p.draft_planned_complete_date,
             p.solicitation_draft_plan_complete_date,
             p.plan_approval_date,
@@ -232,16 +232,14 @@
             p.compilation_description,
             o1.file_name AS compilationFileName,
             p.component_name,
-#             u1.id as mainDraftingUserId,
             u1.id as mainDraftingUser,
-            u1.username as mainDraftingUser_dictText,
+            u1.username as mainDraftingUserDictText,
-#             d.id as mainDraftingUnitId,
             d.id as mainDraftingUnit,
-            d.depart_name as mainDraftingUnit_dictText,
+            d.depart_name as mainDraftingUnitDictText,
             u2.id as mainDraftingUnitResponsiblePerson,
-            u2.username as mainDraftingUnitResponsiblePerson_dictText,
+            u2.username as mainDraftingUnitResponsiblePersonDictText,
             u3.id as promoter,
-            u3.username as promoter_dictText,
+            u3.username as standardPromoterDictText,
             p.draft_completion_date,
             p.draft_submission_date,
             p.solicitation_opinion_enabled,

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

@@ -69,9 +69,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
 
     @Override
     public EnterpriseStandardPlan getDetailById(String planId) {
-        EnterpriseStandardPlan detail = esPlanMapper.getDetailById(planId);
+        return esPlanMapper.getDetailById(planId);
-        this.transDict(Collections.singletonList(detail));
-        return detail;
     }
 
 
@@ -120,48 +118,6 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
         }
     }
 
-    // 转换列表中的状态值为中文
-    private void transDict(List<EnterpriseStandardPlan> list) {
-        if (list.isEmpty()) {
-            return;
-        }
-
-        Map<String, DictModel> acDict = convertDictToMap(sysBaseAPI.getDictItems("esp_application_category"));
-        Map<String, DictModel> ptDict = convertDictToMap(sysBaseAPI.getDictItems("esp_project_type"));
-        Map<String, DictModel> stDict = convertDictToMap(sysBaseAPI.getDictItems("esp_standard_type"));
-        Map<String, DictModel> psDict = convertDictToMap(sysBaseAPI.getDictItems("esp_project_status"));
-        Map<String, DictModel> ynDict = convertDictToMap(sysBaseAPI.getDictItems("yn"));
-        Map<String, DictModel> csDict = convertDictToMap(sysBaseAPI.getDictItems("esp_change_status"));
-
-        list.forEach(e -> {
-            if (acDict.containsKey(e.getApplicationCategory())) {
-                e.setApplicationCategory_dictText(acDict.get(e.getApplicationCategory()).getText());
-            }
-            if (ptDict.containsKey(e.getProjectType())) {
-                e.setProjectType_dictText(ptDict.get(e.getProjectType()).getText());
-            }
-            if (stDict.containsKey(e.getStandardType())) {
-                e.setStandardType_dictText(stDict.get(e.getStandardType()).getText());
-            }
-            if (psDict.containsKey(e.getProjectStatus())) {
-                e.setProjectStatus_dictText(psDict.get(e.getProjectStatus()).getText());
-            }
-            if (ynDict.containsKey(e.getSolicitationOpinionEnabled())) {
-                e.setSolicitationOpinionEnabled_dictText(ynDict.get(e.getSolicitationOpinionEnabled()).getText());
-            }
-            if (csDict.containsKey(e.getChangeStatus())) {
-                e.setChangeStatus_dictText(csDict.get(e.getChangeStatus()).getText());
-            }
-            if (ynDict.containsKey(e.getQualityFlag())) {
-                e.setQualityFlag_dictText(ynDict.get(e.getQualityFlag()).getText());
-            }
-        });
-    }
-
-    private Map<String, DictModel> convertDictToMap(List<DictModel> dictModelList) {
-        return dictModelList.stream().collect(Collectors.toMap(DictModel::getValue, dictModel -> dictModel));
-    }
-
     @Override
     public List<String> getSequenceNumbers(String esCodeDictValue, String esNameCodeDictValue, String categoryCodeDictValue) {
         // 已经存在的标准