QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准主计划): 新增编辑调整

Browse Source
This commit is contained in:
yjz
2024-07-02 14:03:01 +08:00
parent 6bdd590428
commit c4d6872394
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/entity/LawsStandardMasterPlanSublist.java
+7 -7
View File
@@ -44,19 +44,19 @@ public class LawsStandardMasterPlanSublist extends BaseEntity {
/**责任人*/ /**责任人*/
@ApiModelProperty(value = "责任人") @ApiModelProperty(value = "责任人")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
private String responsiblePerson; private String responsiblePerson;
/**计划完成日期*/ /**计划完成日期*/
@ApiModelProperty(value = "计划完成日期") @ApiModelProperty(value = "计划完成日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date plannedCompletionDate; private Date plannedCompletionDate;
/**实际完成日期*/ /**实际完成日期*/
@ApiModelProperty(value = "实际完成日期") @ApiModelProperty(value = "实际完成日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date actualCompletionDate; private Date actualCompletionDate;
/**交付物*/ /**交付物*/
@@ -69,8 +69,8 @@ public class LawsStandardMasterPlanSublist extends BaseEntity {
/**整改完成日期*/ /**整改完成日期*/
@ApiModelProperty(value = "整改完成日期") @ApiModelProperty(value = "整改完成日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date completionAccomplishDate; private Date completionAccomplishDate;
/**关联id*/ /**关联id*/
laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/mapper/xml/LawsStandardMasterPlanSublistMapper.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</select> </select>
<sql id="select"> <sql id="select">
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 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_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 left join laws_market_standard lms on lsmp.market_standard_id = lms.id and lms.del_flag = 0
laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java
+3 -3
View File
@@ -104,14 +104,14 @@ public class LawsStandardMasterPlanServiceImpl
LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan();
lawsStandardMasterPlan.setId(String.valueOf(SnowflakeUtils.snowflake())); lawsStandardMasterPlan.setId(String.valueOf(SnowflakeUtils.snowflake()));
lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId());
lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket()); lawsStandardMasterPlan.setMarketStandardId(lawsStandardMasterPlanVO.getMarketStandardId());
save(lawsStandardMasterPlan); save(lawsStandardMasterPlan);
// 保存 标准主计划_子表信息 // 保存 标准主计划_子表信息
List<LawsStandardMasterPlanSublist> lawsStandardMasterPlanSublistList = List<LawsStandardMasterPlanSublist> lawsStandardMasterPlanSublistList =
lawsStandardMasterPlanDTO.getLawsStandardMasterPlanSublistList(); lawsStandardMasterPlanDTO.getLawsStandardMasterPlanSublistList();
lawsStandardMasterPlanSublistList = lawsStandardMasterPlanSublistList.stream() lawsStandardMasterPlanSublistList = lawsStandardMasterPlanSublistList.stream()
.map(v -> v.setMasterPlanId(lawsStandardMasterPlanVO.getId())) .map(v -> v.setMasterPlanId(lawsStandardMasterPlan.getId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
lawsStandardMasterPlanSublistService.saveBatch(lawsStandardMasterPlanSublistList); lawsStandardMasterPlanSublistService.saveBatch(lawsStandardMasterPlanSublistList);
} }
@@ -122,7 +122,7 @@ public class LawsStandardMasterPlanServiceImpl
LawsStandardMasterPlanVO lawsStandardMasterPlanVO = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanVO(); LawsStandardMasterPlanVO lawsStandardMasterPlanVO = lawsStandardMasterPlanDTO.getLawsStandardMasterPlanVO();
LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan(); LawsStandardMasterPlan lawsStandardMasterPlan = new LawsStandardMasterPlan();
lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId()); lawsStandardMasterPlan.setStandardId(lawsStandardMasterPlanVO.getStandardId());
lawsStandardMasterPlan.setApplicableMarket(lawsStandardMasterPlanVO.getApplicableMarket()); lawsStandardMasterPlan.setMarketStandardId(lawsStandardMasterPlanVO.getMarketStandardId());
updateById(lawsStandardMasterPlan); updateById(lawsStandardMasterPlan);
// 编辑 标准主计划_子表信息 // 编辑 标准主计划_子表信息