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

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

@@ -7,9 +7,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.ApplicationDTO;
 import com.gic.haoban.manage.api.dto.ApplicationEnterpriseRelatedDTO;
 import com.gic.haoban.manage.api.dto.ApplicationTemplateDTO;
 import com.gic.haoban.manage.api.dto.TemplateEnterpriseRelatedDTO;
+import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.api.service.ApplicationTemplateApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 
@@ -19,6 +21,9 @@ public class ApplicationTemplateController extends WebBaseController{
 	@Autowired
 	private ApplicationTemplateApiService applicationTemplateApiService;
 	
+	@Autowired
+	private ApplicationApiService applicationApiService;
+	
 	
 	@RequestMapping("list-application-template")
 	public HaobanResponse listTemplate(String applicationTemplateName){
@@ -63,6 +68,12 @@ public class ApplicationTemplateController extends WebBaseController{
 		
 	}
 	
+	@RequestMapping("application-list")
+	public HaobanResponse applicationList() {
+		List<ApplicationDTO> list = applicationApiService.listApplication();
+		return resultResponse(HaoBanErrCode.ERR_1,list);
+	}
+	
 	@RequestMapping("add-template-enterprise")
 	public HaobanResponse addTemplateEnterprise(String applicationTemplateId,String wxEnterpriseIds){
 		applicationTemplateApiService.addTemplateEnterprise(applicationTemplateId,wxEnterpriseIds);