From c4d6872394d50a80ae8fa0e7e5894f071fe81371 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 2 Jul 2024 14:03:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1?= =?UTF-8?q?=E5=88=92):=20=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsStandardMasterPlanSublist.java | 14 +++++++------- .../xml/LawsStandardMasterPlanSublistMapper.xml | 2 +- .../impl/LawsStandardMasterPlanServiceImpl.java | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlanSublist.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlanSublist.java index 373255f2..7c7bd542 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlanSublist.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlanSublist.java @@ -44,19 +44,19 @@ public class LawsStandardMasterPlanSublist extends BaseEntity { /**责任人*/ @ApiModelProperty(value = "责任人") - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") private String responsiblePerson; /**计划完成日期*/ @ApiModelProperty(value = "计划完成日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date plannedCompletionDate; /**实际完成日期*/ @ApiModelProperty(value = "实际完成日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date actualCompletionDate; /**交付物*/ @@ -69,8 +69,8 @@ public class LawsStandardMasterPlanSublist extends BaseEntity { /**整改完成日期*/ @ApiModelProperty(value = "整改完成日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date completionAccomplishDate; /**关联id*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml index 4a6f59b8..7792d98d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml @@ -12,7 +12,7 @@ - select lsmp.id, lds.id standard_id, standard_number, standard_name, standard_state, lms.country applicableMarket + select lsmp.id, lds.id standard_id, standard_number, standard_name, standard_state, market_standard_id, lms.country applicableMarket from laws_standard_master_plan lsmp left join laws_domestic_standard lds on lsmp.standard_id = lds.id and lds.del_flag = 0 left join laws_market_standard lms on lsmp.market_standard_id = lms.id and lms.del_flag = 0 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java index 781cbd28..7c7ac8f7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java @@ -104,14 +104,14 @@ public class LawsStandardMasterPlanServiceImpl LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); lawsStandardMasterPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); - lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket()); + lawsStandardMasterPlan.setMarketStandardId(lawsStandardMasterPlanVO.getMarketStandardId()); save(lawsStandardMasterPlan); // 保存 标准主计划_子表信息 List lawsStandardMasterPlanSublistList = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanSublistList(); lawsStandardMasterPlanSublistList = lawsStandardMasterPlanSublistList.stream() - .map(v -> v.setMasterPlanId(lawsStandardMasterPlanVO.getId())) + .map(v -> v.setMasterPlanId(lawsStandardMasterPlan.getId())) .collect(Collectors.toList()); lawsStandardMasterPlanSublistService.saveBatch(lawsStandardMasterPlanSublistList); } @@ -122,7 +122,7 @@ public class LawsStandardMasterPlanServiceImpl LawsStandardMasterPlanVO lawsStandardMasterPlanVO = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanVO(); LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); - lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket()); + lawsStandardMasterPlan.setMarketStandardId(lawsStandardMasterPlanVO.getMarketStandardId()); updateById(lawsStandardMasterPlan); // 编辑 标准主计划_子表信息