添加清零功能

src/main/java/com/minpay/common/service/impl/LogServiceImpl.java

@@ -100,7 +100,7 @@ public class LogServiceImpl implements ILogService {
 			imLog.setResult(errorCode);
 			imLog.setInfo(logInfo);
 			imLog.setIp(userIp);
-			db.insert(ImLogMapper.class, imLog);
+			db.insertSelective(ImLogMapper.class, imLog);
 		}
 		
 	}

src/main/java/com/minpay/db/table/model/VmProEquRel.java

@@ -196,6 +196,22 @@ public class VmProEquRel extends AbstractMINBean {
     private String luck;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_pro_equ_rel.VCI_ACCUMULATED_AMOUNT
+     *
+     * @mbggenerated
+     */
+    private String accumulatedAmount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_pro_equ_rel.VCI_DRAW_AMOUNT
+     *
+     * @mbggenerated
+     */
+    private String drawAmount;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_pro_equ_rel.VCI_ID
      *
@@ -770,4 +786,52 @@ public class VmProEquRel extends AbstractMINBean {
     public void setLuck(String luck) {
         this.luck = luck == null ? null : luck.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_pro_equ_rel.VCI_ACCUMULATED_AMOUNT
+     *
+     * @return the value of vm_pro_equ_rel.VCI_ACCUMULATED_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public String getAccumulatedAmount() {
+        return accumulatedAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_pro_equ_rel.VCI_ACCUMULATED_AMOUNT
+     *
+     * @param accumulatedAmount the value for vm_pro_equ_rel.VCI_ACCUMULATED_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public void setAccumulatedAmount(String accumulatedAmount) {
+        this.accumulatedAmount = accumulatedAmount == null ? null : accumulatedAmount.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_pro_equ_rel.VCI_DRAW_AMOUNT
+     *
+     * @return the value of vm_pro_equ_rel.VCI_DRAW_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public String getDrawAmount() {
+        return drawAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_pro_equ_rel.VCI_DRAW_AMOUNT
+     *
+     * @param drawAmount the value for vm_pro_equ_rel.VCI_DRAW_AMOUNT
+     *
+     * @mbggenerated
+     */
+    public void setDrawAmount(String drawAmount) {
+        this.drawAmount = drawAmount == null ? null : drawAmount.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmProEquRelExample.java

@@ -2061,6 +2061,162 @@ public class VmProEquRelExample {
             addCriterion("VCI_LUCK not between", value1, value2, "luck");
             return (Criteria) this;
         }
+
+        public Criteria andAccumulatedAmountIsNull() {
+            addCriterion("VCI_ACCUMULATED_AMOUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountIsNotNull() {
+            addCriterion("VCI_ACCUMULATED_AMOUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountEqualTo(String value) {
+            if(value == null ){
+                andAccumulatedAmountIsNull();
+            } else {
+                addCriterion("VCI_ACCUMULATED_AMOUNT =", value, "accumulatedAmount");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountNotEqualTo(String value) {
+            if(value == null ){
+                andAccumulatedAmountIsNotNull();
+            } else {
+                addCriterion("VCI_ACCUMULATED_AMOUNT <>", value, "accumulatedAmount");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountGreaterThan(String value) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT >", value, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountGreaterThanOrEqualTo(String value) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT >=", value, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountLessThan(String value) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT <", value, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountLessThanOrEqualTo(String value) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT <=", value, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountLike(String value) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT like", value, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountNotLike(String value) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT not like", value, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountIn(List<String> values) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT in", values, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountNotIn(List<String> values) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT not in", values, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountBetween(String value1, String value2) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT between", value1, value2, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccumulatedAmountNotBetween(String value1, String value2) {
+            addCriterion("VCI_ACCUMULATED_AMOUNT not between", value1, value2, "accumulatedAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountIsNull() {
+            addCriterion("VCI_DRAW_AMOUNT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountIsNotNull() {
+            addCriterion("VCI_DRAW_AMOUNT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountEqualTo(String value) {
+            if(value == null ){
+                andDrawAmountIsNull();
+            } else {
+                addCriterion("VCI_DRAW_AMOUNT =", value, "drawAmount");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountNotEqualTo(String value) {
+            if(value == null ){
+                andDrawAmountIsNotNull();
+            } else {
+                addCriterion("VCI_DRAW_AMOUNT <>", value, "drawAmount");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountGreaterThan(String value) {
+            addCriterion("VCI_DRAW_AMOUNT >", value, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountGreaterThanOrEqualTo(String value) {
+            addCriterion("VCI_DRAW_AMOUNT >=", value, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountLessThan(String value) {
+            addCriterion("VCI_DRAW_AMOUNT <", value, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountLessThanOrEqualTo(String value) {
+            addCriterion("VCI_DRAW_AMOUNT <=", value, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountLike(String value) {
+            addCriterion("VCI_DRAW_AMOUNT like", value, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountNotLike(String value) {
+            addCriterion("VCI_DRAW_AMOUNT not like", value, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountIn(List<String> values) {
+            addCriterion("VCI_DRAW_AMOUNT in", values, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountNotIn(List<String> values) {
+            addCriterion("VCI_DRAW_AMOUNT not in", values, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountBetween(String value1, String value2) {
+            addCriterion("VCI_DRAW_AMOUNT between", value1, value2, "drawAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDrawAmountNotBetween(String value1, String value2) {
+            addCriterion("VCI_DRAW_AMOUNT not between", value1, value2, "drawAmount");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/db/table/own/mapper/MachineManageMapper.java

@@ -14,7 +14,7 @@ public interface MachineManageMapper extends  IMINMybatisEntityMapper{
 
 
     List<Map<String, Object>> queryProEquRel(Map<String, String> map);
-
+	List<Map<String, Object>> queryProEquRelPage(Map<String, String> map,  MINRowBounds rows);
 	List<Map<String, String>> queryProductz(Map<String, String> map, MINRowBounds rows);
 
 	List<Map<String, Object>> queryEquipment(Map<String, String> map, MINRowBounds rows);

src/main/java/com/minpay/mt/machine/action/MachineManageAction.java

@@ -5,6 +5,7 @@ import com.min.util.CommonUtil;
 import com.minpay.common.bean.User;
 import com.minpay.common.constant.Constant;
 import com.minpay.common.format.IFormatService;
+import com.minpay.common.service.ILogService;
 import com.minpay.common.service.IPropertiesService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.DateUtil;
@@ -66,6 +67,11 @@ public class MachineManageAction implements IMINAction {
      */
     public final static String QUERY_PROEQUREL = "queryProEquRel";
     /**
+     * 查询设备中商品
+     */
+    public final static String QUERY_PROEQURELPAGE = "queryProEquRelPage";
+
+    /**
      * 查看正常状态商品
      */
     public final static String QUERY_PRODUCTZ = "queryProductz";
@@ -122,6 +128,9 @@ public class MachineManageAction implements IMINAction {
 
     /**查询商户关联页面*/
     public final static String	QUERY_FUNCTION		= "queryFunction";
+    /**清空累计金额*/
+    public final static String	EMPTY_PROEQUREL		= "emptyProEquRel";
+
 
     private boolean contains;
 
@@ -632,6 +641,8 @@ public class MachineManageAction implements IMINAction {
             @MINParam(key = "equId") String equId,
             @MINParam(key = "perState") String perState,
             @MINParam(key = "luck") String luck,
+            @MINParam(key = "accumulatedAmount") String accumulatedAmount,
+            @MINParam(key = "drawAmount") String drawAmount,
             MINSession session
     ) throws MINBusinessException {
 
@@ -751,7 +762,10 @@ public class MachineManageAction implements IMINAction {
         if (!CommonUtil.isEmpty(perState)) {
             proEquRel.setExeitState(perState);                    //状态
         }
-
+        if (!CommonUtil.isEmpty(drawAmount)) {
+            proEquRel.setDrawAmount(drawAmount);
+        }
+        proEquRel.setAccumulatedAmount("0");
         Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(VmProEquRelMapper.class)
                 .updateByPrimaryKeySelective(proEquRel);
@@ -1539,4 +1553,75 @@ public class MachineManageAction implements IMINAction {
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
         return res;
     }
+    /**
+     * 查询设备中商品
+     *
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = QUERY_PROEQURELPAGE)
+    public MINActionResult queryProEquRelPage(
+            @MINParam(key = "equId") String equId,
+            @MINParam(key = "proName") String proName,
+            @MINParam(key = "gameType") String gameType,
+            @MINParam(key = "page", defaultValue = "1") int page,
+            @MINParam(key = "limit", defaultValue = "10") int limit,
+            MINSession session
+    ) throws MINBusinessException {
+
+        MINActionResult res = new MINActionResult();
+
+        MINRowBounds rows = new MINRowBounds(page, limit);
+        User user = session.getUser();
+        //渠道
+        String channel = user.getChannel();
+        // 查询条件
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("channel", "V01");
+        map.put("equId", equId);
+        if(!Constant.ADMINISTRATION_SYSTEM_NUMBER.equals(user.getBranchId())){
+            map.put("branchId", user.getBranchId());
+        }
+
+        map.put("gameType", "20");
+        map.put("proName", proName);
+        List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(MachineManageMapper.class)
+                .queryProEquRelPage(map,rows);
+        //格式化时间和状态
+        list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
+        list = new MINCopyFormat("{perState:'sttDesc',isPromotton:'isPromottonDesc',isFragile:'isFragileDesc',type:'typeDesc'}").format(list);
+        list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'PROEQUREL_STATE',isPromottonDesc:'IS_PROMOTION',typeDesc:'GAME_SETUP_TYPE'}");
+        //传递数据
+        res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+        res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());
+        return res;
+    }
+
+    /**
+     * 清空累计金额
+     * @param perId
+     * @param accumulatedAmount
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = EMPTY_PROEQUREL)
+    public MINActionResult emptyProEquRel(
+            @MINParam(key = "perId") String perId,
+            @MINParam(key = "accumulatedAmount") String accumulatedAmount,
+            MINSession session
+    ) throws MINBusinessException {
+        MINActionResult res = new MINActionResult();
+        VmProEquRel proEquRel = new VmProEquRel();
+        proEquRel.setId(perId);
+        proEquRel.setAccumulatedAmount("0");
+        Service.lookup(IMINDataBaseService.class)
+                .getMybatisMapper(VmProEquRelMapper.class)
+                .updateByPrimaryKeySelective(proEquRel);
+        String logInfo = "清空累计金额:" + perId;
+        Service.lookup(ILogService.class).logging(session, logInfo);
+        return res;
+    }
 }

src/main/resources/com/minpay/db/table/mapper/VmProEquRelMapper.xml

@@ -1,59 +1,61 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.minpay.db.table.mapper.VmProEquRelMapper" >
-  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmProEquRel" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.minpay.db.table.mapper.VmProEquRelMapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.VmProEquRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="VCI_ID" property="id" jdbcType="VARCHAR" />
-    <result column="VCI_CHANNEL" property="channel" jdbcType="VARCHAR" />
-    <result column="VCI_PRODUCT_ID" property="productId" jdbcType="VARCHAR" />
-    <result column="VCI_EQUIPMENT_ID" property="equipmentId" jdbcType="VARCHAR" />
-    <result column="VCI_AISLE" property="aisle" jdbcType="VARCHAR" />
-    <result column="VCI_CARGO_WAY_ROW" property="cargoWayRow" jdbcType="VARCHAR" />
-    <result column="VCI_CARGO_WAY_LINE" property="cargoWayLine" jdbcType="VARCHAR" />
-    <result column="VCI_CARGO_WAY_NUMS" property="cargoWayNums" jdbcType="VARCHAR" />
-    <result column="VCI_PRODUCT_NUMS" property="productNums" jdbcType="VARCHAR" />
-    <result column="VCI_USER_Id" property="userId" jdbcType="VARCHAR" />
-    <result column="VCI_SALL_PRICE" property="sallPrice" jdbcType="VARCHAR" />
-    <result column="VCI_GAME_PRICE" property="gamePrice" jdbcType="VARCHAR" />
-    <result column="VCI_COST_PRICE" property="costPrice" jdbcType="VARCHAR" />
-    <result column="VCI_IS_PROMOTION" property="isPromotion" jdbcType="CHAR" />
-    <result column="VCI_PROMOTION_PRICE" property="promotionPrice" jdbcType="VARCHAR" />
-    <result column="VCI_GAME_TYPE" property="gameType" jdbcType="VARCHAR" />
-    <result column="VCI_IS_FRAGILE" property="isFragile" jdbcType="CHAR" />
-    <result column="VCI_REMARKS" property="remarks" jdbcType="VARCHAR" />
-    <result column="VCI_CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="VCI_CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
-    <result column="VCI_MODIFY_USER" property="modifyUser" jdbcType="VARCHAR" />
-    <result column="VCI_MODIFY_TIME" property="modifyTime" jdbcType="VARCHAR" />
-    <result column="VCI_EXEIT_STATE" property="exeitState" jdbcType="CHAR" />
-    <result column="VCI_LUCK" property="luck" jdbcType="VARCHAR" />
+    <id column="VCI_ID" jdbcType="VARCHAR" property="id" />
+    <result column="VCI_CHANNEL" jdbcType="VARCHAR" property="channel" />
+    <result column="VCI_PRODUCT_ID" jdbcType="VARCHAR" property="productId" />
+    <result column="VCI_EQUIPMENT_ID" jdbcType="VARCHAR" property="equipmentId" />
+    <result column="VCI_AISLE" jdbcType="VARCHAR" property="aisle" />
+    <result column="VCI_CARGO_WAY_ROW" jdbcType="VARCHAR" property="cargoWayRow" />
+    <result column="VCI_CARGO_WAY_LINE" jdbcType="VARCHAR" property="cargoWayLine" />
+    <result column="VCI_CARGO_WAY_NUMS" jdbcType="VARCHAR" property="cargoWayNums" />
+    <result column="VCI_PRODUCT_NUMS" jdbcType="VARCHAR" property="productNums" />
+    <result column="VCI_USER_Id" jdbcType="VARCHAR" property="userId" />
+    <result column="VCI_SALL_PRICE" jdbcType="VARCHAR" property="sallPrice" />
+    <result column="VCI_GAME_PRICE" jdbcType="VARCHAR" property="gamePrice" />
+    <result column="VCI_COST_PRICE" jdbcType="VARCHAR" property="costPrice" />
+    <result column="VCI_IS_PROMOTION" jdbcType="CHAR" property="isPromotion" />
+    <result column="VCI_PROMOTION_PRICE" jdbcType="VARCHAR" property="promotionPrice" />
+    <result column="VCI_GAME_TYPE" jdbcType="VARCHAR" property="gameType" />
+    <result column="VCI_IS_FRAGILE" jdbcType="CHAR" property="isFragile" />
+    <result column="VCI_REMARKS" jdbcType="VARCHAR" property="remarks" />
+    <result column="VCI_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+    <result column="VCI_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
+    <result column="VCI_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
+    <result column="VCI_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <result column="VCI_EXEIT_STATE" jdbcType="CHAR" property="exeitState" />
+    <result column="VCI_LUCK" jdbcType="VARCHAR" property="luck" />
+    <result column="VCI_ACCUMULATED_AMOUNT" jdbcType="VARCHAR" property="accumulatedAmount" />
+    <result column="VCI_DRAW_AMOUNT" jdbcType="VARCHAR" property="drawAmount" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -64,29 +66,29 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -97,7 +99,7 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -106,27 +108,27 @@
     VCI_CARGO_WAY_LINE, VCI_CARGO_WAY_NUMS, VCI_PRODUCT_NUMS, VCI_USER_Id, VCI_SALL_PRICE, 
     VCI_GAME_PRICE, VCI_COST_PRICE, VCI_IS_PROMOTION, VCI_PROMOTION_PRICE, VCI_GAME_TYPE, 
     VCI_IS_FRAGILE, VCI_REMARKS, VCI_CREATE_USER, VCI_CREATE_TIME, VCI_MODIFY_USER, VCI_MODIFY_TIME, 
-    VCI_EXEIT_STATE, VCI_LUCK
+    VCI_EXEIT_STATE, VCI_LUCK, VCI_ACCUMULATED_AMOUNT, VCI_DRAW_AMOUNT
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.minpay.db.table.model.VmProEquRelExample" >
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.VmProEquRelExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from vm_pro_equ_rel
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -136,7 +138,7 @@
     from vm_pro_equ_rel
     where VCI_ID = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -144,17 +146,17 @@
     delete from vm_pro_equ_rel
     where VCI_ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmProEquRelExample" >
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.VmProEquRelExample">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from vm_pro_equ_rel
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.minpay.db.table.model.VmProEquRel" >
+  <insert id="insert" parameterType="com.minpay.db.table.model.VmProEquRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -166,8 +168,8 @@
       VCI_COST_PRICE, VCI_IS_PROMOTION, VCI_PROMOTION_PRICE, 
       VCI_GAME_TYPE, VCI_IS_FRAGILE, VCI_REMARKS, 
       VCI_CREATE_USER, VCI_CREATE_TIME, VCI_MODIFY_USER, 
-      VCI_MODIFY_TIME, VCI_EXEIT_STATE, VCI_LUCK
-      )
+      VCI_MODIFY_TIME, VCI_EXEIT_STATE, VCI_LUCK, 
+      VCI_ACCUMULATED_AMOUNT, VCI_DRAW_AMOUNT)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, 
       #{equipmentId,jdbcType=VARCHAR}, #{aisle,jdbcType=VARCHAR}, #{cargoWayRow,jdbcType=VARCHAR}, 
       #{cargoWayLine,jdbcType=VARCHAR}, #{cargoWayNums,jdbcType=VARCHAR}, #{productNums,jdbcType=VARCHAR}, 
@@ -175,259 +177,277 @@
       #{costPrice,jdbcType=VARCHAR}, #{isPromotion,jdbcType=CHAR}, #{promotionPrice,jdbcType=VARCHAR}, 
       #{gameType,jdbcType=VARCHAR}, #{isFragile,jdbcType=CHAR}, #{remarks,jdbcType=VARCHAR}, 
       #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, 
-      #{modifyTime,jdbcType=VARCHAR}, #{exeitState,jdbcType=CHAR}, #{luck,jdbcType=VARCHAR}
-      )
+      #{modifyTime,jdbcType=VARCHAR}, #{exeitState,jdbcType=CHAR}, #{luck,jdbcType=VARCHAR}, 
+      #{accumulatedAmount,jdbcType=VARCHAR}, #{drawAmount,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmProEquRel" >
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmProEquRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into vm_pro_equ_rel
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         VCI_ID,
       </if>
-      <if test="channel != null" >
+      <if test="channel != null">
         VCI_CHANNEL,
       </if>
-      <if test="productId != null" >
+      <if test="productId != null">
         VCI_PRODUCT_ID,
       </if>
-      <if test="equipmentId != null" >
+      <if test="equipmentId != null">
         VCI_EQUIPMENT_ID,
       </if>
-      <if test="aisle != null" >
+      <if test="aisle != null">
         VCI_AISLE,
       </if>
-      <if test="cargoWayRow != null" >
+      <if test="cargoWayRow != null">
         VCI_CARGO_WAY_ROW,
       </if>
-      <if test="cargoWayLine != null" >
+      <if test="cargoWayLine != null">
         VCI_CARGO_WAY_LINE,
       </if>
-      <if test="cargoWayNums != null" >
+      <if test="cargoWayNums != null">
         VCI_CARGO_WAY_NUMS,
       </if>
-      <if test="productNums != null" >
+      <if test="productNums != null">
         VCI_PRODUCT_NUMS,
       </if>
-      <if test="userId != null" >
+      <if test="userId != null">
         VCI_USER_Id,
       </if>
-      <if test="sallPrice != null" >
+      <if test="sallPrice != null">
         VCI_SALL_PRICE,
       </if>
-      <if test="gamePrice != null" >
+      <if test="gamePrice != null">
         VCI_GAME_PRICE,
       </if>
-      <if test="costPrice != null" >
+      <if test="costPrice != null">
         VCI_COST_PRICE,
       </if>
-      <if test="isPromotion != null" >
+      <if test="isPromotion != null">
         VCI_IS_PROMOTION,
       </if>
-      <if test="promotionPrice != null" >
+      <if test="promotionPrice != null">
         VCI_PROMOTION_PRICE,
       </if>
-      <if test="gameType != null" >
+      <if test="gameType != null">
         VCI_GAME_TYPE,
       </if>
-      <if test="isFragile != null" >
+      <if test="isFragile != null">
         VCI_IS_FRAGILE,
       </if>
-      <if test="remarks != null" >
+      <if test="remarks != null">
         VCI_REMARKS,
       </if>
-      <if test="createUser != null" >
+      <if test="createUser != null">
         VCI_CREATE_USER,
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         VCI_CREATE_TIME,
       </if>
-      <if test="modifyUser != null" >
+      <if test="modifyUser != null">
         VCI_MODIFY_USER,
       </if>
-      <if test="modifyTime != null" >
+      <if test="modifyTime != null">
         VCI_MODIFY_TIME,
       </if>
-      <if test="exeitState != null" >
+      <if test="exeitState != null">
         VCI_EXEIT_STATE,
       </if>
-      <if test="luck != null" >
+      <if test="luck != null">
         VCI_LUCK,
       </if>
+      <if test="accumulatedAmount != null">
+        VCI_ACCUMULATED_AMOUNT,
+      </if>
+      <if test="drawAmount != null">
+        VCI_DRAW_AMOUNT,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="channel != null" >
+      <if test="channel != null">
         #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="productId != null" >
+      <if test="productId != null">
         #{productId,jdbcType=VARCHAR},
       </if>
-      <if test="equipmentId != null" >
+      <if test="equipmentId != null">
         #{equipmentId,jdbcType=VARCHAR},
       </if>
-      <if test="aisle != null" >
+      <if test="aisle != null">
         #{aisle,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWayRow != null" >
+      <if test="cargoWayRow != null">
         #{cargoWayRow,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWayLine != null" >
+      <if test="cargoWayLine != null">
         #{cargoWayLine,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWayNums != null" >
+      <if test="cargoWayNums != null">
         #{cargoWayNums,jdbcType=VARCHAR},
       </if>
-      <if test="productNums != null" >
+      <if test="productNums != null">
         #{productNums,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null" >
+      <if test="userId != null">
         #{userId,jdbcType=VARCHAR},
       </if>
-      <if test="sallPrice != null" >
+      <if test="sallPrice != null">
         #{sallPrice,jdbcType=VARCHAR},
       </if>
-      <if test="gamePrice != null" >
+      <if test="gamePrice != null">
         #{gamePrice,jdbcType=VARCHAR},
       </if>
-      <if test="costPrice != null" >
+      <if test="costPrice != null">
         #{costPrice,jdbcType=VARCHAR},
       </if>
-      <if test="isPromotion != null" >
+      <if test="isPromotion != null">
         #{isPromotion,jdbcType=CHAR},
       </if>
-      <if test="promotionPrice != null" >
+      <if test="promotionPrice != null">
         #{promotionPrice,jdbcType=VARCHAR},
       </if>
-      <if test="gameType != null" >
+      <if test="gameType != null">
         #{gameType,jdbcType=VARCHAR},
       </if>
-      <if test="isFragile != null" >
+      <if test="isFragile != null">
         #{isFragile,jdbcType=CHAR},
       </if>
-      <if test="remarks != null" >
+      <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null" >
+      <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         #{createTime,jdbcType=VARCHAR},
       </if>
-      <if test="modifyUser != null" >
+      <if test="modifyUser != null">
         #{modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null" >
+      <if test="modifyTime != null">
         #{modifyTime,jdbcType=VARCHAR},
       </if>
-      <if test="exeitState != null" >
+      <if test="exeitState != null">
         #{exeitState,jdbcType=CHAR},
       </if>
-      <if test="luck != null" >
+      <if test="luck != null">
         #{luck,jdbcType=VARCHAR},
       </if>
+      <if test="accumulatedAmount != null">
+        #{accumulatedAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="drawAmount != null">
+        #{drawAmount,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.minpay.db.table.model.VmProEquRelExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.minpay.db.table.model.VmProEquRelExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from vm_pro_equ_rel
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update vm_pro_equ_rel
-    <set >
-      <if test="record.id != null" >
+    <set>
+      <if test="record.id != null">
         VCI_ID = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.channel != null" >
+      <if test="record.channel != null">
         VCI_CHANNEL = #{record.channel,jdbcType=VARCHAR},
       </if>
-      <if test="record.productId != null" >
+      <if test="record.productId != null">
         VCI_PRODUCT_ID = #{record.productId,jdbcType=VARCHAR},
       </if>
-      <if test="record.equipmentId != null" >
+      <if test="record.equipmentId != null">
         VCI_EQUIPMENT_ID = #{record.equipmentId,jdbcType=VARCHAR},
       </if>
-      <if test="record.aisle != null" >
+      <if test="record.aisle != null">
         VCI_AISLE = #{record.aisle,jdbcType=VARCHAR},
       </if>
-      <if test="record.cargoWayRow != null" >
+      <if test="record.cargoWayRow != null">
         VCI_CARGO_WAY_ROW = #{record.cargoWayRow,jdbcType=VARCHAR},
       </if>
-      <if test="record.cargoWayLine != null" >
+      <if test="record.cargoWayLine != null">
         VCI_CARGO_WAY_LINE = #{record.cargoWayLine,jdbcType=VARCHAR},
       </if>
-      <if test="record.cargoWayNums != null" >
+      <if test="record.cargoWayNums != null">
         VCI_CARGO_WAY_NUMS = #{record.cargoWayNums,jdbcType=VARCHAR},
       </if>
-      <if test="record.productNums != null" >
+      <if test="record.productNums != null">
         VCI_PRODUCT_NUMS = #{record.productNums,jdbcType=VARCHAR},
       </if>
-      <if test="record.userId != null" >
+      <if test="record.userId != null">
         VCI_USER_Id = #{record.userId,jdbcType=VARCHAR},
       </if>
-      <if test="record.sallPrice != null" >
+      <if test="record.sallPrice != null">
         VCI_SALL_PRICE = #{record.sallPrice,jdbcType=VARCHAR},
       </if>
-      <if test="record.gamePrice != null" >
+      <if test="record.gamePrice != null">
         VCI_GAME_PRICE = #{record.gamePrice,jdbcType=VARCHAR},
       </if>
-      <if test="record.costPrice != null" >
+      <if test="record.costPrice != null">
         VCI_COST_PRICE = #{record.costPrice,jdbcType=VARCHAR},
       </if>
-      <if test="record.isPromotion != null" >
+      <if test="record.isPromotion != null">
         VCI_IS_PROMOTION = #{record.isPromotion,jdbcType=CHAR},
       </if>
-      <if test="record.promotionPrice != null" >
+      <if test="record.promotionPrice != null">
         VCI_PROMOTION_PRICE = #{record.promotionPrice,jdbcType=VARCHAR},
       </if>
-      <if test="record.gameType != null" >
+      <if test="record.gameType != null">
         VCI_GAME_TYPE = #{record.gameType,jdbcType=VARCHAR},
       </if>
-      <if test="record.isFragile != null" >
+      <if test="record.isFragile != null">
         VCI_IS_FRAGILE = #{record.isFragile,jdbcType=CHAR},
       </if>
-      <if test="record.remarks != null" >
+      <if test="record.remarks != null">
         VCI_REMARKS = #{record.remarks,jdbcType=VARCHAR},
       </if>
-      <if test="record.createUser != null" >
+      <if test="record.createUser != null">
         VCI_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.createTime != null" >
+      <if test="record.createTime != null">
         VCI_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       </if>
-      <if test="record.modifyUser != null" >
+      <if test="record.modifyUser != null">
         VCI_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.modifyTime != null" >
+      <if test="record.modifyTime != null">
         VCI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
-      <if test="record.exeitState != null" >
+      <if test="record.exeitState != null">
         VCI_EXEIT_STATE = #{record.exeitState,jdbcType=CHAR},
       </if>
-      <if test="record.luck != null" >
+      <if test="record.luck != null">
         VCI_LUCK = #{record.luck,jdbcType=VARCHAR},
       </if>
+      <if test="record.accumulatedAmount != null">
+        VCI_ACCUMULATED_AMOUNT = #{record.accumulatedAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.drawAmount != null">
+        VCI_DRAW_AMOUNT = #{record.drawAmount,jdbcType=VARCHAR},
+      </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -456,91 +476,99 @@
       VCI_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       VCI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       VCI_EXEIT_STATE = #{record.exeitState,jdbcType=CHAR},
-      VCI_LUCK = #{record.luck,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+      VCI_LUCK = #{record.luck,jdbcType=VARCHAR},
+      VCI_ACCUMULATED_AMOUNT = #{record.accumulatedAmount,jdbcType=VARCHAR},
+      VCI_DRAW_AMOUNT = #{record.drawAmount,jdbcType=VARCHAR}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmProEquRel" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.VmProEquRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update vm_pro_equ_rel
-    <set >
-      <if test="channel != null" >
+    <set>
+      <if test="channel != null">
         VCI_CHANNEL = #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="productId != null" >
+      <if test="productId != null">
         VCI_PRODUCT_ID = #{productId,jdbcType=VARCHAR},
       </if>
-      <if test="equipmentId != null" >
+      <if test="equipmentId != null">
         VCI_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR},
       </if>
-      <if test="aisle != null" >
+      <if test="aisle != null">
         VCI_AISLE = #{aisle,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWayRow != null" >
+      <if test="cargoWayRow != null">
         VCI_CARGO_WAY_ROW = #{cargoWayRow,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWayLine != null" >
+      <if test="cargoWayLine != null">
         VCI_CARGO_WAY_LINE = #{cargoWayLine,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWayNums != null" >
+      <if test="cargoWayNums != null">
         VCI_CARGO_WAY_NUMS = #{cargoWayNums,jdbcType=VARCHAR},
       </if>
-      <if test="productNums != null" >
+      <if test="productNums != null">
         VCI_PRODUCT_NUMS = #{productNums,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null" >
+      <if test="userId != null">
         VCI_USER_Id = #{userId,jdbcType=VARCHAR},
       </if>
-      <if test="sallPrice != null" >
+      <if test="sallPrice != null">
         VCI_SALL_PRICE = #{sallPrice,jdbcType=VARCHAR},
       </if>
-      <if test="gamePrice != null" >
+      <if test="gamePrice != null">
         VCI_GAME_PRICE = #{gamePrice,jdbcType=VARCHAR},
       </if>
-      <if test="costPrice != null" >
+      <if test="costPrice != null">
         VCI_COST_PRICE = #{costPrice,jdbcType=VARCHAR},
       </if>
-      <if test="isPromotion != null" >
+      <if test="isPromotion != null">
         VCI_IS_PROMOTION = #{isPromotion,jdbcType=CHAR},
       </if>
-      <if test="promotionPrice != null" >
+      <if test="promotionPrice != null">
         VCI_PROMOTION_PRICE = #{promotionPrice,jdbcType=VARCHAR},
       </if>
-      <if test="gameType != null" >
+      <if test="gameType != null">
         VCI_GAME_TYPE = #{gameType,jdbcType=VARCHAR},
       </if>
-      <if test="isFragile != null" >
+      <if test="isFragile != null">
         VCI_IS_FRAGILE = #{isFragile,jdbcType=CHAR},
       </if>
-      <if test="remarks != null" >
+      <if test="remarks != null">
         VCI_REMARKS = #{remarks,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null" >
+      <if test="createUser != null">
         VCI_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         VCI_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       </if>
-      <if test="modifyUser != null" >
+      <if test="modifyUser != null">
         VCI_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       </if>
-      <if test="modifyTime != null" >
+      <if test="modifyTime != null">
         VCI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
-      <if test="exeitState != null" >
+      <if test="exeitState != null">
         VCI_EXEIT_STATE = #{exeitState,jdbcType=CHAR},
       </if>
-      <if test="luck != null" >
+      <if test="luck != null">
         VCI_LUCK = #{luck,jdbcType=VARCHAR},
       </if>
+      <if test="accumulatedAmount != null">
+        VCI_ACCUMULATED_AMOUNT = #{accumulatedAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="drawAmount != null">
+        VCI_DRAW_AMOUNT = #{drawAmount,jdbcType=VARCHAR},
+      </if>
     </set>
     where VCI_ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmProEquRel" >
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.VmProEquRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -568,7 +596,9 @@
       VCI_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       VCI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       VCI_EXEIT_STATE = #{exeitState,jdbcType=CHAR},
-      VCI_LUCK = #{luck,jdbcType=VARCHAR}
+      VCI_LUCK = #{luck,jdbcType=VARCHAR},
+      VCI_ACCUMULATED_AMOUNT = #{accumulatedAmount,jdbcType=VARCHAR},
+      VCI_DRAW_AMOUNT = #{drawAmount,jdbcType=VARCHAR}
     where VCI_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -106,7 +106,10 @@
 		rel.VCI_CREATE_TIME 			'createTime',
 		us2.USR_NAME 					'modifyUser',
 		rel.VCI_MODIFY_TIME 			'modifyTime',
-		rel.VCI_EXEIT_STATE 			'perState'
+		rel.VCI_EXEIT_STATE 			'perState',
+		rel.VCI_EQUIPMENT_ID 			'equId',
+		rel.VCI_ACCUMULATED_AMOUNT		'accumulatedAmount',
+		rel.VCI_DRAW_AMOUNT				'drawAmount'
 		FROM
 		vm_pro_equ_rel rel
 		LEFT JOIN vm_equipment_inf equ
@@ -130,6 +133,9 @@
 		<if test="perId != null and perId != ''">
 			AND rel.VCI_ID = #{perId, jdbcType = VARCHAR}
 		</if>
+		<if test="branchId != null and branchId != ''">
+			AND rel.VCI_USER_Id = #{branchId, jdbcType = VARCHAR}
+		</if>
 		ORDER BY rel.VCI_CARGO_WAY_ROW DESC, rel.VCI_CARGO_WAY_LINE DESC
 	</select>
 	<select id="queryProductz" resultType="hashmap" parameterType="java.util.Map">
@@ -250,4 +256,69 @@
 		ON fb.IFB_FUNCTION_ID = ifb.IIF_ID
 		WHERE fb.IFB_BRANCH = #{branchId, jdbcType = VARCHAR}
 	</select>
+	<select id="queryProEquRelPage" resultType="hashmap"
+			parameterType="java.util.Map">
+		SELECT
+		rel.VCI_ID 					'perId',
+		rel.VCI_PRODUCT_ID 		    'proId',
+		pro.PRT_NAME 					'proName',
+		pro.PRT_FMPIC 				'proFmpic',
+		IFNULL(rel.VCI_AISLE,'') 		'aisle',
+		rel.VCI_CARGO_WAY_ROW 		'perRow',
+		rel.VCI_CARGO_WAY_LINE 		'perLine',
+		rel.VCI_CARGO_WAY_NUMS 		'perNum',
+		rel.VCI_PRODUCT_NUMS 			'numbers',
+		rel.VCI_USER_Id 				'userId',
+		rel.VCI_SALL_PRICE 			'sallPrice',
+		rel.VCI_GAME_PRICE 			'gamePrice',
+		rel.VCI_COST_PRICE 			'costPrice',
+		rel.VCI_IS_PROMOTION 			'isPromotton',
+		rel.VCI_PROMOTION_PRICE 		'promottonPrice',
+		rel.VCI_IS_FRAGILE 			'isFragile',
+		rel.VCI_REMARKS 				'perRemarks',
+		rel.VCI_GAME_TYPE 			'type',
+		us1.USR_NAME 					'createUser',
+		rel.VCI_CREATE_TIME 			'createTime',
+		us2.USR_NAME 					'modifyUser',
+		rel.VCI_MODIFY_TIME 			'modifyTime',
+		rel.VCI_EXEIT_STATE 			'perState',
+		rel.VCI_EQUIPMENT_ID 			'equId',
+		rel.VCI_ACCUMULATED_AMOUNT		'accumulatedAmount',
+		rel.VCI_DRAW_AMOUNT				'drawAmount',
+		equ.VEQ_IMEI_ADDR 				'imeiAddr'
+		FROM
+		vm_pro_equ_rel rel
+		LEFT JOIN vm_equipment_inf equ
+		ON equ.VEQ_ID = rel.VCI_EQUIPMENT_ID
+		AND equ.VEQ_CHANNEL = rel.VCI_CHANNEL
+		LEFT JOIN vm_product_inf pro
+		ON pro.PRT_ID = rel.VCI_PRODUCT_ID
+		AND pro.PRT_CHANNEL = rel.VCI_CHANNEL
+		AND pro.PRT_STATE != '2'
+		LEFT JOIN im_user us1
+		ON us1.USR_ID = rel.VCI_CREATE_USER
+		AND us1.USR_CHANNEL = rel.VCI_CHANNEL
+		LEFT JOIN im_user us2
+		ON us2.USR_ID = rel.VCI_MODIFY_USER
+		AND us2.USR_CHANNEL = rel.VCI_CHANNEL
+		WHERE  rel.VCI_CHANNEL = #{channel, jdbcType = VARCHAR}
+		AND rel.VCI_EXEIT_STATE !='02'
+		<if test="equId != null and equId != ''">
+			AND rel.VCI_EQUIPMENT_ID = #{equId, jdbcType = VARCHAR}
+		</if>
+		<if test="perId != null and perId != ''">
+			AND rel.VCI_ID = #{perId, jdbcType = VARCHAR}
+		</if>
+		<if test="branchId != null and branchId != ''">
+			AND equ.VEQ_BRANCHID = #{branchId, jdbcType = VARCHAR}
+		</if>
+		<if test="gameType != null and gameType != ''">
+			AND rel.VCI_GAME_TYPE = #{gameType, jdbcType = VARCHAR}
+		</if>
+		<if test="proName != null and proName != ''">
+			AND pro.PRT_NAME LIKE CONCAT("%",#{proName, jdbcType = VARCHAR},"%")
+		</if>
+		ORDER BY rel.VCI_CARGO_WAY_ROW DESC, rel.VCI_CARGO_WAY_LINE DESC
+	</select>
+
 </mapper>

src/main/webapp/admin/main.html

@@ -1,909 +1,20 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-	    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-	    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-	    <title>Document</title>
-	    <script src="../js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
-		<link rel="stylesheet" type="text/css" href="../css/modify.css" />
-		<link rel="stylesheet" type="text/css" href="../css/base.css" />
-		<link rel="stylesheet" type="text/css" href="../css/master.css" />
-		
-		<script src="../js/min-loader.js"></script>
-		<style type="text/css">
-			.ma-year .layui-edge{
-				background: url(../images/icon_xuanze.svg) no-repeat;
-				position: absolute;
-			    right: 4px;
-			    top: -6px;
-			    cursor: pointer;
-			    transition: none;
-			    -webkit-transition: none;
-			    margin-top: 0px;
-			    border-width: 14px;
-			    border-top-color: transparent;
-		        -webkit-transform: rotate(0deg);
-    			transform: rotate(0deg);
-			}
-			.ma-year .layui-form-select dl{
-				padding: 0;
-			    background: #E7F7FF;
-    			border-radius: 14px;
-   			    border: 1px solid #00A0E8;
-   			    color: #00A0E8;
-			}
-			.ma-year .layui-form-select dl dd.layui-this{
-				background:transparent;
-				color: #00A0E8;
-			}
-			.ma-year .layui-form-select dl dd:hover{
-				background:#00A0E8;
-				color: #fff;
-			}
-			.ma-year .layui-form-select dl dd.layui-select-tips{
-				background:#00A0E8;
-				color: #fff;
-			}
-		</style>
-		
-	</head>
-	<body>
-		<div class="i-index">
-			<div class="display4" style="margin: 0 1.7%;">
-				<div class="i-index-part display4" onclick = "goApproval()" style="cursor:pointer">
-					<div>
-						<p class="f30-black" id="waitApproval"></p>
-						<p class="f14-black4 mt8">总经理待审批订单（笔）</p>
-					</div>
-					<div class="yellow-back">
-						<img alt="" src="../images/icon_dai.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4" onclick = "goOrderManage()" style="cursor:pointer">
-					<div>
-						<p class="f30-black" id="approval">
-						</p>
-						<p class="f14-black4 mt8">历史审批通过订单（笔）</p>
-					</div>
-					<div class="lgreen-back">
-						<img alt="" src="../images/icon_tongguo.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4">
-					<div>
-						<p class="f30-black" id="TotalAmt">
-						</p>
-						<p class="f14-black4 mt8">签约合同总金额（万元）</p>
-					</div>
-					<div class="pink-back">
-						<img alt="" src="../images/icon_qianyue.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4">
-					<div>
-						<p class="f30-black" id="contract">
-						</p>
-						<p class="f14-black4 mt8">采购付汇金额（万元）</p>
-					</div>
-					<div class="cyan-back">
-						<img alt="" src="../images/icon_caigou.svg">
-					</div>
-				</div>
-				<div class="i-index-part display4" style="margin-right: 0;cursor:pointer" onclick = "goCapitalManage()">
-					<div>
-						<p class="f30-black" id="loaningAmt">
-						</p>
-						<p class="f14-black4 mt8">垫资总金额（万元）</p>
-					</div>
-					<div class="purple-back">
-						<img alt="" src="../images/icon_dianzi.svg">
-					</div>
-				</div>
-			</div>
-			<div class="display ma-part" onclick = "goRiskWarning()" style="cursor:pointer;">
-				<div class="display2 ma-part-title">
-					<img alt="" src="../images/icon_yujing.svg">
-					<div class="ma-title">
-						<p class="f14-black-w">风险预警</p>
-						<div class="ma-title-num" id = "overDayNum">3</div>
-					</div>
-				</div>
-				<marquee behavior="scroll" direction="down" scrolldelay="1100" id="riskWarning">
-					<!-- <div class="display3 ma-risk-content" style="float: left">
-						<div class="ma-risk-line"></div>
-						<div>
-							<span class="f12-blue">进入宽限期</span>
-							<span class="f12-gray2">融资订单号：</span>
-							<span class="f12-red2">RZ001</span>
-							<span class="f12-gray2">企业名称:北京天天其速度有限公司</span>
-						</div>
-					</div>
-					<div class="display3 ma-risk-content">
-						<div class="ma-risk-line"></div>
-						<div>
-							<span class="f12-blue">进入宽限期</span>
-							<span class="f12-gray2">融资订单号：</span>
-							<span class="f12-red2">RZ001</span>
-							<span class="f12-gray2">企业名称:北京天天其速度有限公司</span>
-						</div>
-					</div> -->
-				</marquee>
-			</div>
-			
-			<div class="flex-j-sb">
-				<div class="i-left">
-					<div class="ma-currency-title display4">
-						<span>业务趋势</span>
-						<div class="display ma-year">
-							<form class="layui-form" action="">
-								<div class="layui-input-inline">
-							        <select name="modules" lay-verify="required" lay-search="" lay-filter="orderYearSelect" id = "orderYearSelect">
-							        </select>
-						    	</div>
-							</form>
-							<!-- <img alt="" src="../images/icon_xuanze.svg"> -->
-						</div>
-					</div>
-					<div class="display4 ma-subtitle">
-						<span class="f12-black5">本趋势图以订单内签约合同金额为数据来源</span>
-						<div>
-							<span class="f12-gray5">本年总额（万元）：</span>
-							<span class="f18-black" id = "yearTotalAmt">4106</span>
-						</div>
-					</div>
-					<div class="" id="zhe" style="height: calc(100% - 102px);width: calc(100% - 16px);"></div>
-				</div>
-				<div class="i-right">
-					<div class="i-right-body" style="height: 276px;">
-						<div class="ma-currency-title display4">
-							<span>财务统计</span>
-							<div class="display ma-year">
-								<form class="layui-form" action="">
-									<div class="layui-input-inline">
-								        <select name="modules" lay-verify="required" lay-search="" lay-filter="financeYear" id = "financeYear">
-								        </select>
-							    	</div>
-								</form>
-								<!-- <img alt="" src="../images/icon_xuanze.svg"> -->
-							</div>
-						</div>
-						<div class="m-unit mt16">单位:万元</div>
-						<div class="" id="yuan" style="height: 195px;width: 100%;"></div>
-						<!-- <div class="i-r-up-content" id="riskWarning" style="height: 12rem">
-							<div class="">
-								<span class="f12-black4">【逾期预警】</span><span class="f12-gray2">融资订单编号: </span><span class="f12-red2">RZ001</span><span class="f12-gray2">企业名称:XX有限</span>
-							</div>
-						</div> -->
-					</div>
-					<div class="i-right-body mt16" style="height: 287px;">
-						<div class="ma-currency-title">
-							用户统计
-						</div>
-						<div class="display4 mt16">
-							<div class="ml16">
-								<span class="f18-black" id = "companyStt02">已实名认证：0</span>
-								<span class="f18-black ml24" id = "companyStt06">已授信成功：0</span>
-							</div>
-							<div class="m-unit">单位:个</div>
-						</div>
-						<div class="" id="ma-user" style="height: 204px"></div>
-					</div>
-				</div>
-			</div>
-			<div class="ma-bottom-part">
-				<!-- <div class="ma-currency-title">操作日志</div> -->
-				<div class="display4 ma-currency-title">
-					<div class="display2">
-						<div class="currency-line black-line"></div>
-						<div class="f14-black-w">操作日志</div>
-					</div>
-					<a id="toggle" class="open">展开</a>
-				</div>
-				<div class="" id="rizhi" style="display: none;">
-					<div class="i-r-d-content flex-wrap" id="operationLog" style="height: 330px"></div>
-				</div>
-			</div>
-		</div>
-		<div class='footer' style="color: #000073;width: 100%;text-align: center;background: #f7f7f7;height: 100px;line-height: 100px"></div>
-		<script type="text/javascript">
-		layui.use('layer', function(){
-			  var layer = layui.layer;
-			  loadingId = layer.msg('处理中...', {icon: 16,shade: [0.5, '#f5f5f5'],scrollbar: false,offset: 'auto', time:2000}) ;  
-		});
-		$("#toggle").click(function() {
-			$(this).html($("#rizhi").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开");
-			$("#rizhi").slideToggle();
-		});
-		$('.footer').load('./common/footer.html');
-			layui.use('form', function(){
-				layer.close(loadingId);  
-				var form = layui.form;
-				$.request({
-		       		action : '../../HomeInfoManageAction/queryDataStatistics',
-		       		data : {
-		       		},
-		       		success : function(rsp){
-		       			//总经理待审批订单（笔)
-		       			$("#waitApproval").html(rsp.data.waitApproval);
-		       			//历史审批通过订单（笔)
-		       			$("#approval").html(rsp.data.approval);
-		       			//签约合同总金额（万元）
-		       			$("#TotalAmt").html(rsp.data.TotalAmt);
-		       			//采购付汇金额（万元）
-		       			$("#contract").html(rsp.data.contract);
-		       			//垫资总金额（万元）
-		       			$("#loaningAmt").html(rsp.data.loaningAmt);
-		       			var companyList = rsp.data.companyInfoList;
-		       			for (var i = 0; i < companyList.length; i ++) {
-		       				if (companyList[i].stt == '02') {
-		       					$("#companyStt02").html($("#companyStt02").html().replace('0',parseInt(companyList[0].num) + parseInt(companyList[1].num)));
-		       				} else {
-		       					$("#companyStt06").html($("#companyStt06").html().replace('0',companyList[i].num));
-		       				}
-		       			}
-		       			
-		       			var yearHtml = '';
-		       			var yearList = rsp.data.yearList;
-		       			
-		       			var myDate = new Date();
-		       		    var tYear = myDate.getFullYear();
-		       		    var ifYear = true;
-		       		    
-		       			for (var i = 0; i < yearList.length; i ++) {
-		       				if (tYear == yearList[i]) {
-		       					ifYear = false;
-		       					yearHtml += '<option value="'+yearList[i]+'" selected="selected">'+yearList[i]+'</option>';
-		       				} else {
-		       					yearHtml += '<option value="'+yearList[i]+'">'+yearList[i]+'</option>';
-		       				}
-		       			}
-		       			
-		       			if (ifYear) {
-		       				yearHtml += '<option value="'+tYear+'" selected>'+tYear+'</option>';
-		       			}
-		       			
-		       			$("#orderYearSelect").html(yearHtml);
-		       			yearHtml = yearHtml.replace('selected','');
-		       			yearHtml += '<option value=null selected>全部</option>';
-		       			$("#financeYear").html(yearHtml);
-		       		    
-		       			// 查询订单数据
-		       			orderQuery(tYear);
-		       			financeMessage('');
-		       			form.on('select(orderYearSelect)', function (data) {
-							orderQuery(data.value);
-		       			});
-		       			form.on('select(financeYear)', function (data) {
-		       				financeMessage(data.value);
-		       			});
-		       			
-		       			var companyData = rsp.data.companyData;
-		       			companyMessage(companyData);
-// 		       			$("#countUser").text(rsp.data.countUser);
-// 		       			$("#financingNum").text(rsp.data.financingNum);
-// 		       			$("#loansNum").text(rsp.data.loansNum);
-// 		       			$("#repaymentsNum").text(rsp.data.repaymentsNum);
-		       			$("#overDayNum").text(rsp.data.overDayNum);
-// 		       			$("#todaysData").text(rsp.data.currentDate);
-		       			
-		 				var overDayOrder = rsp.data.overDayOrder;//逾期订单
-		 				var htmlWarning ="";
-		 				for(var i=0; i<overDayOrder.length; i++){
-		   					var riskWarning = overDayOrder[i];
-		   					var orderno = riskWarning.orderno;
-		   					var comName = riskWarning.comName;
-		   					var comId = riskWarning.comId;
-		   					
-		   	   				var div = '<div class="display3 ma-risk-content" style="float: left" id="'+orderno+'" onclick="turnOrderDetail(this);">'+
-											'<div class="ma-risk-line"></div>'+
-											'<div>'+
-												'<span class="f12-blue">进入宽限期</span>'+
-												'<span class="f12-gray2">融资订单号：</span>'+
-												'<span class="f12-red2">'+orderno+'</span>'+
-												'<span class="f12-gray2">企业名称:'+comName+'</span>'+
-											'</div>'+
-										'</div>';
-							htmlWarning += div;
-		   				}
-		 				$("#riskWarning").html(htmlWarning);
-		 				
-// 						$("#countYearUser").text(rsp.data.countYearUser);//本年
-// 						$("#countMonthUser").text(rsp.data.countMonthUser);//本月
-// 						$("#countWeekUser").text(rsp.data.countWeekUser);//本周
-// 						var todayNum = rsp.data.todayNum;//本周周几
-// 		 				var weekdayList = rsp.data.weekdayList;//本周新增
-		 				/* barChart(weekdayList,todayNum); */
-		 				
-// 						var finList = rsp.data.finList;//融资订单统计
-						/* pieChartFun(finList); */
-						
-		 				//每日新增融资订单笔数
-// 		 				var resFinList = rsp.data.resFinList;//每日新增融资订单笔数
-// 		 				lineChart(resFinList);
-						
-		 				//操作日志
-		 				var logList = rsp.data.logList;//操作日志
-		 				var htmlLog = "";
-		 				var color = ["ma-name-blue","ma-name-purple","ma-name-green","ma-name-green","ma-name-yellow","ma-name-blue","ma-name-red","ma-name-cyan"];
-		 				for(var i=0; i<logList.length; i++){
-		   					var operationLog = logList[i];
-		   					var logno = operationLog.logno;//日志编号
-// 		   					var loginfo = operationLog.loginfo.substring(0, 20);//内容
-		   					var loginfo = operationLog.loginfo;//内容
-		   					var logtime = operationLog.logtime;//时间
-		   					var logname = operationLog.logname;//功能
-		   					var rolname = operationLog.rolname;//角色
-		   					var username = operationLog.username;//用户
-		   					
-		   					htmlLog += '<div class="rizhi" id="" style="display: flex;">'+
-						   							'<div class="d-part2 flex-fa-c">'+
-													'<div class="ma-name '+color[i]+'">' + username.substring(0,1) + '</div>'+
-													'<div class="d-line"></div>'+
-											'</div>'+
-												'<div class="d-part3">'+
-													'<div class="">'+
-														'<span class="f14-black-w mr8">' + username + '</span>'+
-														'<span class="f12-gray2 mr8">'+rolname+'</span>';
-// 														'<span class="f12-gray2 mr4">操作员：吴迪，</span>'+
-														if (i == 0 || i == 1 || i == 4 || i == 5) {
-															htmlLog += '<span class="f12-green2">'+loginfo+'</span>';
-														} else {
-															htmlLog += '<span class="f12-red3">'+loginfo+'</span>';
-														}
-										htmlLog += '</div>'+
-						   							'<div class="display2 mt16">'+
-					   	   							'<div class="f12-gray2 mr8">'+logtime+'</div>'+
-						   	   						'<div class="f12-gray2">'+logname+'</div>'+
-						   							'</div>'+
-												'</div>'+
-										'</div>';
-		   				}
-		 				$("#operationLog").html(htmlLog);
-		 				form.render();
-		       		},
-		       		error : function(data) {
-		       		}
-		       	}); 
-			});
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>Document</title>
+	<script src="../js/echarts.min.js" type="text/javascript" charset="utf-8"></script>
+	<link rel="stylesheet" type="text/css" href="../css/modify.css" />
+	<link rel="stylesheet" type="text/css" href="../css/base.css" />
+	<link rel="stylesheet" type="text/css" href="../css/master.css" />
+
+	<script src="../js/min-loader.js"></script>
 
-		//转百分数
-		function toPercent(point){
-		    var str=Number(point*100).toFixed(2);
-		    str+="%";
-		    return str;
-		}
-		
-		/* function pieChartFun(finList) {
-			var approvalNum = finList.approvalNum;//审批
-			var loanNum = finList.loanNum;//放款
-			var finishNum = finList.finishNum;//还款
-			var overdueNum = finList.overdueNum;//逾期
-			//计算比例
-			var sumOrder = approvalNum+loanNum+finishNum+overdueNum;
-			
-			var scaleApp = '0.00%';
-			var scaleLoan = '0.00%';
-			var scaleFin = '0.00%';
-			var scaleOver = '0.00%';
-			if(sumOrder != 0) {
-				scaleApp = toPercent(approvalNum/sumOrder);
-				scaleLoan = toPercent(loanNum/sumOrder);
-				scaleFin = toPercent(finishNum/sumOrder);
-				scaleOver = toPercent(overdueNum/sumOrder);
-			} */
-			
-// 			var i = 0;
-			/* var colors = ['#00A0E8', '#37C07D', '#F9564F', '#FC9E43', '#666FE9']; */
-			function financeMessage(year) {
-				$.request({
-		       		action : '../../HomeInfoManageAction/queryHomeFianaceData',
-		       		data : {
-		       			year : year
-		       		},
-		       		success : function(rsp){
-		       			var data = rsp.data;
-		       			var myChart2 = echarts.init(document.getElementById('yuan'));
-		       			myChart2.clear();
-		       			var total = 0;
-		       			for (var i = 0; i < data.length; i ++) {
-		       				data[i].value = fomatFloat(data[i].value,2);
-		       				if (data[i].value.substr(0,1) != '-') {
-		       					data[i].flag = '';
-		       				} else {
-		       					data[i].value = data[i].value.replace('-','');
-		       					data[i].flag = '-';
-		       				}
-		       				total += parseFloat(data[i].value);
-		       			}
-						// app.title = '环形图';
-						/* var data = [{
-								value: 234,
-								name: '总收入',
-							},
-							{
-								value: 456,
-								name: '预付款',
-							},
-							{
-								value: 789,
-								name: '总支出',
-							},
-							{
-								value: 542,
-								name: '应　收',
-							},
-							{
-								value: 987,
-								name: '盈　利',
-							}
-						] */
-						var option = {
-							tooltip: {
-								trigger: 'item',
-								formatter: "{a} <br/>{b}: {c} ({d}%)",
-								extraCssText: 'line-height:30px;background: rgba(0,0,0,0.75);box-shadow: 0 2px 8px 0 rgba(0,0,0,0.15);padding:16px;'
-							},
-							legend: {
-								orient: 'vertical',
-								left: '54%', //图例距离左的距离
-								y: 'center', //图例上下居中
-								data: ['总收入', '预付款', '总支出', '应　收', '盈　利'],
-								icon: "circle",
-								itemWidth: 6, // 图例图形宽度
-								itemHeight: 6,
-								itemGap: 0,
-								formatter: function(name) {
-									let target;
-									for (let i = 0; i < data.length; i++) {
-										if (data[i].name === name) {
-											target = data[i].flag + data[i].value,
-												percent = fomatFloat(data[i].value/total,2)
-										}
-									}
-									let arr = ["{a|" + name + "}" + "{b|" + "|" + "}" + "{c|"+ "}" + "{d|" + $.toCashWithComma(fomatFloat(target,6)) + "}"]
-									return arr
-								},
-								textStyle: {
-									rich: {
-										a: {
-											fontSize: 14,
-											color: "rgba(0,0,0,0.65)",
-											padding: 5
-										},
-										b: {
-											fontSize: 10,
-											color: "#D9D9D9",
-											padding: 5,
-										},
-										c: {
-											fontSize: 14,
-											color: "rgba(0,0,0,0.45)",
-										},
-										d: {
-											fontSize: 14,
-											color: "rgba(0,0,0,0.65)",
-											padding: 10,
-										},
-									}
-								}
-							},
-							series: [{
-								name: '融资订单',
-								type: 'pie',
-								radius: ['60%', '80%'],
-								center: ['30%', '50%'], //图的位置，距离左跟上的位置
-								avoidLabelOverlap: false,
-								itemStyle: {
-									normal: {
-										color:function(params) {
-			                                //自定义颜色
-			                                var colorList = ['#00A0E8', '#37C07D', '#F9564F', '#FC9E43', '#666FE9'];
-			                                    return colorList[params.dataIndex]
-			                                 }
-									},
-								},
-								label: {
-									normal: {
-										show: false,
-										position: 'center'
-									},
-									emphasis: {
-										show: true,
-										textStyle: {
-											fontSize: '20',
-											fontWeight: 'bold'
-										}
-									}
-								},
-								labelLine: {
-									normal: {
-										show: false
-									}
-								},
-								data: data
-							}]
-						};
-						myChart2.setOption(option);
-						var index = 0;
-						myChart2.dispatchAction({
-					          type: 'highlight',
-					          seriesIndex: 0,
-					          dataIndex: 0
-					        });
-				        myChart2.on("mouseover", function(e) {
-				            if (e.dataIndex != index) {
-				              myChart2.dispatchAction({
-				                type: "downplay",
-				                seriesIndex: 0,
-				                dataIndex: index
-				              });
-				            }
-				          });
-				          myChart2.on("mouseout", function(e) {
-				            index = e.dataIndex;
-				            myChart2.dispatchAction({
-				              type: "highlight",
-				              seriesIndex: 0,
-				              dataIndex: e.dataIndex
-				            });
-				          });
-		       		},
-		       		error : function () {
-		       		}
-				})	
-			}
-			
 
-		function companyMessage(companyData) {
-			var levelArray = ['A','B','C','D'];
-			var data = new Array();
-			var totalNum = 0;
-			for (var j = 0; j < levelArray.length; j ++) {
-				var one = {};
-				one.name = '信用评级：'+levelArray[j]+'级';
-				for (var i = 0; i < companyData.length; i ++) {
-					if (levelArray[j] == companyData[i].gradeLevel) {
-						one.value = companyData[i].num;
-						break;
-					}
-				}
-				if (isEmpty(one.value)) {
-					one.value = '0';
-				}
-				data.push(one);
-				totalNum = totalNum + parseInt(one.value);
-			}
-			for (var i = 0; i < data.length; i ++) {
-				var one = data[i];
-				one.percenter = toPercent(parseInt(one.value)/totalNum);
-			}
-			var myChart3 = echarts.init(document.getElementById('ma-user'));
-			/* var data = [{
-					value: 335,
-					name: '信用评级：A级',
-					percenter: '10%',
-				},
-				{
-					value: 310,
-					name: '信用评级：B级',
-					percenter: '10%',
-				},
-				{
-					value: 234,
-					name: '信用评级：C级',
-					percenter: '10%',
-				},
-				{
-					value: 135,
-					name: '信用评级：D级',
-					percenter: '10%',
-				}
-			] */
-			var	option = {
-				    tooltip : {
-				        trigger: 'item',
-				        formatter: "{a} <br/>{b} : {c} ({d}%)",
-				        extraCssText: 'line-height:30px;background: rgba(0,0,0,0.75);box-shadow: 0 2px 8px 0 rgba(0,0,0,0.15);padding:16px;'
-				    },
-				    legend: {
-				    	orient: 'vertical',
-						left: '8%', //图例距离左的距离
-						y: 'center', //图例上下居中
-						data: ['信用评级：A级', '信用评级：B级', '信用评级：C级', '信用评级：D级'],
-						formatter: function(name) {
-							let target;
-							let percent;
-							for (let i = 0; i < data.length; i++) {
-								if (data[i].name === name) {
-									target = data[i].value,
-										percent = data[i].percenter
-								}
-							}
-							let arr = ["{a|" + name + "}" + "{b|" + "|" + "}" + "{c|" + target + "}" + "{d|" + percent + "}"]
-							return arr
 
-						},
-						textStyle: {
-							rich: {
-								a: {
-									fontSize: 14,
-									color: "rgba(0,0,0,0.65)",
-									padding: 5
-								},
-								b: {
-									fontSize: 10,
-									color: "#D9D9D9",
-									padding: 5,
-								},
-								c: {
-									fontSize: 14,
-									color: "rgba(0,0,0,0.45)",
-								},
-								d: {
-									fontSize: 14,
-									color: "rgba(0,0,0,0.65)",
-									padding: 10,
-								},
-							}
-						}
-				    },
-				    series : [{
-				    	name: '用户统计',
-				            type: 'pie',
-				            radius : '65%',
-				            center: ['80%', '50%'],
-				            selectedMode: 'single',
-				            avoidLabelOverlap: false,
-				            labelLine: {    //引导线设置
-				                 normal: {
-				                      show: false,   //引导线显示
-				                 }
-				           },
-				           label: {
-								normal: {
-									show: false,
-								},
-								emphasis: {
-									show: false,
-								}
-							},
-				            /* data:[
-								{name: '信用评级：A级', value:535},
-				                {name: '信用评级：B级', value:535},
-				                {name: '信用评级：C级',value:510},
-				                {name: '信用评级：D级',value:634},
-				            ], */
-				            data : data,
-				            /* itemStyle: {
-				                emphasis: {
-				                    shadowBlur: 10,
-				                    shadowOffsetX: 0,
-				                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-				                }
-				            } */
-				            itemStyle: {
-								normal: {
-									color:function(params) {
-		                                //自定义颜色
-		                                var colorList = ['#37C07D', '#FC9E43', '#F9564F', '#666FE9'];
-		                                    return colorList[params.dataIndex]
-		                                 }
-								},
-							},
-				        }
-				    ]
-				};
-				myChart3.setOption(option);
-				
-				var index = 0;
-				myChart3.dispatchAction({
-			          type: 'highlight',
-			          seriesIndex: 0,
-			          dataIndex: 0
-			        });
-		        myChart3.on("mouseover", function(e) {
-		            if (e.dataIndex != index) {
-		              myChart3.dispatchAction({
-		                type: "downplay",
-		                seriesIndex: 0,
-		                dataIndex: index
-		              });
-		            }
-		          });
-		          myChart3.on("mouseout", function(e) {
-		            index = e.dataIndex;
-		            myChart3.dispatchAction({
-		              type: "highlight",
-		              seriesIndex: 0,
-		              dataIndex: e.dataIndex
-		            });
-		          });
-		}
-		
-			
-			function goApproval(){
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[2]).addClass("layui-this");
-				window.parent.oneMenuClick("M21000",false,"212006");
-			}
-			function goOrderManage(){
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[2]).addClass("layui-this");
-				setTempVal("mainOrderState","04");
-				$($("#oneMenu", window.parent.document).find("a")[2]).click();
-			}
-			function goCapitalManage(){
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[1]).addClass("layui-this");
-				window.parent.oneMenuClick("M11000",false,"112001");
-			}
-			function goRiskWarning(){	//无权限
-				$($("#oneMenu", window.parent.document).find("li")[0]).removeClass("layui-this");
-				$($("#oneMenu", window.parent.document).find("li")[2]).addClass("layui-this");
-				window.parent.oneMenuClick("M21000",false,"215001");
-			}
-			
-			function orderQuery(year) {
-				$.request({
-		       		action : '../../HomeInfoManageAction/queryHomeOrderData',
-		       		data : {
-		       			year : year
-		       		},
-		       		success : function(rsp){
-		       			var totalAmt = rsp.totalAmt;
-		       			if (isEmpty(totalAmt)) {
-		       				totalAmt = '0.00';
-		       			}
-		       			totalAmt = fomatFloat(totalAmt,2)
-		       			$("#yearTotalAmt").html($.toCashWithComma(totalAmt));
-	       				var myChart1 = echarts.init(document.getElementById('zhe'));
-	       	          	
-	       	          //计算最大值
-	       	            function calMax(el) {
-	       	              let max = 0;
-// 	       	              arr.forEach((el) => {
-	       	                el.forEach((el1) => {
-	       	                  if (!isEmpty(el1)) {
-	       	                    if (parseFloat(max) < parseFloat(el1)) {
-	       	                      max = el1;
-	       	                    }
-	       	                  }
-	       	                })
-// 	       	              })
-	       	              let maxint = Math.ceil(max / 9.5);//不让最高的值超过最上面的刻度
-	       	              let maxval = maxint * 10;//让显示的刻度是整数
-	       	              return maxval;
-	       	            }
-	       	           
-	       	            //计算最小值
-	       	            function calMin(el) {
-	       	              let min = 0;
-// 	       	              arr.forEach((el) => {
-	       	                el.forEach((el1) => {
-	       	                  if (!isEmpty(el1)) {
-	       	                    if (parseFloat(min) > parseFloat(el1)) {
-	       	                      min = el1;
-	       	                    }
-	       	                  }
-	       	                })
-// 	       	              })
-	       	              let minint = Math.floor(min / 10);
-	       	              let minval = minint * 10;//让显示的刻度是整数
-	       	              return minval;
-	       	            }
-	       	            
-	       	         	var data1 = new Array();
-	       	         	var data2 = new Array();
-	       	         	var data3 = new Array();
-	       	            
-	       	            var orderData = rsp.data;
-	       	            var monthNear = rsp.monthNear;
-	       	         	monthNear = monthNear.replace('(','');
-	       	         	monthNear = monthNear.replace(')','');
-	       	         	monthNear = monthNear.replace(/\'/g,"");
-	       	         	var monthNearArray = monthNear.split(",");
-	       	         	for (var i = 0; i < monthNearArray.length; i ++) {
-	       	         		var amt = "0.00";
-	       	         		var num = "0.00";
-	       	         		var month = monthNearArray[11-i];
-		       	         	for (var j = 0; j < orderData.length;  j++) {
-		       	         		if (orderData[j].createDate == month) {
-		       	         			amt = currKeepTwo(fomatFloat(orderData[j].amt,6));
-		       	         			num = orderData[j].num;
-		       	         			break;
-		       	         		}
-		       	            }
-		       	        	data1.push(amt);
-		       	        	data3.push(num);
-		       	        	data2.push(month.substr(-2) + "月");
-	       	         	}
-// 	       	            var data1 = [250, 300, 350, 500, 600, 700, 750, 650, 550, 400, 450, 250],
-// 	       	              data3 = [250, 300, 350, 500, 600, 700, 750, 650, 550, 400, 450, 250],
-	       	           
-       	                var Min1 = calMin(data1), Min2 = calMin(data3),
-       	                Max1 = calMax(data1), Max2 = calMax(data3);
-	       	            var option = {
-	       	              grid: {left: '46', right: '46', bottom: '36', top: '50'},
-	       	              color: ['#00A0E8', '#2FC25B'],
-	       	              /* tooltip: {trigger: 'axis', axisPointer: {type: 'cross', crossStyle: {color: '#999'}}}, */
-	       	              tooltip: {
-	       					 trigger: 'axis',
-	       					 /* formatter: "{b}<br/>新增融资订单笔数：{c}", */
-	       					 extraCssText: 'line-height:30px;background: rgba(0,0,0,0.75);box-shadow: 0 2px 8px 0 rgba(0,0,0,0.15);padding:16px;'
-	       				  },
-	       	              legend: {data: ['融资订单笔数', '融资订单金额']},
-	       	              xAxis: [{
-	       	                type: 'category',
-	       	                axisLabel: {color: "#000"},
-	       	                lineWidth: 0,
-	       	                /* axisPointer: {
-	       	                  type: 'shadow'
-	       	                }, */
-	       	                axisLine: {
-	       						lineStyle: {
-	       							color: '#D9D9D9',
-	       							width: 1,
-	       						}
-	       					},
-	       	                data: data2,
-	       	              }],
-	       	              yAxis: [
-							{
-						       name: '单位：笔',
-						       type: 'value',
-						       nameTextStyle: {color: '#999999'},
-						       axisLine: {show: false},
-						       axisTick: {show: false},
-						       axisLabel: {verticalAlign: "bottom", color: "#999999"},
-						       splitLine: {
-									lineStyle: { //x网格线
-										color: '#E9E9E9',
-										type: 'dashed'
-									}
-								},
-						       
-						       	min: Min2,
-		       	                max: Max2,
-		       	                splitNumber: 10,
-		       	                interval: (Max2 - Min2) / 10
-						     },        
-	       	              {
-	       	                name: '单位：万元',
-	       	                nameTextStyle: {color: '#999999'},
-	       	                type: "value",
-	       	                axisLine: {show: false},
-	       	                axisTick: {show: false},
-	       	                axisLabel: {verticalAlign: "bottom", color: "#999999"},
-	       					splitLine: {
-	       						lineStyle: { //x网格线
-	       							color: '#E9E9E9',
-	       							type: 'dashed'
-	       						}
-	       					},
-	       					min: Min1,
-					       	max: Max1,
-					       	splitNumber: 10,
-					       	interval: (Max1 - Min1) / 10
-	       	              }],
-	       	              series: [
-	       	                		{name: '融资订单笔数', type: 'bar', barGap: 0, barWidth: 30, data: data3, barWidth : 24},
-	       	                		{name: '融资订单金额', type: 'line', yAxisIndex: 1, data: data1},
-	       	              ]
-	       	            };
-	       				// 使用刚指定的配置项和数据显示图表。
-	       				myChart1.setOption(option);
-		       		},
-		       		error : function(data) {
-		       		}
-		       	}); 
-			}
-			
-			function turnOrderDetail(obj) {
-				var orderno = obj.id;
-				layui.sessionData("ROW_DATA", {key:"NOW_ROW", value : orderno});
-				openMainTabPage('215003-02', ' 订单详情', 'orderManage/details.html', '', '-1');
-			}
-		</script>
+	</head>
 	</body>
-</html>
+
+</html>