1
0
panhui 7 лет назад
Родитель
Сommit
51ca19e847

+ 33 - 0
src/main/java/com/izouma/awesomeadmin/dao/CreditRatingMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.CreditRating;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.CreditRatingMapper")
+public interface CreditRatingMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(CreditRating record);
+
+    CreditRating selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(CreditRating record);
+
+    List<CreditRating> queryAllCreditRating(CreditRating record);
+
+    List<CreditRating> queryCreditRatingByPage(Map<String, Object> parameter);
+
+    int delete(CreditRating record);
+
+    CreditRating queryCreditRating(CreditRating record);
+
+    List<CreditRating> query(CreditRating record);
+}
+

+ 390 - 0
src/main/java/com/izouma/awesomeadmin/dao/CreditRatingMapper.xml

@@ -0,0 +1,390 @@
+<?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.izouma.awesomeadmin.dao.CreditRatingMapper" >
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.CreditRating" >
+                <id column="id" property="id" jdbcType="INTEGER" />
+                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
+                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
+                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+                                <result column="credit" property="credit" jdbcType="VARCHAR" />
+                                <result column="remark" property="remark" jdbcType="VARCHAR" />
+                                <result column="rank" property="rank" jdbcType="INTEGER" />
+            </resultMap>
+    <sql id="Base_Column_List" >
+        <trim  suffixOverrides="," >
+            id,
+
+            del_flag,
+
+            update_time,
+
+            update_user,
+
+            create_time,
+
+            create_user,
+
+            credit,
+
+            remark,
+
+            rank,
+
+            </trim>
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from credit_rating
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from credit_rating
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.CreditRating" useGeneratedKeys="true" keyProperty="id">
+        insert into credit_rating
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id!= null" >
+                id,
+            </if>
+                <if test="delFlag!= null" >
+                del_flag,
+            </if>
+                <if test="updateTime!= null" >
+                update_time,
+            </if>
+                <if test="updateUser!= null" >
+                update_user,
+            </if>
+                <if test="createTime!= null" >
+                create_time,
+            </if>
+                <if test="createUser!= null" >
+                create_user,
+            </if>
+                <if test="credit!= null" >
+                credit,
+            </if>
+                <if test="remark!= null" >
+                remark,
+            </if>
+                <if test="rank!= null" >
+                rank,
+            </if>
+            </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+                    <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+                    <if test="delFlag != null" >
+                #{delFlag,jdbcType=CHAR},
+            </if>
+                    <if test="updateTime != null" >
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="updateUser != null" >
+                #{updateUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                    <if test="createUser != null" >
+                #{createUser,jdbcType=VARCHAR},
+            </if>
+                    <if test="credit != null" >
+                #{credit,jdbcType=VARCHAR},
+            </if>
+                    <if test="remark != null" >
+                #{remark,jdbcType=VARCHAR},
+            </if>
+                    <if test="rank != null" >
+                #{rank,jdbcType=INTEGER},
+            </if>
+                </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.CreditRating" >
+        update credit_rating
+        <set >
+                    <if test="id != null" >
+               id= #{id,jdbcType=INTEGER},
+            </if>
+                     <if test="delFlag != null" >
+               del_flag= #{delFlag,jdbcType=CHAR},
+            </if>
+                     <if test="updateTime != null" >
+               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="updateUser != null" >
+               update_user= #{updateUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="createTime != null" >
+               create_time= #{createTime,jdbcType=TIMESTAMP},
+            </if>
+                     <if test="createUser != null" >
+               create_user= #{createUser,jdbcType=VARCHAR},
+            </if>
+                     <if test="credit != null" >
+               credit= #{credit,jdbcType=VARCHAR},
+            </if>
+                     <if test="remark != null" >
+               remark= #{remark,jdbcType=VARCHAR},
+            </if>
+                     <if test="rank != null" >
+               rank= #{rank,jdbcType=INTEGER},
+            </if>
+                 </set>
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+
+    </update>
+    <select id="queryCreditRatingByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
+        select <include refid="Base_Column_List"/> from credit_rating
+        <where>
+            and del_flag = 'N'
+            <if test="record.idStr != null and !&quot;&quot;.equals(record.idStr)">
+                and id in (${record.idStr})
+            </if>
+                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and  id = #{record.id}
+            </if>
+                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and  del_flag = #{record.delFlag}
+            </if>
+                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and  update_time = #{record.updateTime}
+            </if>
+                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and  update_user = #{record.updateUser}
+            </if>
+                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and  create_time = #{record.createTime}
+            </if>
+                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and  create_user = #{record.createUser}
+            </if>
+                     <if test="record.credit != null and !&quot;&quot;.equals(record.credit)">
+                and  credit = #{record.credit}
+            </if>
+                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and  remark = #{record.remark}
+            </if>
+                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and  rank = #{record.rank}
+            </if>
+                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  credit LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  rank LIKE concat('%',#{record.searchKey},'%')
+                                                             </trim>
+         </if>
+
+            <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
+                <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </otherwise>
+                    </choose>
+
+
+                </foreach>
+
+
+            </if>
+
+        </where>
+        order by
+
+        <if test="record.orderByStr != null and !&quot;&quot;.equals(record.orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="record.orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+        rank desc,id desc
+    </select>
+    <select id="queryAllCreditRating" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
+        select <include refid="Base_Column_List"/> from credit_rating
+        <where>
+            and del_flag = 'N'
+            <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+                and id in (${idStr})
+            </if>
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and  id = #{id}
+            </if>
+                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and  del_flag = #{delFlag}
+            </if>
+                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and  update_time = #{updateTime}
+            </if>
+                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and  update_user = #{updateUser}
+            </if>
+                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and  create_time = #{createTime}
+            </if>
+                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and  create_user = #{createUser}
+            </if>
+                    <if test="credit != null and !&quot;&quot;.equals(credit)">
+                and  credit = #{credit}
+            </if>
+                    <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and  remark = #{remark}
+            </if>
+                    <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and  rank = #{rank}
+            </if>
+                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  credit LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
+                                                                                        </trim>
+            </if>
+<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+        <choose>
+            <when test="item.indexOf('like') != -1">
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        concat('%',#{itemDetail},'%')
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </when>
+            <otherwise>
+                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                    <if test="detailIndex == 3">
+                        #{itemDetail}
+                    </if>
+
+                    <if test="detailIndex &lt; 3">
+                        ${itemDetail}
+                    </if>
+
+                </foreach>
+            </otherwise>
+        </choose>
+
+
+    </foreach>
+
+
+</if>
+        </where>
+        order by
+
+        <if test="orderByStr != null and !&quot;&quot;.equals(orderByStr)">
+
+
+            <trim suffixOverrides=",">
+                <foreach item="item" index="index" separator="," collection="orderByStr.split('_;')">
+                    <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                        ${itemDetail}
+                    </foreach>
+                </foreach>
+            </trim>
+            ,
+        </if>
+
+        rank desc, id desc
+    </select>
+    <select id="queryCreditRating" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
+        select <include refid="Base_Column_List"/> from credit_rating
+        <where>
+            and del_flag = 'N'
+                    <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
+            </if>
+                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
+            </if>
+                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
+            </if>
+                     <if test="credit != null and !&quot;&quot;.equals(credit)">
+                and credit = #{credit}
+            </if>
+                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
+            </if>
+                     <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
+            </if>
+         
+        </where>
+        LIMIT 1
+    </select>
+    <update id="delete">
+        UPDATE credit_rating SET del_flag = 'Y'
+        where
+        <if test="id != null and !&quot;&quot;.equals(id)">
+            id = #{id,jdbcType=INTEGER}
+        </if>
+
+        <if test="idStr != null and !&quot;&quot;.equals(idStr)">
+            id in (${idStr})
+        </if>
+    </update>
+    <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.CreditRating">
+        select <include refid="Base_Column_List"/> from credit_rating
+        <where>
+            and del_flag = 'N'
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
+</mapper>
+

+ 132 - 0
src/main/java/com/izouma/awesomeadmin/model/CreditRating.java

@@ -0,0 +1,132 @@
+package com.izouma.awesomeadmin.model;
+
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CreditRating{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private String credit;
+    private String remark;
+    private Integer rank;
+
+private String idStr;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public String getCredit(){
+        return this.credit;
+    }
+
+    public void setCredit(String credit){
+        this.credit = credit;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public Integer getRank(){
+        return this.rank;
+    }
+
+    public void setRank(Integer rank){
+        this.rank = rank;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+public String getIdStr() {
+    return idStr;
+}
+
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
+
+}
+

+ 27 - 0
src/main/java/com/izouma/awesomeadmin/service/CreditRatingService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.CreditRating;
+
+
+/**
+*  service接口类
+*/
+public interface CreditRatingService{
+
+    List<CreditRating> getCreditRatingList(CreditRating record);
+
+    List<CreditRating> getCreditRatingByPage(Page page, CreditRating record);
+
+    CreditRating getCreditRatingById(String id);
+
+    CreditRating getCreditRating(CreditRating record);
+
+    boolean createCreditRating(CreditRating record);
+
+    boolean deleteCreditRating(CreditRating record);
+
+    boolean updateCreditRating(CreditRating record);
+}
+

+ 137 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/CreditRatingServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.CreditRating;
+import com.izouma.awesomeadmin.service.CreditRatingService;
+import com.izouma.awesomeadmin.dao.CreditRatingMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class CreditRatingServiceImpl implements CreditRatingService{
+
+    private static Logger logger = Logger.getLogger(CreditRatingServiceImpl.class);
+
+    @Autowired
+    private CreditRatingMapper creditRatingMapper;
+
+    @Override
+    public List<CreditRating> getCreditRatingList(CreditRating record) {
+
+        logger.info("getCreditRatingList");
+        try {
+
+        return creditRatingMapper.queryAllCreditRating(record);
+        } catch (Exception e) {
+        logger.error("getCreditRatingList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<CreditRating> getCreditRatingByPage(Page page, CreditRating record) {
+
+        logger.info("getCreditRatingByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return creditRatingMapper.queryCreditRatingByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getCreditRatingByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public CreditRating getCreditRatingById(String id) {
+
+        logger.info("getCreditRatingyId");
+        try {
+
+            return creditRatingMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getCreditRatingById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public CreditRating getCreditRating(CreditRating record) {
+
+        logger.info("getCreditRating");
+        try {
+
+            return creditRatingMapper.queryCreditRating(record);
+        } catch (Exception e) {
+        logger.error("getCreditRating", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createCreditRating(CreditRating record) {
+
+        logger.info("createCreditRating");
+        try {
+
+            int updates = creditRatingMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createCreditRating", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteCreditRating(CreditRating record) {
+
+        logger.info("deleteCreditRating");
+        try {
+
+             int updates = creditRatingMapper.delete(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteCreditRating", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateCreditRating(CreditRating record) {
+
+        logger.info("updateCreditRating");
+        try {
+
+            int updates = creditRatingMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateCreditRating", e);
+        }
+
+        return false;
+    }
+}
+

+ 160 - 0
src/main/java/com/izouma/awesomeadmin/web/CreditRatingController.java

@@ -0,0 +1,160 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.CreditRating;
+import com.izouma.awesomeadmin.service.CreditRatingService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/creditRating")
+public class CreditRatingController {
+
+    @Autowired
+    private CreditRatingService creditRatingService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(CreditRating record) {
+        List<CreditRating> pp = creditRatingService.getCreditRatingList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getCreditRating", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getCreditRating(@RequestParam(required = false, value = "id") String id) {
+        CreditRating data = creditRatingService.getCreditRatingById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(CreditRating record) {
+        CreditRating data = creditRatingService.getCreditRating(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, CreditRating record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<CreditRating> pp =creditRatingService.getCreditRatingByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(CreditRating record) {
+        boolean num = creditRatingService.createCreditRating(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateCreditRating(CreditRating record) {
+        boolean num = creditRatingService.updateCreditRating(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteCreditRating(CreditRating record) {
+
+        boolean num = creditRatingService.deleteCreditRating(record);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, CreditRating record) throws Exception {
+
+    List<CreditRating> creditRatings = creditRatingService.getCreditRatingList(record);
+
+
+        String sheetName = "credit_rating";
+        String titleName = "信用等级数据表";
+        String fileName = "信用等级表";
+        int columnNumber = 9;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "等级" ,   "备注" ,   "排序"  };
+        String[][] dataList = new String[creditRatings.size()][9];
+
+        for (int i = 0; i < creditRatings.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(creditRatings.get(i).getId());
+                        dataList[i][1] = String.valueOf(creditRatings.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(creditRatings.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(creditRatings.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(creditRatings.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(creditRatings.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(creditRatings.get(i).getCredit());
+                        dataList[i][7] = String.valueOf(creditRatings.get(i).getRemark());
+                        dataList[i][8] = String.valueOf(creditRatings.get(i).getRank());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

+ 8 - 0
src/main/vue/src/components/ImgItem.vue

@@ -348,6 +348,11 @@ export default {
                     remark: this.remark,
                     id: this.img.id
                 }
+
+                if(!data.remark){
+                    data.remark=''
+                }
+
                 this.$http.post({
                     url: '/orderImage/update',
                     data: data
@@ -370,6 +375,9 @@ export default {
                     statusFlag: 2,
                     detailRemark: this.remark
                 }
+                if(!data.detailRemark){
+                    data.detailRemark=''
+                }
                 if (this.detailRemarkFlag) {
                     data.detailRemarkFlag = this.detailRemarkFlag
                 }

+ 115 - 0
src/main/vue/src/pages/CreditRating.vue

@@ -0,0 +1,115 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="credit" label="等级">
+                <el-input v-model="formData.credit" :disabled="'credit'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="rank" label="排序">
+                <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/creditRating/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                        credit:
+                    [
+                                                {required: true, message: '请输入 等级', trigger: 'blur'},
+                                                                    ],
+                                                                                            },
+                                                                                    subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/creditRating/update' : '/creditRating/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                    url: '/creditRating/del',
+                    data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

+ 439 - 0
src/main/vue/src/pages/CreditRatings.vue

@@ -0,0 +1,439 @@
+<template>
+    <div>
+        <div class="filters-container">
+        
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/creditRating',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table
+                :data="tableData"
+                :height="tableHeight"
+                row-key="id"
+                ref="table">
+            <el-table-column
+                    v-if="multipleMode"
+                    align="center"
+                    type="selection"
+                    width="50">
+            </el-table-column>
+            <el-table-column
+                    type="index"
+                    min-width="50"
+                    align="center">
+            </el-table-column>
+                                                                                                                                                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('credit')"
+                                prop="credit"
+                                label="等级"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('rank')"
+                                prop="rank"
+                                label="排序"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '等级',
+                                value: 'credit',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: '排序',
+                                value: 'rank',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '等级',
+                                value: 'credit'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: '排序',
+                                value: 'rank'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/creditRating/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/creditRating',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
+
+                this.advancedQuerySearchKey = '';
+
+                if (this.advancedQueryFields.length > 0) {
+
+                    var templist = [];
+
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
+
+                this.orderByStr = '';
+
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/creditRating/exportExcel?searchKey="
+                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/creditRating/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
+
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
+
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
+
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

+ 10 - 1
src/main/vue/src/pages/StoreInfo.vue

@@ -64,7 +64,7 @@
             <el-form-item prop="credit" label="信誉等级">
                 <template>
                     <el-select v-model="formData.credit" clearable placeholder="请选择" :disabled="'credit'==subColumn">
-                        <el-option v-for="item in creditOptions" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in creditList" :key="item.credit" :label="item.credit" :value="item.credit">
                         </el-option>
                     </el-select>
                 </template>
@@ -172,6 +172,14 @@ export default {
             }
         });
 
+        this.$http.get({
+            url: '/creditRating/all'
+        }).then(res => {
+            if (res.success) {
+                this.creditList = res.data;
+            }
+        });
+
 
     },
     data() {
@@ -197,6 +205,7 @@ export default {
             serviceTypes: [],
             serviceTypeDetails: {},
             storeLabels: [],
+            creditList:[]
         }
     },
     methods: {

+ 28 - 19
src/main/vue/src/pagesPre/Business.vue

@@ -36,11 +36,11 @@
                         </div>
                         <div class="flift-list">
                             <div id='filit_level0' :class="{isActive:(level==0)}" @click="level=0">全部</div>
-                            <div id='filit_level1' :class="{isActive:(level==1)}" @click="level=1">A</div>
-                            <div id='filit_level2' :class="{isActive:(level==2)}" @click="level=2">B</div>
+                            <div :id='"filit_level"+(index+1)' v-for="(item,index) in creditList" :class="{isActive:(level==(index+1))}" @click="level=(index+1)">{{item.credit}}</div>
+                            <!-- <div id='filit_level2' :class="{isActive:(level==2)}" @click="level=2">B</div>
                             <div id='filit_level3' :class="{isActive:(level==3)}" @click="level=3">C</div>
                             <div id='filit_level4' :class="{isActive:(level==4)}" @click="level=4">D</div>
-                            <div id='filit_level5' :class="{isActive:(level==5)}" @click="level=5">E</div>
+                            <div id='filit_level5' :class="{isActive:(level==5)}" @click="level=5">E</div> -->
                             <div class="box" :style="{width:levelFiliftLocation.width+'px',height:levelFiliftLocation.height+'px',top:levelFiliftLocation.top+'px',left:levelFiliftLocation.left+'px'}"></div>
                         </div>
                     </div>
@@ -142,7 +142,8 @@ export default {
             creditOrder: '',
             responseOrder: '',
             reworkOrder: '',
-            queryId: 0
+            queryId: 0,
+            creditList: []
         }
     },
     computed: {
@@ -223,6 +224,14 @@ export default {
     },
     mounted() {
 
+        this.$http.get({
+            url: '/creditRating/all'
+        }).then(res => {
+            if (res.success) {
+                this.creditList = res.data;
+            }
+        });
+
         this.$http.get({
             url: '/districtInfo/all',
             data: {
@@ -269,21 +278,21 @@ export default {
             if (this.level == 0) {
                 this.credit = ''
             }
-            else if (this.level == 1) {
-                this.credit = 'A'
-            }
-            else if (this.level == 2) {
-                this.credit = 'B'
-            }
-            else if (this.level == 3) {
-                this.credit = 'C'
-            }
-            else if (this.level == 4) {
-                this.credit = 'D'
-            }
-            else if (this.level == 5) {
-                this.credit = 'E'
-            }
+            else {
+                this.credit = this.creditList[this.level - 1].credit
+            }
+            // else if (this.level == 2) {
+            //     this.credit = 'B'
+            // }
+            // else if (this.level == 3) {
+            //     this.credit = 'C'
+            // }
+            // else if (this.level == 4) {
+            //     this.credit = 'D'
+            // }
+            // else if (this.level == 5) {
+            //     this.credit = 'E'
+            // }
             this.currentPage = 0
             this.flag = true
             this.getInfo()

+ 4 - 4
src/main/vue/src/pagesPre/Contact.vue

@@ -20,19 +20,19 @@
                 <div class="content-text">
                     <div class="title">{{contactInfo.companyName}}</div>
                     <div class="content-all">
-                        <div>
+                        <div v-if="contactInfo.telephone">
                             <img style="width:18px;height:18px" src="../assetsPre/contact2.png" alt="">
                             <span>电话:{{contactInfo.telephone}}</span>
                         </div>
-                        <div>
+                        <div v-if="contactInfo.faxes">
                             <img style="width:17px;height:17px" src="../assetsPre/contact4.png" alt="">
                             <span>传真:{{contactInfo.faxes}} </span>
                         </div>
-                        <div>
+                        <div v-if="contactInfo.postcode">
                             <img style="width:15px;height:12px" src="../assetsPre/contact3.png" alt="">
                             <span>邮编:{{contactInfo.postcode}} </span>
                         </div>
-                        <div>
+                        <div v-if="contactInfo.address">
                             <img style="width:12px;height:17px" src="../assetsPre/contact5.png" alt="">
                             <span>地址:{{contactInfo.address}}</span>
                         </div>

+ 24 - 2
src/main/vue/src/pagesPre/LogoFoot.vue

@@ -33,7 +33,11 @@
                         </li>
                     </ul>
 
-                    <div class="foot-right">Copyright @ 2018 图忆途 | ICP证皖 B2-2-111890</div>
+                    <div class="foot-right" v-if="ICP.length>0">
+                        <a href='javascript:void(0)' @click="goHref(ICP[0].url)">
+                            {{ICP[0].linkName}}
+                        </a>
+                    </div>
                 </div>
                 <div class="foot-bottom">
                     <ul>
@@ -66,7 +70,8 @@ export default {
     name: 'page404',
     data() {
         return {
-            linkList: []
+            linkList: [],
+            ICP: []
         }
     },
     computed: {
@@ -100,6 +105,19 @@ export default {
             console.log(e)
         })
 
+        this.$http.get({
+            url: '/quickLinks/all',
+            data: {
+                typeFlag: 3
+            }
+        }).then(res => {
+            if (res.success) {
+                this.ICP = res.data
+            }
+        }).catch(e => {
+            console.log(e)
+        })
+
 
     },
     methods: {
@@ -154,6 +172,10 @@ export default {
             font-family: MicrosoftYaHei;
             color: rgba(153, 153, 153, 1);
             line-height: 16px;
+
+            a {
+                color: rgba(153, 153, 153, 1);
+            }
         }
     }
 

+ 2 - 2
src/main/vue/src/pagesPre/OrderExamine.vue

@@ -47,9 +47,9 @@
             <el-pagination style="padding:0 0 20px" background :page-size="7" @current-change="currentPageChange" :current-page="currentPage" layout="total, prev, pager, next" :total="totalNumber">
             </el-pagination>
 
-            <div class="bottom">
+            <!-- <div class="bottom">
                 <el-button type="warning" v-if="!isChange" plain @click="goShare">他人审片</el-button>
-            </div>
+            </div> -->
         </template>
 
     </div>

+ 13 - 0
src/main/vue/src/pagesPre/SetStoreInfo.vue

@@ -85,6 +85,14 @@ export default {
         }
     },
     created() {
+
+        this.$http.get({
+            url: '/creditRating/all'
+        }).then(res => {
+            if (res.success) {
+                this.creditList = res.data;
+            }
+        });
         this.formData.typeFlag = this.typeFlag
         this.formData.userId = this.userInfo.id
         this.formData.userName = this.userInfo.nickname
@@ -209,6 +217,7 @@ export default {
             serviceTypes: [],
             serviceTypeDetails: {},
             storeLabels: [],
+            creditList: []
         }
     },
     computed: {
@@ -235,6 +244,10 @@ export default {
             data.district = this.formData.address[2]
             data.subclass = data.subclass.toString()
 
+            if (!data.credit) {
+                data.credit = this.creditList[0].credit
+            }
+
             this.$http.post({
                 url: this.formData.id ? '/storeInfo/update' : '/storeInfo/save',
                 data: data

+ 10 - 0
src/main/vue/src/router/index.js

@@ -629,6 +629,16 @@ const router = new Router({
                     path: '/userAgreements',
                     name: 'UserAgreements',
                     component: () => import('../pages/UserAgreements')
+                },
+                {
+                    path: '/creditRating',
+                    name: 'CreditRating',
+                    component: () => import('../pages/CreditRating')
+                },
+                {
+                    path: '/creditRatings',
+                    name: 'CreditRatings',
+                    component: () => import('../pages/CreditRatings')
                 }
                 /**INSERT_LOCATION**/
             ]