ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 企标计划字段翻译修正

Browse Source
This commit is contained in:
mzaxd
2023-10-20 11:05:48 +08:00
parent 57fefe07f3
commit 1c133d085d
3 changed files with 57 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
+10 -29
View File
@@ -1,12 +1,9 @@
package com.jero.modules.laws.enterprise.entity; package com.jero.modules.laws.enterprise.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.common.aspect.annotation.Dict; import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -134,46 +131,32 @@ public class EnterpriseStandardPlan implements Serializable {
@ApiModelProperty(value = "项目状态") @ApiModelProperty(value = "项目状态")
private String projectStatus; private String projectStatus;
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
@ApiModelProperty(value = "编制说明") @ApiModelProperty(value = "编制说明")
private String compilationDescription; private String compilationDescription;
@TableField(exist = false)
@ApiModelProperty(value = "附件文件名")
private String compilationFileName;
@ApiModelProperty(value = "零部件名称") @ApiModelProperty(value = "零部件名称")
private String componentName; private String componentName;
@ApiModelProperty(value = "授权部门") @ApiModelProperty(value = "授权部门")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String authDept; private String authDept;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "主起草人") @ApiModelProperty(value = "主起草人")
private String mainDraftingUser; private String mainDraftingUser;
@TableField(exist = false)
@ApiModelProperty(value = "主起草人用户名")
@JsonProperty("mainDraftingUser_dictText")
private String mainDraftingUserDictText;
@ApiModelProperty(value = "主起草单位Id") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String mainDraftingUnit;
@ApiModelProperty(value = "主起草单位") @ApiModelProperty(value = "主起草单位")
@TableField(exist = false) private String mainDraftingUnit;
@JsonProperty("mainDraftingUnit_dictText")
private String mainDraftingUnitDictText;
@ApiModelProperty(value = "主起草单位责任人Id") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson; private String mainDraftingUnitResponsiblePerson;
@TableField(exist = false)
@ApiModelProperty(value = "主起草单位责任人用户名")
@JsonProperty("mainDraftingUnitResponsiblePerson_dictText")
private String mainDraftingUnitResponsiblePersonDictText;
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "标准推进人") @ApiModelProperty(value = "标准推进人")
private String standardPromoter; private String standardPromoter;
@TableField(exist = false)
@ApiModelProperty(value = "标准推进人")
@JsonProperty("standardPromoter_dictText")
private String standardPromoterDictText;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -231,17 +214,15 @@ public class EnterpriseStandardPlan implements Serializable {
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remarks; private String remarks;
@Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
@ApiModelProperty(value = "上传附件") @ApiModelProperty(value = "上传附件")
private String uploadAttachment; private String uploadAttachment;
@TableField(exist = false)
@ApiModelProperty(value = "附件文件名")
private String attachmentFileName;
@Dict(dicCode = "yn") @Dict(dicCode = "yn")
@ApiModelProperty(value = "是否为优质标准") @ApiModelProperty(value = "是否为优质标准")
private String qualityFlag; private String qualityFlag;
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位") @ApiModelProperty(value = "配合单位")
private String cooperationUnit; private String cooperationUnit;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
+37 -47
View File
@@ -46,77 +46,67 @@ public class EnterpriseStandardPlanVo {
@ApiModelProperty(value = "新企标名称") @ApiModelProperty(value = "新企标名称")
private String newEnStandardName; private String newEnStandardName;
@Excel(name = "授权部门", width = 15, orderNum = "1") @Excel(name = "授权部门", width = 15, orderNum = "1", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "授权部门") @ApiModelProperty(value = "授权部门")
private String authDeparts; @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String authDept;
@Excel(name = "配合单位", width = 15, orderNum = "1", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位")
private String cooperationUnit;
@Excel(name = "企业标准代号", width = 15, orderNum = "1") @Excel(name = "企业标准代号", width = 15, orderNum = "1")
@ApiModelProperty(value = "企业标准代号") @ApiModelProperty(value = "企业标准代号")
private String enStandardCode; private String enStandardCode;
@Excel(name = "配合单位", width = 15, orderNum = "1") @Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "配合单位") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
private String cooperateDeparts; @ApiModelProperty(value = "主起草人")
@ApiModelProperty(value = "主起草人Id")
private String mainDraftingUser; private String mainDraftingUser;
@Excel(name = "主起草人", width = 15, orderNum = "1") @Excel(name = "主起草单位", width = 15, orderNum = "1")
@ApiModelProperty(value = "主起草人用户名") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@JsonProperty("mainDraftingUser_dictText") @ApiModelProperty(value = "主起草单位")
private String mainDraftingUserDictText;
@ApiModelProperty(value = "主起草单位Id")
private String mainDraftingUnit; private String mainDraftingUnit;
@Excel(name = "主起草单位", width = 15, orderNum = "1") @Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "主起草单位名") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@JsonProperty("mainDraftingUnit_dictText")
private String mainDraftingUnitDictText;
@ApiModelProperty(value = "主起草单位责任人") @ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson; private String mainDraftingUnitResponsiblePerson;
@Excel(name = "主起草单位责任人", width = 15, orderNum = "1") @Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "主起草单位责任人用户名") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@JsonProperty("mainDraftingUnitResponsiblePerson_dictText") @ApiModelProperty(value = "标准推进人")
private String mainDraftingUnitResponsiblePersonDictText;
@ApiModelProperty(value = "标准推进人Id")
private String standardPromoter; private String standardPromoter;
@Excel(name = "标准推进人", width = 15, orderNum = "1")
@ApiModelProperty(value = "标准推进人用户名")
@JsonProperty("standardPromoter_dictText")
private String standardPromoterDictText;
@Excel(name = "草稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "草稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "草稿计划完成日期") @ApiModelProperty(value = "草稿计划完成日期")
private Date draftPlannedCompleteDate; private Date draftPlannedCompleteDate;
@Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿计划完成日期") @ApiModelProperty(value = "征求意见稿计划完成日期")
private Date solicitationDraftPlanCompleteDate; private Date solicitationDraftPlanCompleteDate;
@Excel(name = "计划报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "计划报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "计划报批日期") @ApiModelProperty(value = "计划报批日期")
private Date planApprovalDate; private Date planApprovalDate;
@Excel(name = "草稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "草稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "草稿完成日期") @ApiModelProperty(value = "草稿完成日期")
private Date draftCompletionDate; private Date draftCompletionDate;
@Excel(name = "提交草稿日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "提交草稿日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "提交草稿日期") @ApiModelProperty(value = "提交草稿日期")
private Date draftSubmissionDate; private Date draftSubmissionDate;
@@ -126,26 +116,26 @@ public class EnterpriseStandardPlanVo {
private String solicitationOpinionEnabled; private String solicitationOpinionEnabled;
@Excel(name = "征求意见稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "征求意见稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿完成日期") @ApiModelProperty(value = "征求意见稿完成日期")
private Date solicitationDraftCompletionDate; private Date solicitationDraftCompletionDate;
@Excel(name = "评审日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "评审日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "评审日期") @ApiModelProperty(value = "评审日期")
private Date reviewDate; private Date reviewDate;
@Excel(name = "报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "报批日期") @ApiModelProperty(value = "报批日期")
private Date approvalDate; private Date approvalDate;
@Excel(name = "发布日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") @Excel(name = "发布日期", width = 15, orderNum = "1", format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "发布日期") @ApiModelProperty(value = "发布日期")
private Date releaseDate; private Date releaseDate;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml
+10 -54
View File
@@ -87,17 +87,13 @@
p.origin_en_standard_name, p.origin_en_standard_name,
p.new_en_standard_no, p.new_en_standard_no,
p.new_en_standard_name, p.new_en_standard_name,
ad.authDeparts, p.auth_dept,
p.en_standard_code, p.en_standard_code,
cu.cooperateDeparts, p.cooperation_unit,
u1.id AS mainDraftingUser, p.main_drafting_user,
u1.username AS mainDraftingUserDictText, p.main_drafting_unit,
d.id AS mainDraftingUnit, p.main_drafting_unit_responsible_person,
d.depart_name AS mainDraftingUnitDictText, p.standard_promoter,
u2.id AS mainDraftingUnitResponsiblePerson,
u2.username AS mainDraftingUnitResponsiblePersonDictText,
u3.id AS standardPromoter,
u3.username AS standardPromoterDictText,
p.draft_planned_complete_date, p.draft_planned_complete_date,
p.solicitation_draft_plan_complete_date, p.solicitation_draft_plan_complete_date,
p.plan_approval_date, p.plan_approval_date,
@@ -116,20 +112,6 @@
LEFT JOIN sys_user AS u2 ON u2.id = p.main_drafting_unit_responsible_person 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_user AS u3 ON u3.id = p.standard_promoter
LEFT JOIN sys_depart AS d ON d.id = p.main_drafting_unit 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.del_flag = 0 WHERE p.del_flag = 0
<!--原企标编号判断--> <!--原企标编号判断-->
<if test="param.originEnStandardNo != null and param.originEnStandardNo != ''"> <if test="param.originEnStandardNo != null and param.originEnStandardNo != ''">
@@ -230,16 +212,11 @@
p.plan_approval_date, p.plan_approval_date,
p.project_status, p.project_status,
p.compilation_description, p.compilation_description,
o1.file_name AS compilationFileName,
p.component_name, p.component_name,
u1.id as mainDraftingUser, p.main_drafting_user,
u1.username as mainDraftingUserDictText, p.main_drafting_unit,
d.id as mainDraftingUnit, p.main_drafting_unit_responsible_person,
d.depart_name as mainDraftingUnitDictText, p.standard_promoter,
u2.id as mainDraftingUnitResponsiblePerson,
u2.username as mainDraftingUnitResponsiblePersonDictText,
u3.id as promoter,
u3.username as standardPromoterDictText,
p.draft_completion_date, p.draft_completion_date,
p.draft_submission_date, p.draft_submission_date,
p.solicitation_opinion_enabled, p.solicitation_opinion_enabled,
@@ -255,30 +232,9 @@
p.project_expected_effects, p.project_expected_effects,
p.remarks, p.remarks,
p.upload_attachment, p.upload_attachment,
o2.file_name AS attachmentFileName,
p.quality_flag p.quality_flag
FROM FROM
`laws_enterprise_standard_plan` AS p `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 oss_file AS o1 ON o1.id = p.compilation_description
LEFt JOIN oss_file AS o2 ON o2.id = p.upload_attachment
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} WHERE p.id = #{id}
</select> </select>
</mapper> </mapper>