增加手机UU推广页面

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7608 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/EnterTogsController.java

@@ -0,0 +1,76 @@
+package com.uas.platform.b2b.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.model.EnterpriseTogs;
+import com.uas.platform.b2b.service.EnterTogsService;
+
+@Controller
+@RequestMapping(value = "/entogs")
+public class EnterTogsController {
+	
+	@Autowired
+	private EnterTogsService enterTogsService;
+	
+	/**
+	 * 编辑企业标签
+	 */
+	@RequestMapping(value = "/edit", method = RequestMethod.POST)
+	@ResponseBody
+	private EnterpriseTogs EditTogs(@RequestBody Long id) {
+		return enterTogsService.findById(id);
+	}
+
+	/**
+	 * 删除企业标签
+	 * 
+	 * @param id
+	 */
+	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+	@ResponseBody
+	private void DeleteTogs(@RequestBody Long id) {
+		enterTogsService.deleteById(id);
+	}
+
+	/**
+	 * 查看默系统认标签列表
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/getTogsList", method = RequestMethod.GET)
+	private List<EnterpriseTogs> getAllDefalutTogs() {
+		return enterTogsService.getAllDefalutTogs();
+	}
+
+	/**
+	 * 通过营业执照查询该企业的标签
+	 * 
+	 * @param businessCode
+	 * @return
+	 */
+	@RequestMapping(value = "/getTogsByBusCode", method = RequestMethod.GET)
+	@ResponseBody
+	private List<EnterpriseTogs> getTogsByBusCode(@RequestBody String businessCode) {
+		return enterTogsService.findByBusCode(businessCode);
+	}
+
+	/**
+	 * 当前企业增加标签
+	 * 
+	 * @param name
+	 * @param paraphrase
+	 * @return
+	 */
+	@RequestMapping(value = "/createNewTog", method = RequestMethod.POST)
+	@ResponseBody
+	private EnterpriseTogs createNewTog(@RequestBody String name, String paraphrase) {
+		return enterTogsService.createNewTogByNameAndParaphrase(name, paraphrase);
+	}
+}

src/main/java/com/uas/platform/b2b/controller/EnterpriseNewsController.java

