Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/EntFindPageResVo.java

@@ -1,5 +1,6 @@
 package com.sckw.system.model.vo.res;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.sckw.core.utils.LongToStringUtils;
@@ -134,4 +135,12 @@ public class EntFindPageResVo implements Serializable {
      * 母企业名
      */
     private String pEntName;
+
+    private String ent1;
+
+    private String ent2;
+
+    private String ent3;
+
+    private String ent4;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1148,10 +1148,25 @@ public class KwsEnterpriseService {
         for (FindEntListPojo item : list) {
             EntFindPageResVo entFindPageResVo = new EntFindPageResVo();
             BeanUtils.copyProperties(item, entFindPageResVo);
+            entFindPageResVo.setApprovalName(ApprovalEnum.getName(item.getApproval()));
             entFindPageResVo.setApprovalTime(item.getApprovalTime());
             entFindPageResVo.setEntTypes(item.getType());
             entFindPageResVo.setEntryType(item.getSystemType().equals(SystemTypeEnum.MANAGE.getCode()) ? EntryTypeEnum.PLATFORM.getCode() : EntryTypeEnum.SELF.getCode());
             entFindPageResVo.setEntryTypeStr(EntryTypeEnum.getName(entFindPageResVo.getEntryType()).getName());
+
+            if (item.getType().contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
+                entFindPageResVo.setEnt1("是");
+            }
+            if (item.getType().contains(String.valueOf(EntTypeEnum.PURCHASER.getCode()))) {
+                entFindPageResVo.setEnt2("是");
+            }
+            if (item.getType().contains(String.valueOf(EntTypeEnum.LOGISTICS3.getCode()))) {
+                entFindPageResVo.setEnt3("是");
+            }
+            if (item.getType().contains(String.valueOf(EntTypeEnum.LOGISTICS4.getCode()))) {
+                entFindPageResVo.setEnt4("是");
+            }
+
             result.add(entFindPageResVo);
         }