增加代采订单页面操作

src/main/java/com/uas/platform/b2b/manage/controller/DeputyOrderController.java

@@ -0,0 +1,64 @@
+package com.uas.platform.b2b.manage.controller;
+
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
+import com.uas.platform.b2b.manage.controller.support.ResultBean;
+import com.uas.platform.b2b.manage.model.DeputyOrder;
+import com.uas.platform.b2b.manage.model.UseType;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.PageParams;
+import com.uas.platform.b2b.manage.service.DeputyOrderService;
+import com.uas.platform.b2b.manage.web.BaseController;
+import com.uas.platform.core.util.AgentUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 代采订单
+ *
+ * @author hejq
+ * @date 2018-11-29 9:32
+ */
+@RequestMapping("/deputyOrder")
+@RestController
+public class DeputyOrderController extends BaseController {
+
+    @Autowired
+    private DeputyOrderService deputyOrderService;
+
+    /**
+     * 分页查询代采订单新
+     *
+     * @param params 分页信息
+     * @param keyword 搜索词
+     * @return 查询结果
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public PageResultBean<DeputyOrder> findByPageInfo(PageParams params, String keyword) {
+        PageInfo info = new PageInfo(params);
+        Sort sort = new Sort(Sort.Direction.DESC, "date");
+        info.setSort(sort);
+        if (!StringUtils.isEmpty(keyword)) {
+            keyword = keyword.trim();
+        }
+        useLogService.appendLog(UseType.DEPUTY_ORDER_SEARCH.code(), keyword, AgentUtils.getIp(request));
+        return new PageResultBean<>(deputyOrderService.findByPageInfo(info, keyword));
+    }
+
+    /**
+     * 重新下载代采订单到ERP
+     *
+     * @param id 单据id
+     * @return 操作结果
+     */
+    @RequestMapping(value = "/reDownOrder/{id}", method = RequestMethod.POST)
+    public ResultBean editDeputyOrder(@PathVariable("id") Long id) {
+        useLogService.appendLog(UseType.DEPUTY_ORDER_REDOWNLOAD.code(), "id" + id, AgentUtils.getIp(request));
+        return deputyOrderService.reDownOrder(id);
+    }
+}

src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseCotroller.java → src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseController.java

@@ -9,10 +9,9 @@ import com.uas.platform.b2b.manage.page.PageInfo;
 import com.uas.platform.b2b.manage.page.PageParams;
 import com.uas.platform.b2b.manage.service.AccessTokenService;
 import com.uas.platform.b2b.manage.service.EnterpriseBaseInfoService;
-import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -33,7 +32,7 @@ import java.rmi.AccessException;
  */
 @RequestMapping("/enterprise")
 @RestController
