Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
This commit is contained in:
wangzhijiang
@@ -10,3 +10,11 @@ ADD COLUMN `prehomo_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_
|
||||
ADD COLUMN `design_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计备注' AFTER `prehomo_remark`;
|
||||
|
||||
-- 2022年7月2日部署到正式环境
|
||||
|
||||
-- 加大备注的长度
|
||||
ALTER TABLE `buss_document_library`
|
||||
MODIFY COLUMN `description` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述' AFTER `replaced_standard`;
|
||||
|
||||
UPDATE `laws_weilai`.`onl_cgform_field` SET `id`='e4fe526794af4477321227f69b764b0d', `cgform_head_id`='48308196e7b04761b533dc31bc899707', `db_field_name`='description', `db_field_en_name`='Description', `db_field_txt`='描述', `order_num`='9', `db_field_name_old`=NULL, `db_is_key`='0', `db_is_null`='1', `db_type`='string', `db_length`='1000', `db_point_length`='0', `db_default_val`='', `dict_field`='', `dict_table`='', `dict_text`='', `field_show_type`='8', `field_href`='', `field_length`='120', `field_valid_type`=NULL, `field_must_input`='0', `field_extend_json`='', `field_default_value`='', `is_query`='0', `is_show_form`='1', `is_show_list`='0', `is_read_only`='0', `query_mode`='single', `main_table`='', `main_field`='', `update_by`='admin', `update_time`='2022-06-06 16:05:28', `create_time`='2022-01-21 14:41:40', `create_by`='admin', `converter`='', `query_def_val`='', `query_dict_text`='', `query_dict_field`='', `query_dict_table`='', `query_show_type`='text', `query_config_flag`='0', `query_valid_type`=NULL, `query_must_input`=NULL, `sort_flag`='0', `show_area`='1499657602378825729', `is_show_laws_list`='0', `is_show_search`='0', `is_delete`='0', `is_model`='1', `dict_id`=NULL WHERE (`id`='e4fe526794af4477321227f69b764b0d');
|
||||
|
||||
-- 2022年7月4日部署到正式环境
|
||||
+1
-1
@@ -85,7 +85,7 @@ public class FeishuServiceImpl implements IFeishuService {
|
||||
// 第二行
|
||||
JSONObject contentTwo = new JSONObject();
|
||||
contentTwo.put("tag", "a");
|
||||
contentTwo.put("text", "跳转链接");
|
||||
contentTwo.put("text", "View");
|
||||
contentTwo.put("href", backUrl);
|
||||
List<JSONObject> contentList = new ArrayList<>();
|
||||
contentList.add(contentOne);
|
||||
|
||||
+188
-112
@@ -1694,31 +1694,103 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
}
|
||||
|
||||
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
|
||||
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
|
||||
if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){
|
||||
//法规工程师
|
||||
if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
|
||||
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
|
||||
//法规清单的责任领域
|
||||
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
|
||||
if(StringUtils.isNotBlank(dutyTerritory)){
|
||||
List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
|
||||
.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
|
||||
|
||||
List<String> lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
|
||||
List<String> engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
|
||||
List<String> certificationEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getCertificationEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
|
||||
List<String> lawEngineerListTemp = new ArrayList<>();
|
||||
List<String> engineeringInterfacePersonListTemp = new ArrayList<>();
|
||||
List<String> certificationEngineerListTemp = new ArrayList<>();
|
||||
|
||||
if(lawEngineerList.size() != 0){
|
||||
for (String s : lawEngineerList) {
|
||||
lawEngineerListTemp.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
lawEngineerListTemp = lawEngineerListTemp.stream().distinct().collect(Collectors.toList());
|
||||
}
|
||||
if(engineeringInterfacePersonList.size() != 0){
|
||||
for (String s : engineeringInterfacePersonList) {
|
||||
engineeringInterfacePersonListTemp.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
engineeringInterfacePersonListTemp = engineeringInterfacePersonListTemp.stream().distinct().collect(Collectors.toList());
|
||||
}
|
||||
if(certificationEngineerList.size() != 0){
|
||||
for (String s : certificationEngineerList) {
|
||||
certificationEngineerListTemp.addAll(Arrays.asList(s.split(",")));
|
||||
}
|
||||
certificationEngineerListTemp = certificationEngineerListTemp.stream().distinct().collect(Collectors.toList());
|
||||
}
|
||||
|
||||
//法规工程师
|
||||
if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && lawEngineerListTemp.size() == 1) {
|
||||
List<String> finalLawEngineerList = lawEngineerListTemp;
|
||||
List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
|
||||
.filter(e -> finalLawEngineerList.contains(e.getLawEngineer())).collect(Collectors.toList());
|
||||
if(collect.size() != 0){
|
||||
String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), collect.get(0),studioEngineer);
|
||||
if(StringUtils.isNotEmpty(userId)){
|
||||
projectLawsInventoryEO.setRegulationOwnerId(userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//认证工程师
|
||||
if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
|
||||
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
|
||||
//认证工程师
|
||||
if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && certificationEngineerListTemp.size() == 1) {
|
||||
List<String> finalCertificationEngineerList = certificationEngineerListTemp;
|
||||
List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
|
||||
.filter(e -> finalCertificationEngineerList.contains(e.getCertificationEngineer())).collect(Collectors.toList());
|
||||
if(collect.size() != 0){
|
||||
String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), collect.get(0),studioEngineer);
|
||||
if(StringUtils.isNotEmpty(userId)){
|
||||
projectLawsInventoryEO.setHomologationEngineerId(userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//项目接口人
|
||||
if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
|
||||
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer);
|
||||
//项目接口人
|
||||
if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson()) && engineeringInterfacePersonListTemp.size() == 1) {
|
||||
List<String> finalEngineeringInterfacePersonList = engineeringInterfacePersonListTemp;
|
||||
List<ProjectRelatedPersonnel> collect = projectRelatedPersonnels.stream()
|
||||
.filter(e -> finalEngineeringInterfacePersonList.contains(e.getEngineeringInterfacePerson())).collect(Collectors.toList());
|
||||
if(collect.size() != 0){
|
||||
String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), collect.get(0),studioEngineer);
|
||||
if(StringUtils.isNotEmpty(userId)){
|
||||
projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (ProjectRelatedPersonnel projectRelatedPersonnel : projectRelatedPersonnels) {
|
||||
if(StringUtils.equals(projectRelatedPersonnel.getDutyTerritory(),projectLawsInventoryEO.getDutyTerritory())){
|
||||
// //法规工程师
|
||||
// if (StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
|
||||
// String userId = ToGetAUserId(ProjectRoleEnum.REGULATI_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
|
||||
// if(StringUtils.isNotEmpty(userId)){
|
||||
// projectLawsInventoryEO.setRegulationOwnerId(userId);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// //认证工程师
|
||||
// if (StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerId())) {
|
||||
// String userId = ToGetAUserId(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue(), projectRelatedPersonnel,studioEngineer);
|
||||
// if(StringUtils.isNotEmpty(userId)){
|
||||
// projectLawsInventoryEO.setHomologationEngineerId(userId);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// //项目接口人
|
||||
// if (StringUtils.isEmpty(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
|
||||
// String userId = ToGetAUserId(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue(), projectRelatedPersonnel,studioEngineer);
|
||||
// if(StringUtils.isNotEmpty(userId)){
|
||||
// projectLawsInventoryEO.setEngineeringInterfacePerson(userId);
|
||||
// }
|
||||
// }
|
||||
|
||||
//设计符合性确认
|
||||
//发起人角色
|
||||
@@ -2171,121 +2243,125 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
|
||||
|
||||
for (String id : projectLawsInventoryEO.getIds().split(",")) {
|
||||
ProjectLawsInventoryEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0);
|
||||
ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0);
|
||||
StringBuilder contentLogBuilder = new StringBuilder();
|
||||
StringBuilder enContentLogBuilder = new StringBuilder();
|
||||
contentLogBuilder.append(info.getSerialNumber() + ":");
|
||||
enContentLogBuilder.append(infoCopy.getSerialNumber() + ":");
|
||||
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
|
||||
projectLawsInventoryEOTemp.setId(id);
|
||||
//实施类别 implementType
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){
|
||||
if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType());
|
||||
}
|
||||
}
|
||||
//认证类型 attestationType
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){
|
||||
if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType());
|
||||
}
|
||||
}
|
||||
//认证级别 attestationRank
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){
|
||||
if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank());
|
||||
}
|
||||
}
|
||||
//责任领域 dutyTerritory
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
|
||||
if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory());
|
||||
}
|
||||
}
|
||||
//在产车实施日期implementTime
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
|
||||
if (info.getImplementTime() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString());
|
||||
}else {
|
||||
if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(), infoCopy.getImplementTimeString(), inputInfoEO.getImplementTimeString());
|
||||
List<ProjectLawsInventoryEO> collect = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
|
||||
if(collect.size() != 0){
|
||||
ProjectLawsInventoryEO info = collect.get(0);
|
||||
ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0);
|
||||
StringBuilder contentLogBuilder = new StringBuilder();
|
||||
StringBuilder enContentLogBuilder = new StringBuilder();
|
||||
contentLogBuilder.append(info.getSerialNumber() + ":");
|
||||
enContentLogBuilder.append(infoCopy.getSerialNumber() + ":");
|
||||
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
|
||||
projectLawsInventoryEOTemp.setId(id);
|
||||
//实施类别 implementType
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){
|
||||
if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType());
|
||||
}
|
||||
}
|
||||
}
|
||||
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
|
||||
if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
}else {
|
||||
if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), infoCopy.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
//认证类型 attestationType
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){
|
||||
if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType());
|
||||
}
|
||||
}
|
||||
}
|
||||
//适用地区region
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
|
||||
if (!info.getRegion().equals(inputInfoEO.getRegion())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.REGION.getEnName(), infoCopy.getRegion(),inputInfoEO.getRegion());
|
||||
//认证级别 attestationRank
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){
|
||||
if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank());
|
||||
}
|
||||
}
|
||||
//责任领域 dutyTerritory
|
||||
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
|
||||
if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory());
|
||||
}
|
||||
}
|
||||
//在产车实施日期implementTime
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
|
||||
if (info.getImplementTime() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString());
|
||||
}else {
|
||||
if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(), infoCopy.getImplementTimeString(), inputInfoEO.getImplementTimeString());
|
||||
}
|
||||
}
|
||||
}
|
||||
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
|
||||
if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
}else {
|
||||
if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), infoCopy.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
|
||||
}
|
||||
}
|
||||
}
|
||||
//适用地区region
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
|
||||
if (!info.getRegion().equals(inputInfoEO.getRegion())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.REGION.getEnName(), infoCopy.getRegion(),inputInfoEO.getRegion());
|
||||
|
||||
}
|
||||
}
|
||||
//设计符合性确认截止时间
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
|
||||
if (info.getDesignDueDate() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(),"空",inputInfoEO.getDesignDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(),"null",inputInfoEO.getDesignDueDateString());
|
||||
}else {
|
||||
if (!info.getDesignDueDateString().equals(inputInfoEO.getDesignDueDateString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(), info.getDesignDueDateString(), inputInfoEO.getDesignDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(), infoCopy.getDesignDueDateString(), inputInfoEO.getDesignDueDateString());
|
||||
}
|
||||
}
|
||||
}
|
||||
//preHomo确认截止时间
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){
|
||||
if (info.getVerifyDueDate() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(),"空",inputInfoEO.getPrehomoDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(),"null",inputInfoEO.getPrehomoDueDateString());
|
||||
}else {
|
||||
if (!info.getPrehomoDueDateString().equals(inputInfoEO.getPrehomoDueDateString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(), info.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(), infoCopy.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString());
|
||||
//设计符合性确认截止时间
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
|
||||
if (info.getDesignDueDate() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(),"空",inputInfoEO.getDesignDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(),"null",inputInfoEO.getDesignDueDateString());
|
||||
}else {
|
||||
if (!info.getDesignDueDateString().equals(inputInfoEO.getDesignDueDateString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(), info.getDesignDueDateString(), inputInfoEO.getDesignDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(), infoCopy.getDesignDueDateString(), inputInfoEO.getDesignDueDateString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//验证符合性确认截止时间
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){
|
||||
if (info.getVerifyDueDate() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(),"空",inputInfoEO.getVerifyDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(),"null",inputInfoEO.getVerifyDueDateString());
|
||||
}else {
|
||||
if (!info.getVerifyDueDateString().equals(inputInfoEO.getVerifyDueDateString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(), info.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(), infoCopy.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString());
|
||||
//preHomo确认截止时间
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){
|
||||
if (info.getVerifyDueDate() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(),"空",inputInfoEO.getPrehomoDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(),"null",inputInfoEO.getPrehomoDueDateString());
|
||||
}else {
|
||||
if (!info.getPrehomoDueDateString().equals(inputInfoEO.getPrehomoDueDateString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(), info.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(), infoCopy.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//处理具体变动消息为空的contentLog
|
||||
String contentInfoIndexStart = contentLogBuilder.substring(0,contentLogBuilder.lastIndexOf(":"));
|
||||
String contentInfo= contentLogBuilder.substring(contentInfoIndexStart.length()+1,contentLogBuilder.length());
|
||||
//验证符合性确认截止时间
|
||||
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){
|
||||
if (info.getVerifyDueDate() == null){
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(),"空",inputInfoEO.getVerifyDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(),"null",inputInfoEO.getVerifyDueDateString());
|
||||
}else {
|
||||
if (!info.getVerifyDueDateString().equals(inputInfoEO.getVerifyDueDateString())) {
|
||||
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(), info.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString());
|
||||
setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(), infoCopy.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString());
|
||||
}
|
||||
}
|
||||
}
|
||||
//处理具体变动消息为空的contentLog
|
||||
String contentInfoIndexStart = contentLogBuilder.substring(0,contentLogBuilder.lastIndexOf(":"));
|
||||
String contentInfo= contentLogBuilder.substring(contentInfoIndexStart.length()+1,contentLogBuilder.length());
|
||||
|
||||
String enContentInfoIndexStart = enContentLogBuilder.substring(0,enContentLogBuilder.lastIndexOf(":"));
|
||||
String enContentInfo= enContentLogBuilder.substring(enContentInfoIndexStart.length()+1,enContentLogBuilder.length());
|
||||
String enContentInfoIndexStart = enContentLogBuilder.substring(0,enContentLogBuilder.lastIndexOf(":"));
|
||||
String enContentInfo= enContentLogBuilder.substring(enContentInfoIndexStart.length()+1,enContentLogBuilder.length());
|
||||
|
||||
if(StringUtils.isNotBlank(contentInfo) && StringUtils.isNotBlank(enContentInfo)){
|
||||
contentLog += contentLogBuilder;
|
||||
enContentLog += enContentLogBuilder ;
|
||||
if(StringUtils.isNotBlank(contentInfo) && StringUtils.isNotBlank(enContentInfo)){
|
||||
contentLog += contentLogBuilder;
|
||||
enContentLog += enContentLogBuilder ;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
String contentIndexStart = contentLog.substring(0,contentLog.indexOf("“"));
|
||||
String content= contentLog.substring(contentIndexStart.length()+1,contentLog.length());
|
||||
|
||||
Reference in New Issue
Block a user