邀请注册相关问题处理

src/main/java/com/uas/platform/b2b/model/EnterpriseBaseInfo.java

@@ -273,5 +273,6 @@ public class EnterpriseBaseInfo implements Serializable {
         this.enTel = e.getEnTel();
         this.date = e.getEnDate();
         this.enCorporation = e.getEnCorporation();
+        this.enEstablishDate = e.getEnDate();
     }
 }

src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -203,9 +203,8 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 			invitatrecords = searchService.getInvitationByKeyword(keyword, params);
 		} catch (Exception e) {
 		}
-		List<InvitationRecord> records = invitatrecords.getContent();
-		if (!CollectionUtils.isEmpty(records)) {
-            for (InvitationRecord record : records) {
+		if (!CollectionUtils.isEmpty(invitatrecords.getContent())) {
+            for (InvitationRecord record : invitatrecords.getContent()) {
                 List<Enterprise> enters = enterpriseDao.findByEnName(record.getVendname());
                 if (!CollectionUtils.isEmpty(enters)) {
                     if (enters.size() == 1) {
@@ -214,6 +213,7 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
                         record.setVenduu(enters.get(0).getUu());
                         record.setProductNum(productDao.countByEnUU(enters.get(0).getUu()));
                         record.setRegisterDate(enters.get(0).getEnDate());
+						record.setProductNum(productDao.countByEnUU(enters.get(0).getUu()));
                     } else {
                         record.setActive(Constant.NO);
                         record.setSamecount(enters.size());

src/main/java/com/uas/platform/b2b/v2/service/impl/InviteRecordServiceImpl.java

@@ -161,11 +161,11 @@ public class InviteRecordServiceImpl implements InviteRecordService {
      */
     @Override
     public List<Invitation> getCountGroupByDate(Long userUU, Long enUU, String year) {
-        String sql = "select substr(time, -2) month,in_enuu enUU,count(1) count from(" +
+        String sql = "select substr(time, -2) month, time, in_enuu enUU,count(1) count from(" +
                 "select to_char(in_date, 'yyyy-mm') time,COALESCE(in_active,0),in_enuu from invitationrecords where in_enuu = " + enUU + ")" +
                 "where time like '%" + year + "%' group by time,in_enuu order by time";
         List<Invitation> all = commonDao.query(sql, Invitation.class);
-        String sql1 = "select substr(time, -2) month,in_enuu enUU,count(1) count from(" +
+        String sql1 = "select substr(time, -2) month, time ,in_enuu enUU,count(1) count from(" +
                 "select to_char(in_date, 'yyyy-mm') time,COALESCE(in_active,0),in_enuu from invitationrecords where in_enuu = " + enUU + " and COALESCE(in_active,0) = 1)" +
                 "where time like '%" + year + "%' group by time,in_enuu order by time";
         List<Invitation> done = commonDao.query(sql1, Invitation.class);