-public class EnterpriseCotroller {
+public class EnterpriseController extends BaseController {
 
     @Autowired
     private EnterpriseBaseInfoService baseInfoService;
@@ -41,9 +40,6 @@ public class EnterpriseCotroller {
     @Autowired
     private AccessTokenService accessTokenService;
 
-    @Autowired
-    private UseLogService useLogService;
-
     /**
      * b2b域名
      */
@@ -65,8 +61,7 @@ public class EnterpriseCotroller {
             keyword = keyword.trim();
         }
         useLogService.appendLog(UseType.ENGERPRISE_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        PageResultBean resultBean = new PageResultBean(baseInfoService.findEnterPageByKeyword(info, keyword));
-        return resultBean;
+        return new PageResultBean<>(baseInfoService.findEnterPageByKeyword(info, keyword));
     }
 
     /**

src/main/java/com/uas/platform/b2b/manage/controller/InviteController.java

@@ -40,9 +40,6 @@ public class InviteController extends BaseController {
     @Autowired
     private InviteService inviteService;
 
-    @Autowired
-    private UseLogService useLogService;
-
     /**
      * 通过分页信息获取邀请注册记录
      *

src/main/java/com/uas/platform/b2b/manage/controller/LogsController.java

@@ -4,6 +4,7 @@ import com.uas.platform.b2b.manage.model.ErrorLog;
 import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.service.ErrorLogService;
 import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.b2b.manage.web.BaseController;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.AgentUtils;
@@ -25,10 +26,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RequestMapping("/log")
 @RestController
-public class LogsController {
-
-    @Autowired
-    private UseLogService useLogService;
+public class LogsController extends BaseController {
 
     @Autowired
     private ErrorLogService logService;

src/main/java/com/uas/platform/b2b/manage/controller/SaleNoticeController.java

@@ -28,9 +28,6 @@ import java.text.ParseException;
 @RequestMapping("/noticeRecord")
 public class SaleNoticeController extends BaseController {
 
-    @Autowired
-    private UseLogService useLogService;
-
     @Autowired
     private NoticeRecordService recordService;
 

src/main/java/com/uas/platform/b2b/manage/controller/StatisticsController.java

@@ -2,8 +2,10 @@ package com.uas.platform.b2b.manage.controller;
 
 import com.uas.platform.b2b.manage.controller.support.ResultBean;
 import com.uas.platform.b2b.manage.model.Statistics;
+import com.uas.platform.b2b.manage.model.UseType;
 import com.uas.platform.b2b.manage.service.StatisticsService;
 import com.uas.platform.b2b.manage.web.BaseController;
+import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -35,6 +37,7 @@ public class StatisticsController extends BaseController {
     @RequestMapping(value = "/regist/enterprise", method = RequestMethod.GET)
     public ResultBean enterpriseCount(@RequestParam(value = "groupType", defaultValue = "year") String groupType, Integer... key) {
         List<Statistics> statistics = statisticsService.getEnterpriseCount(groupType, key);
+        useLogService.appendLog(UseType.ENGERPRISE_REGISTER.code(), null, AgentUtils.getIp(request));
         return ResultBean.success(statistics, "B2B企业注册统计");
     }
 }

src/main/java/com/uas/platform/b2b/manage/controller/support/PageResultBean.java

@@ -168,5 +168,7 @@ public class PageResultBean<T> implements Serializable {
         this.last = data.isLast();
         this.page = data.getNumber();
         this.size = data.getSize();
+        this.code = SUCCESS_CODE;
+        this.msg = SUCCESS;
     }
 }

src/main/java/com/uas/platform/b2b/manage/dao/DeputyOrderDao.java

@@ -0,0 +1,34 @@
+package com.uas.platform.b2b.manage.dao;
+
+import com.uas.platform.b2b.manage.model.DeputyOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.SQLException;
+
+/**
+ * 代采订单
+ *
+ * @author hejq
+ * @date 2018-11-29 9:52
+ */
+@Repository
+public interface DeputyOrderDao extends JpaSpecificationExecutor<DeputyOrder>, JpaRepository<DeputyOrder, Long> {
+
+    /**
+     * 更新代采订单状态
+     *
+     * @param id 代采订单id
+     * @param status 状态码
+     * @param downloadStatus 下载状态
+     */
+    @Transactional(rollbackFor = SQLException.class)
+    @Modifying(clearAutomatically = true)
+    @Query("update DeputyOrder d set d.statuscode = :status, d.downloadstatus = :downloadStatus where d.id = :id")
+    void updateStatus(@Param("id") Long id, @Param("status") Integer status, @Param("downloadStatus") String downloadStatus);
+}

src/main/java/com/uas/platform/b2b/manage/dao/EnterpriseBaseInfoDao.java

@@ -10,7 +10,6 @@ import java.util.List;
 /**
  * 企业信息
  *
- *
  * @author hejq
  * @date 2018-04-23
  */
@@ -24,12 +23,4 @@ public interface EnterpriseBaseInfoDao extends JpaRepository<EnterpriseBaseInfo,
      * @return
      */
     List<EnterpriseBaseInfo> findByEnName(String name);
-
-    /**
-     * 通过营业执照查询企业是否存在
-     *
-     * @param businessCode 营业执照
-     * @return
-     */
-    List<EnterpriseBaseInfo> findByEnBussinessCode(String businessCode);
 }

src/main/java/com/uas/platform/b2b/manage/model/DeputyOrder.java

@@ -0,0 +1,212 @@
+package com.uas.platform.b2b.manage.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.*;
+import java.util.Date;
+
+/**
+ * 代采定单
+ * 
+ * @author hejq
+ * @time 创建时间：2017年3月19日
+ */
+@Entity
+@Table(name = "purc$deputyorders")
+public class DeputyOrder implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Column(name = "deo_id")
+	private Long id;
+
+	/**
+	 * 流水号
+	 */
+	@Column(name = "deo_code")
+	private String code;
+
+	/**
+	 * 状态
+	 */
+	@Column(name = "deo_status")
+	private String status;
+	
+	/**
+	 * 状态码
+	 */
+	@Column(name = "deo_statuscode")
+	private Integer statuscode;
+
+	/**
+	 * 录入状态
+	 */
+	@Column(name = "deo_entrystatus")
+	private String entrystatus;
+
+	/**
+	 * ERP下载状态
+	 */
+	@Column(name = "deo_downloadstatus")
+	private String downloadstatus;
+
+	/**
+	 * 录入日期
+	 */
+	@Column(name = "deo_entrydate")
+	private Date entrydate;
+
+	/**
+	 * 终端供应商名称
+	 */
+	@Column(name = "deo_tervendor")
+	private String tervendor;
+
+	/**
+	 * 录入时间
+	 */
+	@Column(name = "deo_date")
+	private Date date;
+
+	/**
+	 * 代采企业名称
+	 */
+	@Column(name = "deo_deputyname")
+	private String deputyname;
+
+	/**
+	 * 订单编号
+	 */
+	@Column(name = "deo_salecode")
+	private String salecode;
+
+    /**
+     * 录入企业uu
+     */
+    @Column(name = "deo_enuu")
+    private Long enuu;
+
+    /**
+     * 录入企业uu
+     */
+    @Transient
+    private String enName;
+
+
+    public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Integer getStatuscode() {
+		return statuscode;
+	}
+
+	public void setStatuscode(Integer statuscode) {
+		this.statuscode = statuscode;
+	}
+
+	public String getEntrystatus() {
+		return entrystatus;
+	}
+
+	public void setEntrystatus(String entrystatus) {
+		this.entrystatus = entrystatus;
+	}
+
+	public String getDownloadstatus() {
+		return downloadstatus;
+	}
+
+	public void setDownloadstatus(String downloadstatus) {
+		this.downloadstatus = downloadstatus;
+	}
+
+	public Date getEntrydate() {
+		return entrydate;
+	}
+
+	public void setEntrydate(Date entrydate) {
+		this.entrydate = entrydate;
+	}
+
+	public String getTervendor() {
+		return tervendor;
+	}
+
+	public void setTervendor(String tervendor) {
+		this.tervendor = tervendor;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public String getDeputyname() {
+		return deputyname;
+	}
+
+	public void setDeputyname(String deputyname) {
+		this.deputyname = deputyname;
+	}
+
+	public String getSalecode() {
+		return salecode;
+	}
+
+	public void setSalecode(String salecode) {
+		this.salecode = salecode;
+	}
+
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+}

src/main/java/com/uas/platform/b2b/manage/model/EnterpriseBaseInfo.java

@@ -46,7 +46,7 @@ public class EnterpriseBaseInfo implements Serializable {
      * 商业登记证号
      */
     @Column(name = "en_businesscode")
-    private String enBussinessCode;
+    private String enBusinessCode;
 
     /**
      * 注册时间
@@ -84,12 +84,12 @@ public class EnterpriseBaseInfo implements Serializable {
         this.enAddress = enAddress;
     }
 
-    public String getEnBussinessCode() {
-        return enBussinessCode;
+    public String getEnBusinessCode() {
+        return enBusinessCode;
     }
 
-    public void setEnBussinessCode(String enBussinessCode) {
-        this.enBussinessCode = enBussinessCode;
+    public void setEnBusinessCode(String enBusinessCode) {
+        this.enBusinessCode = enBusinessCode;
     }
 
     public Date getEnDate() {
@@ -114,7 +114,7 @@ public class EnterpriseBaseInfo implements Serializable {
                 "uu=" + uu +
                 ", enName='" + enName + '\'' +
                 ", enAddress='" + enAddress + '\'' +
-                ", enBussinessCode='" + enBussinessCode + '\'' +
+                ", enBusinessCode='" + enBusinessCode + '\'' +
                 ", enDate=" + enDate +
                 '}';
     }

src/main/java/com/uas/platform/b2b/manage/model/UseType.java

@@ -27,6 +27,11 @@ public enum UseType {
      */
     ENGERPRISE_SEARCH("企业搜索"),
 
+    /**
+     * 企业注册
+     */
+    ENGERPRISE_REGISTER("企业注册"),
+
     /**
      * 日志搜索
      */
@@ -87,6 +92,16 @@ public enum UseType {
      */
     SALE_NOTICE_SEARCH("查询发货提醒"),
 
+    /**
+     * 搜索查询代采订单
+     */
+    DEPUTY_ORDER_SEARCH("搜索查询代采订单"),
+
+    /**
+     * 更新代采订单状态为重新下载
+     */
+    DEPUTY_ORDER_REDOWNLOAD("更新代采订单状态为重新下载"),
+
     /**
      * 查询发货提醒详情
      */

src/main/java/com/uas/platform/b2b/manage/service/DeputyOrderService.java

@@ -0,0 +1,32 @@
+package com.uas.platform.b2b.manage.service;
+
+import com.uas.platform.b2b.manage.controller.support.ResultBean;
+import com.uas.platform.b2b.manage.model.DeputyOrder;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import org.springframework.data.domain.Page;
+
+/**
+ * 代采订单
+ *
+ * @author hejq
+ * @date 2018-11-29 9:40
+ */
+public interface DeputyOrderService {
+
+    /**
+     * 分页获取代采订单信息
+     *
+     * @param info 分页信息
+     * @param keyword 关键字
+     * @return 搜索结果
+     */
+    Page<DeputyOrder> findByPageInfo(PageInfo info, String keyword);
+
+    /**
+     * 更新代采订单状态，重新下载到ERP
+     *
+     * @param id 单据id
+     * @return 操作结果
+     */
+    ResultBean reDownOrder(Long id);
+}

src/main/java/com/uas/platform/b2b/manage/service/impl/BaseService.java

@@ -47,4 +47,14 @@ public class BaseService {
      */
     static final String NOT_FOUND_CODE = "404";
 
+    /**
+     * 未下载状态
+     */
+    static final String NOT_SEND_STATUS = "未下载";
+
+    /**
+     * 重复状态码
+     */
+    static final Integer REPEAT_CODE = 222;
+
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/DeputyOrderServiceImpl.java

@@ -0,0 +1,78 @@
+package com.uas.platform.b2b.manage.service.impl;
+
+import com.uas.platform.b2b.manage.controller.support.ResultBean;
+import com.uas.platform.b2b.manage.core.util.StringUtils;
+import com.uas.platform.b2b.manage.dao.DeputyOrderDao;
+import com.uas.platform.b2b.manage.dao.EnterpriseBaseInfoDao;
+import com.uas.platform.b2b.manage.model.DeputyOrder;
+import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.manage.page.PageInfo;
+import com.uas.platform.b2b.manage.page.criteria.CriterionExpression;
+import com.uas.platform.b2b.manage.page.criteria.LogicalExpression;
+import com.uas.platform.b2b.manage.page.criteria.SimpleExpression;
+import com.uas.platform.b2b.manage.service.DeputyOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+/**
+ * 代采订单实现接口
+ *
+ * @author hejq
+ * @date 2018-11-29 9:40
+ */
+@Service
+public class DeputyOrderServiceImpl extends BaseService implements DeputyOrderService {
+
+    @Autowired
+    private DeputyOrderDao orderDao;
+
+    @Autowired
+    private EnterpriseBaseInfoDao enterpriseBaseInfoDao;
+
+    /**
+     * 分页获取代采订单信息
+     *
+     * @param info    分页信息
+     * @param keyword 关键字
+     * @return 搜索结果
+     */
+    @Override
+    public Page<DeputyOrder> findByPageInfo(PageInfo info, String keyword) {
+        if (!StringUtils.isEmpty(keyword)) {
+            SimpleExpression code = new SimpleExpression("code", keyword, CriterionExpression.Operator.LIKE, true);
+            SimpleExpression saleCode = new SimpleExpression("salecode", keyword, CriterionExpression.Operator.LIKE, true);
+            SimpleExpression[] expressions = new SimpleExpression[]{code, saleCode};
+            LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
+            info.expression(logical);
+        }
+        Page<DeputyOrder> orderPage = orderDao.findAll((Root<DeputyOrder> root, CriteriaQuery<?> query, CriteriaBuilder builder)
+                -> query.where(info.getPredicates(root, query, builder)).getRestriction(), info);
+        orderPage.getContent().stream().filter(order -> null != order.getEnuu())
+                .forEach(order -> {
+                    EnterpriseBaseInfo baseInfo = enterpriseBaseInfoDao.findOne(order.getEnuu());
+                    order.setEnName(baseInfo.getEnName());
+        });
+        return orderPage;
+    }
+
+    /**
+     * 更新代采订单状态，重新下载到ERP
+     *
+     * @param id 单据id
+     * @return 操作结果
+     */
+    @Override
+    public ResultBean reDownOrder(Long id) {
+        try {
+            orderDao.updateStatus(id, REPEAT_CODE, NOT_SEND_STATUS);
+        } catch (RuntimeException e) {
+            return new ResultBean(e);
+        }
+        return ResultBean.success();
+    }
+}

src/main/java/com/uas/platform/b2b/manage/service/impl/EnterpriseBaseInfoServiceImpl.java

@@ -41,14 +41,14 @@ public class EnterpriseBaseInfoServiceImpl extends BaseService implements Enterp
         if (!StringUtils.isEmpty(keyword)) {
             SimpleExpression name = new SimpleExpression("enName", keyword, CriterionExpression.Operator.LIKE, true);
             SimpleExpression address = new SimpleExpression("enAddress", keyword, CriterionExpression.Operator.LIKE, true);
-            SimpleExpression enBussinessCode = new SimpleExpression("enBussinessCode", keyword, CriterionExpression.Operator.LIKE, true);
+            SimpleExpression enBusinessCode = new SimpleExpression("enBusinessCode", keyword, CriterionExpression.Operator.LIKE, true);
             if (keyword.matches(UU_REGEXP)) {
                 SimpleExpression enUU = new SimpleExpression("uu", keyword, CriterionExpression.Operator.EQ, true);
-                SimpleExpression[] expressions = new SimpleExpression[]{name, enUU, address, enBussinessCode};
+                SimpleExpression[] expressions = new SimpleExpression[]{name, enUU, address, enBusinessCode};
                 LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
                 info.expression(logical);
             } else {
-                SimpleExpression[] expressions = new SimpleExpression[]{name, address, enBussinessCode};
+                SimpleExpression[] expressions = new SimpleExpression[]{name, address, enBusinessCode};
                 LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
                 info.expression(logical);
             }

src/main/java/com/uas/platform/b2b/manage/service/impl/InviteServiceImpl.java

@@ -200,7 +200,7 @@ public class InviteServiceImpl extends BaseService implements InviteService {
     private InvitationRecord initRecord(EnterpriseBaseInfo enterpriseBaseInfo, EnterpriseBaseInfo inviteEnterprise, UserBaseInfo userBaseInfo, UserBaseInfo admin) {
         InvitationRecord record = new InvitationRecord();
         record.setActive(Constant.YES);
-        record.setBussinesscode(inviteEnterprise.getEnBussinessCode());
+        record.setBussinesscode(inviteEnterprise.getEnBusinessCode());
         record.setSource("Manage");
         record.setDate(new Date(System.currentTimeMillis()));
         record.setStatus(Status.DOWNLOADED.value());

src/main/java/com/uas/platform/b2b/manage/web/BaseController.java

@@ -6,6 +6,8 @@ import java.io.PrintWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.uas.platform.b2b.manage.service.UseLogService;
+import com.uas.platform.core.util.AgentUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -31,6 +33,9 @@ public class BaseController {
 	@Autowired
 	protected HttpServletRequest request;
 
+	@Autowired
+    protected UseLogService useLogService;
+
 	protected static ModelMap success() {
 		return new ModelMap("success", true);
 	}

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

@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="Content-Language" Content="zh-CN">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="author" content="优软科技">
+	<meta name="Keywords" content="优软,优软云,优企云服,SAAS,UAS,ERP,企业管理">
+	<meta name="baidu-site-verification" content="tamBdrxeYx" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=8">
+	<meta http-equiv="Expires" content="0">
+	<meta http-equiv="Pragma" content="no-cache">
+	<meta http-equiv="Cache-control" content="no-cache, must-revalidate">
+	<meta http-equiv="Cache" content="no-cache">
+	<link href="static/img/icon/icon_32.png" rel="icon" type="image/x-icon" />
+	<link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />
+	<link rel="stylesheet"
+		  href="static/lib/fontawesome/css/font-awesome.min.css" />
+	<link rel="stylesheet" href="static/lib/bootstrap-tour/css/bootstrap-tour.min.css" />
+	<link rel="stylesheet" href="static/css/common.css" />
+	<link rel="stylesheet" href="static/css/enterprise.css" />
+    <link rel="stylesheet" href="static/css/pagination.css">
+	<title>代采订单</title>
+</head>
+<body>
+<style>
+	#loadingDiv {
+		position: absolute;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		/*background: #000000;*/
+		opacity: 0.3;
+		filter: alpha(opacity=80);
+		z-index: 10000;
+        display: none;
+	}
+	#loadingImg {
+		position: absolute;
+		cursor: wait;
+		left: 45%;
+		top: 50%;
+		width: auto;
+        height: auto;
+	}
+    #logList-body {
+        word-break: break-all;
+        word-wrap: break-word;
+    }
+    #para-content  {
+        word-break: break-all;
+        word-wrap: break-word;
+        max-height: 450px;
+        max-width: 600px;
+        overflow: auto;
+    }
+    #pa_detail pre {
+        outline: 1px solid #ccc; padding: 5px; margin: 5px;
+    }
+    .string { color: red; }
+    .number { color: purple; }
+    .boolean { color: blue; }
+    .null { color: magenta; }
+    .key { color: green; }
+
+</style>
+<div id="loadingDiv">
+	<div id="loadingImg">
+		<img src="../static/images/waiting.gif"/>
+	</div>
+</div>
+<!-- nav start -->
+<nav id="nav" class="navbar navbar-inverse navbar-fixed-top">
+	<div class="container">
+		<div class="navbar-header">
+			<a href="/" id="logo"><img src="static/img/logo.png" alt="" height="25px" /></a>
+		</div>
+		<div class="collapse navbar-collapse">
+			<div class="nav navbar-nav navbar-left">
+				<li><a href="/enterprise" class="link-b2b">企业列表</a></li>
+				<li><a href="/logList">B2B日志</a></li>
+				<li><a href="/schedularList" class="link-mall">UAS轮询地址</a></li>
+				<li><a href="/invite" class="link-mall">邀请注册记录</a></li>
+				<li><a href="/notice" class="link-mall">发货提醒</a></li>
+				<li><a href="/statisticsChart">数据统计</a></li>
+				<li><a href="/listen">UAS轮询监控</a></li>
+				<li><a href="/deputyOrder" class="active">代采订单列表</a></li>
+			</div>
+            <ul class="nav navbar-nav navbar-right x-login">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle"><i class="fa fa-user"></i> <span class="title"></span></a>
+                </li>
+                <li><a href="#" class="link-logout">退出</a></li>
+            </ul>
+		</div>
+	</div>
+</nav>
+<!-- nav end -->
+
+<!-- section start -->
+<section>
+	<div class="container">
+		<div class="section-title">
+			<h3>代采订单列表</h3>
+		</div>
+	</div>
+    <div class="search">
+        <div class="search-title" style="float: right">
+			<input id="deputyList-total" style="width: 100px; border:0;outline:0;background: #F7F7F8" readonly>
+		</div>
+        <div class="input-group">
+            <input type="text" id="keyword" class="form-control" placeholder="请输入流水号或者采购单号搜索"><span class="input-group-addon" id="p_search">搜索</span>
+        </div>
+    </div>
+	<table class="table table-striped table-hover" style="overflow: scroll">
+		<thead id="deputyList-head">
+            <th class="text-center" width="60">序号</th>
+            <th class="text-center" width="80">订单信息</th>
+            <th class="text-center" width="120">采购企业</th>
+            <th class="text-center" width="120">终端供应商</th>
+            <th class="text-center" width="80">单据状态</th>
+			<th class="text-center" width="100">时间</th>
+            <th class="text-center" width="50">操作</th>
+		</thead>
+        <tbody id="deputyList-body">
+        </tbody>
+        <div id="page"></div>
+    </table>
+    <div id="m-page" class="m-style"></div>
+</section>
+<!-- section end -->
+
+<!-- 参数详情 -->
+<div class="modal fade" id="deputyOrderInfo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content" id="para-main">
+            <div class="modal-header" id="para-title">
+            </div>
+            <div class="modal-body">
+                <table>
+                    <tbody>
+                    <tr>
+                        <td><label class="text-right">流水号: </label></td>
+                        <td><span id="order_code"></span></td>
+                    </tr>
+                    <tr>
+                        <td><label class="text-right">订单号: </label></td>
+                        <td><span id="order_salecode"></span></td>
+                    </tr>
+                    <tr>
+                        <td><label class="text-right">录入企业: </label></td>
+                        <td><span id="order_enName"></span></td>
+                    </tr>
+                    <tr>
+                        <td><label class="text-right">代采企业: </label></td>
+                        <td><span id="order_deputyname"></span></td>
+                    </tr>
+                    <tr>
+                        <td><label class="text-right">终端供应商: </label></td>
+                        <td><span id="order_tervendor"></span></td>
+                    </tr>
+                    </tbody>
+                    <tr>
+                        <td><label>提示：</label></td>
+                        <td><span style="color: red">点击确认会修改单据下载状态，请注意核对信息</span></td>
+                    </tr>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <a type="button" class="btn btn-success" data-dismiss="modal" id="okay">
+                    确认
+                </a>
+                <a type="button" class="btn btn-default" data-dismiss="modal">
+                    关闭
+                </a>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+
+</body>
+<script type="text/javascript" src="static/lib/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="static/lib/bootstrap/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="static/lib/bootstrap-tour/js/bootstrap-tour.min.js"></script>
+<script type="text/javascript" src="static/js/common/deputyOrder.js"></script>
+<script type="text/javascript" src="static/js/index/app.js"></script>
+<script type="text/javascript" src="static/js/common/common.js"></script>
+</html>

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

@@ -68,6 +68,7 @@
 				<li><a href="/notice" class="link-mall">发货提醒</a></li>
 				<li><a href="/statisticsChart">数据统计</a></li>
 				<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+				<li><a href="/deputyOrder">代采订单列表</a></li>
 			</div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

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

@@ -44,6 +44,7 @@
 					<li><a href="/notice" class="link-mall">发货提醒</a></li>
 					<li><a href="/statisticsChart">数据统计</a></li>
 					<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+					<li><a href="/deputyOrder">代采订单列表</a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right x-nologin">
 					<li><a href="#" class="link-login">登录</a></li>

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

@@ -119,6 +119,7 @@
                 <li><a href="/notice" class="link-mall">发货提醒</a></li>
                 <li><a href="/statisticsChart">数据统计</a></li>
                 <li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+                <li><a href="/deputyOrder">代采订单列表</a></li>
             </div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

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

@@ -74,6 +74,7 @@
                 <li><a href="/notice" class="link-mall">发货提醒</a></li>
                 <li><a href="/statisticsChart">数据统计</a></li>
                 <li><a href="/listen" class="active">UAS轮询监控</a></li>
+                <li><a href="/deputyOrder">代采订单列表</a></li>
             </div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

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

@@ -88,6 +88,7 @@
 				<li><a href="/notice" class="link-mall">发货提醒</a></li>
 				<li><a href="/statisticsChart">数据统计</a></li>
 				<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+				<li><a href="/deputyOrder">代采订单列表</a></li>
 			</div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

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

@@ -50,6 +50,8 @@
                 <li><a href="/invite" class="link-mall">邀请注册记录</a></li>
                 <li><a href="/notice" class="active">发货提醒</a></li>
                 <li><a href="/statisticsChart">数据统计</a></li>
+                <li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+                <li><a href="/deputyOrder">代采订单列表</a></li>
             </div>
 			<ul class="nav navbar-nav navbar-right x-login">
 				<li class="dropdown">

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

@@ -72,6 +72,7 @@
 				<li><a href="/notice" class="active">发货提醒</a></li>
 				<li><a href="/statisticsChart">数据统计</a></li>
 				<li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+				<li><a href="/deputyOrder">代采订单列表</a></li>
 			</div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

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

@@ -78,6 +78,7 @@
                 <li><a href="/notice" class="link-mall">发货提醒</a></li>
                 <li><a href="/statisticsChart" class="active">数据统计</a></li>
                 <li><a href="/listen" class="link-mall">UAS轮询监控</a></li>
+                <li><a href="/deputyOrder">代采订单列表</a></li>
             </div>
             <ul class="nav navbar-nav navbar-right x-login">
                 <li class="dropdown">

src/main/webapp/WEB-INF/webmvc.xml

@@ -64,6 +64,7 @@
     <mvc:view-controller path="/notice_detail" view-name="noticeDetail" />
 	<mvc:view-controller path="/statisticsChart" view-name="statisticsChart" />
 	<mvc:view-controller path="/listen" view-name="listen" />
+	<mvc:view-controller path="/deputyOrder" view-name="deputyOrderList" />
 	<mvc:interceptors>
 		<!-- SSO过滤 -->
 		<mvc:interceptor>

src/main/webapp/resources/js/common/deputyOrder.js

@@ -0,0 +1,206 @@
+/**
+ * 引入toaster方法
+ */
+document.write("<script language=javascript src='static/js/common/toastr.js'></script>");
+
+/**
+ * 引入分页
+ */
+document.write("<script language=javascript src='static/lib/jquery/jquery.pagination.js'></script>");
+
+/**
+ * 引入base方法
+ */
+document.write("<script language=javascript src='static/js/common/base.js'></script>");
+
+var deputyOrderList = [];
+
+/**
+ * 获取企业列表
+ */
+function getDeputyOrderList(count, page, keyword) {
+    $('#loadingDiv').show();
+    deputyOrderList = [];
+    $("#deputyList-body").empty();
+    $.get('deputyOrder/list', {
+        count: count,
+        page: page,
+        keyword: keyword
+    }, function (data) {
+        $('#loadingDiv').hide();
+        deputyOrderList = data.data;
+        var pageNumber = data.page;
+        var pageSize = data.size;
+        var total = data.totalElements;
+        var totalPage = data.totalPages;
+        var tbody = document.getElementById("deputyList-body");
+        var page = document.getElementById("page");
+        //noinspection JSAnnotator
+        $('#deputyList-total').val('共 ' + total + ' 条');
+        if (deputyOrderList.length > 0) {
+            for (var i = 0; i < deputyOrderList.length; i++) {
+                var trow = getDataRow(deputyOrderList[i], i); //定义一个方法,返回tr数据
+                tbody.appendChild(trow);
+                // 查询详情
+                (function(i) {
+                    $("#edit_one_" + deputyOrderList[i].id ).click(function () {
+                        editOne(deputyOrderList[i]);
+                    });
+                })(i);
+            }
+
+            // 点击搜索
+            $('#p_search').unbind('click').click(function () {// 每次先解除上次绑定的事件，防止重复发送请求
+                $("#deputyList-body").load(location.href + " #deputyList-body");
+                getDeputyOrderList(count, 1, $('#keyword').val());
+            });
+
+            // 键盘确认按钮搜索
+            document.onkeydown = function(event) {
+                var e = event || window.event;
+                if (e && e.keyCode == 13) { // enter 键
+                    $("#deputyList-body").load(location.href + " #deputyList-body");
+                    getDeputyOrderList(count, 1, $('#keyword').val());
+                }
+            };
+        }
+        $('#m-page').pagination({
+            pageCount: totalPage,
+            totalData: total,
+            current: pageNumber,
+            showData: pageSize,
+            coping: true,
+            homePage: '首页',
+            endPage: '末页',
+            prevContent: '<<',
+            nextContent: '>>',
+            jump: true,
+            jumpBtn: '跳转',
+            callback: function (api) {
+                $('.now').text(api.getCurrent());
+                $("#deputyList-body").load(location.href + " #deputyList-body");
+                getDeputyOrderList(count, api.getCurrent(), $('#keyword').val());
+            }
+        }, function (api) {
+            $('.now').text(api.getCurrent());
+        });
+    })
+}
+
+/**
+ * 编辑代采订单
+ *
+ * @param deputyOrder
+ */
+var id = null;
+function editOne(order) {
+    $('#para-title').empty();
+    $("<p style='font-size: 16px; font-weight: bold'>").text(order.code).appendTo("#para-title");
+    $('#deputyOrderInfo').modal('show');
+    $("#order_code").append(order.code);
+    $("#order_salecode").append(order.salecode);
+    $("#order_enName").append(order.enName);
+    $("#order_deputyname").append(order.deputyname);
+    $("#order_tervendor").append(order.tervendor);
+    id = order.id;
+}
+
+/**
+ * 编辑代采订单
+ */
+$('#okay').click(function () {
+    $.ajax('deputyOrder/reDownOrder/' + id, {
+        method: 'POST',
+        async: false,
+        success: function(data) {
+            if (data.code == 0) {
+                alert('修改成功');
+            } else {
+                alert('修改失败');
+            }
+            getDeputyOrderList(20, 1, null);
+        },
+        error: function (error) {
+            alert(error.responseText);
+        }
+    });
+});
+
+/**
+ * 建立表格数据
+ *
+ * @param en 企业信息
+ * @param i 行号
+ * @returns {Element}
+ */
+function getDataRow(order, i) {
+    var keyword = $('#keyword').val();
+
+    var row = document.createElement('tr'); //创建行
+
+    var indexCell = document.createElement('td'); //序号
+    indexCell.setAttribute("class", "text-center");
+    indexCell.innerHTML = i + 1; //填充数据
+    row.appendChild(indexCell);
+
+    // 订单信息
+    var uuCell = document.createElement('td');
+    uuCell.setAttribute("class", "text-left");
+    uuCell.innerHTML = "流水号：" + highLightKeywords(order.code, keyword, null); //填充数据
+    uuCell.innerHTML += "<br>订单号编号：" + highLightKeywords(order.salecode, keyword, null); ;
+    row.appendChild(uuCell);
+
+    // 采购企业
+    var nameCell = document.createElement('td');
+    nameCell.setAttribute("class", "text-left");
+    nameCell.innerHTML = "企业名称：" + order.enName; //填充数据
+    nameCell.innerHTML += "<br>企业UU：" + order.enuu;
+    row.appendChild(nameCell);
+
+    // 终端供应商
+    var vendorCell = document.createElement('td');
+    vendorCell.setAttribute("class", "text-left");
+    vendorCell.innerHTML = "代采企业: " + order.deputyname;
+    vendorCell.innerHTML += "<br>终端供应商： " + order.tervendor;
+    row.appendChild(vendorCell);
+
+    // 单据状态
+    var orderStatusCell = document.createElement('td'); //营业执照
+    orderStatusCell.setAttribute("class", "text-center");
+    orderStatusCell.innerHTML = "录入状态： " + order.entrystatus;
+    orderStatusCell.innerHTML += "<br>下载状态： " + order.downloadstatus;
+    row.appendChild(orderStatusCell);
+
+    // 日期
+    var dateCell = document.createElement('td'); //日期
+    dateCell.setAttribute("class", "text-center");
+    dateCell.innerHTML = "录入时间：" + formatDateTime(order.entrydate) || "-"; //填充数据
+    dateCell.innerHTML += "<br>提交时间：" + formatDateTime(order.date) || "-"; //填充数据
+    row.appendChild(dateCell);
+
+    // 操作
+    var handleCell = document.createElement('td');
+    handleCell.setAttribute('class', 'text-center redirect_b2b');
+    handleCell.setAttribute('id', "edit_one_" + order.id);
+    handleCell.setAttribute("title", "请注意：点击更新后会让单据重新下载");
+    handleCell.innerHTML = '更新';
+    row.appendChild(handleCell);
+    return row;
+}
+
+$(function() {
+    'use strict';
+
+    // 监听页面滚动
+    $(window).scroll(function() {
+        if($(window).scrollTop() >= 400) {
+            $('#nav').addClass('on');
+        } else {
+            $('#nav').removeClass('on');
+        }
+    });
+
+    // 设置分页大小
+    var count = 20;
+    getDeputyOrderList(count, 1, null);
+});