b95b4933 by 肖初晴

【DAOP-1.0】企业认证

【功能点】联调问题处理
1 parent 5607ebae
...@@ -18,6 +18,9 @@ import java.time.LocalDateTime; ...@@ -18,6 +18,9 @@ import java.time.LocalDateTime;
18 @Data 18 @Data
19 public class ChangeInfoVO extends CsbrBaseVO { 19 public class ChangeInfoVO extends CsbrBaseVO {
20 20
21 @Schema(description = "英文名称")
22 private String nameEn;
23
21 @Schema(description = "名称") 24 @Schema(description = "名称")
22 private String name; 25 private String name;
23 26
......
...@@ -203,9 +203,15 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -203,9 +203,15 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
203 for(ChangeApproveBean item : beanList){ 203 for(ChangeApproveBean item : beanList){
204 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean); 204 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
205 for(CompareResult diffItem : diffList){ 205 for(CompareResult diffItem : diffList){
206 if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照")
207 || diffItem.getFieldComment().contains("法人证件照") || diffItem.getFieldComment().contains("管理员证件照")
208 || diffItem.getFieldComment().contains("授权委托书")){
209 continue;
210 }
206 ChangeInfoVO vo = new ChangeInfoVO(); 211 ChangeInfoVO vo = new ChangeInfoVO();
212 vo.setNameEn(diffItem.getFieldName());
207 vo.setName(diffItem.getFieldComment()); 213 vo.setName(diffItem.getFieldComment());
208 vo.setDate(DateUtil.formatDate(item.oldBean.getCreateTime(),"yyyy-MM-dd")); 214 vo.setDate(DateUtil.formatDate(item.oldBean.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
209 vo.setBefore(diffItem.getOldValue().toString()); 215 vo.setBefore(diffItem.getOldValue().toString());
210 vo.setAfter(diffItem.getNewValue().toString()); 216 vo.setAfter(diffItem.getNewValue().toString());
211 vo.setGuid(CommonUtil.newGuid()); 217 vo.setGuid(CommonUtil.newGuid());
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!