应用列表

haoban-manage3-service/src/main/resources/mapper/ApplicationMapper.xml

@@ -143,7 +143,7 @@
     select 
     <include refid="Base_Column_List" />
     from tab_haoban_application
-    where status_flag = 1
+    where status_flag = 1 order by update_time
   </select>
     <select id="listByApplicationIds" resultMap="BaseResultMap" >
     select 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
@@ -41,6 +42,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.ApplicationVO;
 import com.gic.haoban.manage.web.vo.ClerkEditInfoVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
@@ -94,6 +96,17 @@ public class ApplicationController extends WebBaseController {
         }
         Map<String, Object> map = new HashMap<>();
         List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
+        Object o = RedisUtil.getCache("haobanWxEnterpriseIdAppOpen");
+        String wxEnterpriseIds = o == null ? "" : o.toString();
+        if (!wxEnterpriseIds.contains(wxEnterpriseId)) {
+            Iterator<ApplicationDTO> it = list.iterator();
+            while (it.hasNext()) {
+                ApplicationDTO s = it.next();
+                if (s.getApplicationName().contains("内购券")) {
+                    it.remove();
+                }
+            }
+        }
         List<String> applicationIds = list.stream().map(s -> s.getApplicationId()).collect(Collectors.toList());
         List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);
         //开启
@@ -109,27 +122,20 @@ public class ApplicationController extends WebBaseController {
         if (CollectionUtil.isNotEmpty(applicationIds)) {
             closeList = applicationApiService.listByApplications(applicationIds);
         }
-        Object o = RedisUtil.getCache("haobanWxEnterpriseIdAppOpen");
-        String wxEnterpriseIds = o == null ? "" : o.toString();
-        if (!wxEnterpriseIds.contains(wxEnterpriseId)) {
-            //不开启
-            Iterator<ApplicationDTO> it = openList.iterator();
-            while (it.hasNext()) {
-                ApplicationDTO s = it.next();
-                if (s.getApplicationName().contains("内购券")) {
-                    it.remove();
-                }
-            }
-            Iterator<ApplicationDTO> it2 = closeList.iterator();
-            while (it2.hasNext()) {
-                ApplicationDTO s = it2.next();
-                if (s.getApplicationName().contains("内购券")) {
-                    it2.remove();
-                }
-            }
-        }
+        
+        List<ApplicationVO> allList = new ArrayList<>();
+        list.forEach(item->{
+            ApplicationVO vo = EntityUtil.changeEntity(ApplicationVO.class, item) ;
+            if(applicationIds.contains(vo.getApplicationId())) {
+                vo.setOpenFlag(0);
+            }else {
+                vo.setOpenFlag(1);
+            }
+            allList.add(vo) ;
+        });
         map.put("open", openList);
         map.put("close", closeList);
+        map.put("allList", allList) ;
         if(null != loginUser) {
             String enterpriseId = loginUser.getEnterpriseId() ;
             EnterpriseDetailDTO dto = this.wxEnterpriseRelatedApiService.getByEnterpriseId(wxEnterpriseId, enterpriseId) ;