WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-05-30 18:28:04 +08:00
parent b0bf90b597 4222d6bbcc
commit 00d281f9e8
7 changed files with 58 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java
+10 -10
View File
@@ -70,7 +70,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String serialNumber;
/**标题*/
@Excel(name = "title", width = 15)
@Excel(name = "Title", width = 15)
@ApiModelProperty(value = "标题")
private String title;
@@ -92,7 +92,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String shi4Yong4Fan4Wei2;
/**状态*/
@Excel(name = "state", width = 15,dicCode ="state")
@Excel(name = "State", width = 15,dicCode ="state")
@ApiModelProperty(value = "状态")
@Dict(dicCode ="state")
private String state;
@@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String remark;
/**设计符合性确认-交付物类型*/
@Excel(name = "design-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Design-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String designDeliverableType;
@@ -182,17 +182,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String designDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "design-Deliverable Template", width = 15)
@Excel(name = "Design-Deliverable Template", width = 15)
private String designDeliverableTemplateName;
/**设计符合性确认-发起人*/
@Excel(name = "design-Initiator", width = 15)
@Excel(name = "Design-Initiator", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator;
/**设计符合性确认-责任人*/
@Excel(name = "design-Assignee", width = 15)
@Excel(name = "Design-Assignee", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty;
@@ -225,7 +225,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String prehomoDuty;
/**验证符合性确认-交付物类型*/
@Excel(name = "verify-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Verify-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String verifyDeliverableType;
@@ -236,17 +236,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String verifyDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "verify-Deliverable Template", width = 15)
@Excel(name = "Verify-Deliverable Template", width = 15)
private String verifyDeliverableTemplateName;
/**验证符合性确认-发起人*/
@Excel(name = "verify-Initiator", width = 15)
@Excel(name = "Verify-Initiator", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator;
/**验证符合性确认-责任人*/
@Excel(name = "verify-Assignee", width = 15)
@Excel(name = "Verify-Assignee", width = 15)
@ApiModelProperty(value = "验证符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+22 -2
View File
@@ -382,9 +382,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId()));
List<ProjectLawsInventoryEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
setDateNull(projectLawsInventoryEO, updateWrapper);
//保存
saveOrUpdate(projectLawsInventoryEO);
this.update(projectLawsInventoryEO,updateWrapper);
// saveOrUpdate(projectLawsInventoryEO);
//翻译-中文
translateData(infoEOList);
@@ -412,6 +414,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
private void setDateNull(ProjectLawsInventoryEO projectLawsInventoryEO, LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper) {
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){
updateWrapper.set(ProjectLawsInventoryEO::getImplementTime,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
}
}
/**
* 更新流程信息
* @param projectLawsInventoryEO