zhangyuewww 3 rokov pred
rodič
commit
c92f5e6063

+ 6 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SettledCompanyDynamics.java

@@ -100,6 +100,12 @@ public class SettledCompanyDynamics extends BaseModel<SettledCompanyDynamics> {
      */
     @TableField(exist = false)
     private Integer flag;
+    /**
+     * 昵称
+     */
+    @TableField(exist = false)
+    private String userName;
+
 
     /**
      * 模糊查询

+ 5 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SettledCompanyInfo.java

@@ -170,6 +170,11 @@ public class SettledCompanyInfo extends BaseModel<SettledCompanyInfo> {
      */
     @TableField(exist = false)
     private String pcFlag;
+    /**
+     * 昵称
+     */
+    @TableField(exist = false)
+    private String userName;
 
     @Override
     protected Serializable pkVal() {

+ 9 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SettledCompanyDynamicsServiceImpl.java

@@ -57,6 +57,15 @@ public class SettledCompanyDynamicsServiceImpl extends ServiceImpl<SettledCompan
         // 查询总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<SettledCompanyDynamics> dataList = baseMapper.getListByCondition(pageView);
+        if (!CollectionUtils.isEmpty(dataList)){
+            for (SettledCompanyDynamics settledCompanyDynamics1:dataList){
+                CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("phone", settledCompanyDynamics1.getPhone()));
+                if (commonUser!=null){
+                    //昵称
+                    settledCompanyDynamics1.setUserName(commonUser.getUserName());
+                }
+            }
+        }
         Page<SettledCompanyDynamics> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);

+ 9 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SettledCompanyInfoServiceImpl.java

@@ -152,6 +152,15 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         // 查询总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<SettledCompanyInfo> dataList = baseMapper.getListByCondition(pageView);
+        if (!CollectionUtils.isEmpty(dataList)){
+            for (SettledCompanyInfo settledCompanyInfo1:dataList){
+                CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("phone", settledCompanyInfo1.getCreatePhone()));
+                if (commonUser!=null){
+                    //昵称
+                    settledCompanyInfo1.setUserName(commonUser.getUserName());
+                }
+            }
+        }
         Page<SettledCompanyInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);