@@ -0,0 +1,88 @@
+package com.uas.platform.b2b.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.model.EnterpriseNews;
+import com.uas.platform.b2b.service.BaseInfoService;
+import com.uas.platform.b2b.service.EnterpriseNewsService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.search.b2b.model.SPage;
+
+/**
+ * 企业发布动态Controller
+ * 
+ * @author hejq
+ * @time 创建时间：2017年2月13日
+ */
+@Controller
+@RequestMapping(value = "/enterpriseNews")
+public class EnterpriseNewsController {
+
+	@Autowired
+	private EnterpriseNewsService enterpriseNewsService;
+
+	@Autowired
+	private BaseInfoService baseInfoService;
+
+	/**
+	 * 写一条新的动态
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value="/createNews",method = RequestMethod.POST)
+	@ResponseBody
+	private EnterpriseNews CreateNews(@RequestBody String json) {
+		EnterpriseNews news = FlexJsonUtils.fromJson(json, EnterpriseNews.class);
+		return enterpriseNewsService.save(news);
+	}
+	
+	/**
+	 * 查询单个企业的所有动态
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/singleEnterNews", method = RequestMethod.GET)
+	@ResponseBody
+	private SPage<EnterpriseNews> getSingleEnterNews(@RequestBody String businessCode) {
+		if (businessCode == null) {
+			businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
+		}
+		return enterpriseNewsService.findByBusinessCode(businessCode);
+	}
+
+	/**
+	 * 查询所有
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/multipleEnterNews", method = RequestMethod.GET)
+	@ResponseBody
+	private SPage<EnterpriseNews> getmultipleEnterNews() {
+		try {
+			List<BasePartnersInfo> parters = baseInfoService
+					.getPartnersInfosByBusinessCode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
+			for (BasePartnersInfo parter : parters) {
+				return enterpriseNewsService.findByBusinessCode(parter.getVendUID());
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	@RequestMapping(value = "/reprinted",method = RequestMethod.POST)
+	@ResponseBody
+	private EnterpriseNews reprintedTip(@RequestBody Long id) {
+		return enterpriseNewsService.reprintedTip(id);
+	}
+}

src/main/java/com/uas/platform/b2b/controller/SaleApBillController.java

@@ -63,6 +63,7 @@ public class SaleApBillController {
 	public SPage<PurchaseApBill> getReceivedPurchaseApBills(PageParams params, String searchFilter) {
 		logger.log("客户应付发票", "获取全部客户应付发票");
 		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		System.out.println(JSON.toJSON(searchFilter));
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
@@ -83,7 +84,9 @@ public class SaleApBillController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pab_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchPurchaseApBillIds(keyword, pageParams);
+		SPage<PurchaseApBill> apbills = searchService.searchPurchaseApBillIds(keyword, pageParams);
+		System.out.println(JSON.toJSON(apbills.getContent()));
+		return apbills;
 	}
 
 	/**
@@ -114,6 +117,7 @@ public class SaleApBillController {
 		searchFilter.setEndDate(endDate);
 		searchFilter.setFromDate(fromDate);
 		PageParams params = new PageParams();
+		params.setCount(1000);
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params,
 				JSON.toJSONString(searchFilter));
 		// 当前登录企业作为供应商
@@ -134,7 +138,9 @@ public class SaleApBillController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pab_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		modelAndView.addObject("data", searchService.searchPurchaseApBillIds(keyword, pageParams).getContent());
+		SPage<PurchaseApBill> apbills = searchService.searchPurchaseApBillIds(keyword, pageParams);
+		System.out.println(JSON.toJSON(apbills.getContent()));
+		modelAndView.addObject("data", apbills.getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBill", "客户应付发票列表"));
 		logger.log("客户应付发票", "导出Excel列表", "导出全部Excel列表");
 		return modelAndView;

src/main/java/com/uas/platform/b2b/controller/TipReprintedLogController.java

@@ -0,0 +1,48 @@
+package com.uas.platform.b2b.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.model.TipReprintedLog;
+import com.uas.platform.b2b.service.TipReprintedLogService;
+import com.uas.search.b2b.model.SPage;
+
+@Controller
+@RequestMapping(value = "/tipReprintedLog")
+public class TipReprintedLogController {
+
+	@Autowired
+	private TipReprintedLogService tipReprintedLogService;
+
+	/**
+	 * 新增一条转载记录
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/newrecord", method = RequestMethod.POST)
+	@ResponseBody
+	private TipReprintedLog AddNewRecord(@RequestBody Long originaluu, Long originalenuu) {
+		return null;
+	}
+
+	/**
+	 * 转载记录
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/reprintedRecords", method = RequestMethod.GET)
+	@ResponseBody
+	private SPage<TipReprintedLog> getReprintedRecords(@RequestBody Long useruu) {
+		return null;
+	}
+	
+	@RequestMapping(value = "/beReprintedRecords", method = RequestMethod.GET)
+	@ResponseBody
+	private SPage<TipReprintedLog> getBeReprintedRecords(@RequestBody Long originaluu) {
+		return null;
+	}
+}

src/main/webapp/WEB-INF/views/normal/index.html

@@ -60,7 +60,7 @@
 				<div class="erweima-tk">
 					<div>
 						<p>扫描二维码<br/>下载手机客户端</p>
-						<img src="resources/img/qrcode/UU-Qr-Code.png" width="100px" height="100px" alt="UU互联" />
+						<a href="/platform-b2b/static/tpl/start/index.html"><img src="resources/img/qrcode/UU-Qr-Code.png" width="100px" height="100px" alt="UU互联" /></a>
 					</div>
 				</div>
 			</nav>

src/main/webapp/resources/js/index/app.js

@@ -9344,6 +9344,18 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 			
 		}
 		
+		var flag = false;
+		$scope.isSelect = function(uu) {
+			angular.forEach($scope.AppFlow.AppNodes, function(node) {
+				if(node) {
+					if(node.useruu == uu) {
+						flag = true;
+					}
+				} 
+			});
+			return flag;
+		};
+		
 		$scope.SelectRole = function(data) {// 添加职位
 			var item = {
 					position: null,

src/main/webapp/resources/tpl/index/home/right.html

@@ -136,18 +136,18 @@
 				<div class="item active">
 					<img src="resources/img/home/UU.png" alt="First slide">
 				</div>
-				<div class="item">
+				<!-- <div class="item">
 					<img src="resources/img/home/UU.png" alt="Second slide">
 				</div>
 				<div class="item">
 					<img src="resources/img/home/UU.png" alt="Third slide">
-				</div>
+				</div> -->
 			</div>
 			<!-- 轮播（Carousel）指标 -->
 			<ol class="carousel-indicators">
 				<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-				<li data-target="#myCarousel" data-slide-to="1"></li>
-				<li data-target="#myCarousel" data-slide-to="2"></li>
+				<!-- <li data-target="#myCarousel" data-slide-to="1"></li>
+				<li data-target="#myCarousel" data-slide-to="2"></li> -->
 			</ol>
 		</div>
 	</div>

src/main/webapp/resources/tpl/start/index.html

@@ -20,7 +20,7 @@
                 <img src="../../img/start/mobile-inco.png" alt="" />欢迎来到UU互联-手机版
                 <em></em>支持iPhone/Android/iPad下载
             </span>
-            <span class="fr"><a href="#">返回B2B首页</a></span>
+            <span class="fr"><a href="/platform-b2b/#/index">返回B2B首页</a></span>
         </div>
     </div>
     <!--第一屏-->
@@ -36,7 +36,7 @@
         <div class="flexible-box">
             <img  class="section-img" src="../../img/start/section2-img.png" alt=""/>
             <div class="section-title">
-                <p>即时沟通<br/>随时接收客户消息</p>
+                <p>即时通讯<br/>随时接收客户消息</p>
             </div>
         </div>
     </div>
@@ -58,7 +58,7 @@
                 <p>移动审批<br/>原来审批如此简单</p>
             </div>
             <div class="btn">
-                <a href="#"></a>
+                <a href="/platform-b2b/#/approvalFlow/flow"></a>
             </div>
         </div>
     </div>