Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java

@@ -123,6 +123,7 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
         BeanUtils.copyProperties(entity, perform, BeanUtil.getNullPropertyNames(entity));
         perform.setId(null);
         perform.setRecordId(entity.getId());
+        perform.setWindowName(entity.getWindowName()+"("+entity.getWindowCode()+")");
         perform.setFromName("市政务服务大厅窗口考核登记表");
         perform.setSubmitDate(entity.getFillDate());
         perform.setUpdateTime(null);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java

@@ -144,6 +144,7 @@ public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<Win
         BeanUtils.copyProperties(entity, perform, BeanUtil.getNullPropertyNames(entity));
         perform.setId(null);
         perform.setRecordId(entity.getId());
+        perform.setWindowName(entity.getWindowName()+"("+entity.getWindowCode()+")");
         perform.setFromName("市政务服务大厅窗口工作人员考核汇总表");
         perform.setSubmitDate(entity.getFillDate());
         perform.setUpdateTime(null);