ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit f460785af20da220315b0ba54a6b045cbdedd242 1 parent 295dafd7

二手

Inline Side-by-side
Showing 9 changed files with 98 additions and 72 deletions
@@ -5,16 +5,9 @@ import java.util.List; @@ -5,16 +5,9 @@ import java.util.List;
5 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
6 6
7 import com.yoho.product.model.SecondhandInfo; 7 import com.yoho.product.model.SecondhandInfo;
8 -import com.yoho.product.model.SecondhandReq;  
9 8
10 public interface SecondhandInfoMapper { 9 public interface SecondhandInfoMapper {
11 10
12 - int selectCountByStatus(@Param("status")Integer status);  
13 -  
14 - int selectTotalByCondition(@Param("secondhandReq") SecondhandReq req);  
15 -  
16 - List<SecondhandInfo> selectByCondition(@Param("secondhandReq") SecondhandReq req);  
17 -  
18 List<SecondhandInfo> selectBySkups(@Param("skupList")List<Integer> skupList); 11 List<SecondhandInfo> selectBySkups(@Param("skupList")List<Integer> skupList);
19 12
20 int updateAuditInfoBySkup(SecondhandInfo secondhandInfo); 13 int updateAuditInfoBySkup(SecondhandInfo secondhandInfo);
@@ -18,8 +18,6 @@ public class SecondhandInfo { @@ -18,8 +18,6 @@ public class SecondhandInfo {
18 18
19 private Integer createTime; 19 private Integer createTime;
20 20
21 - private Integer status;  
22 -  
23 private Integer auditUid; 21 private Integer auditUid;
24 22
25 private String auditName; 23 private String auditName;
@@ -76,14 +74,6 @@ public class SecondhandInfo { @@ -76,14 +74,6 @@ public class SecondhandInfo {
76 this.createTime = createTime; 74 this.createTime = createTime;
77 } 75 }
78 76
79 - public Integer getStatus() {  
80 - return status;  
81 - }  
82 -  
83 - public void setStatus(Integer status) {  
84 - this.status = status;  
85 - }  
86 -  
87 public Integer getAuditUid() { 77 public Integer getAuditUid() {
88 return auditUid; 78 return auditUid;
89 } 79 }
@@ -16,4 +16,6 @@ public interface GoodsImagesMapper { @@ -16,4 +16,6 @@ public interface GoodsImagesMapper {
16 int deleteByGoodsId(Integer goodsId); 16 int deleteByGoodsId(Integer goodsId);
17 17
18 List<GoodsImages> selectByGoodsId(Integer goodsId); 18 List<GoodsImages> selectByGoodsId(Integer goodsId);
  19 +
  20 + List<GoodsImages> selectDefaultByGoodsIdList(List<Integer> goodsIdList);
19 } 21 }
@@ -4,6 +4,8 @@ import java.util.ArrayList; @@ -4,6 +4,8 @@ import java.util.ArrayList;
4 import java.util.LinkedList; 4 import java.util.LinkedList;
5 import java.util.List; 5 import java.util.List;
6 6
  7 +import com.yoho.product.model.SecondhandInfo;
  8 +import com.yoho.product.model.SecondhandReq;
7 import com.yoho.ufo.dal.model.ExportStoragePrice; 9 import com.yoho.ufo.dal.model.ExportStoragePrice;
8 import com.yoho.ufo.dal.model.ExportStoragePriceInner; 10 import com.yoho.ufo.dal.model.ExportStoragePriceInner;
9 import org.apache.ibatis.annotations.Param; 11 import org.apache.ibatis.annotations.Param;
@@ -76,5 +78,11 @@ public interface StoragePriceMapper { @@ -76,5 +78,11 @@ public interface StoragePriceMapper {
76 78
77 List<StoragePrice> selectBySkupList(@Param("skupList") List<Integer> skupList); 79 List<StoragePrice> selectBySkupList(@Param("skupList") List<Integer> skupList);
78 80
79 - int updateStatusBySkup(@Param("status") Integer status, @Param("skup") Integer skup); 81 + int updateSecondhandStatusBySkup(@Param("status") Integer status, @Param("skup") Integer skup);
  82 +
  83 + int selectSecondCntByStatus(@Param("status")Integer status);
  84 +
  85 + int selectSecondTotalByCondition(@Param("secondhandReq") SecondhandReq req);
  86 +
  87 + List<StoragePrice> selectSecondByCondition(@Param("secondhandReq") SecondhandReq req);
80 } 88 }
@@ -45,4 +45,13 @@ @@ -45,4 +45,13 @@
45 from goods_images 45 from goods_images
46 where goods_id = #{goodsId,jdbcType=INTEGER} 46 where goods_id = #{goodsId,jdbcType=INTEGER}
47 </select> 47 </select>
  48 + <select id="selectDefaultByGoodsIdList" resultMap="BaseResultMap">
  49 + select id, goods_id, product_id, is_default, image_url, order_by
  50 + from goods_images
  51 + where is_default='Y' and goods_id in
  52 + <foreach collection="list" item="goodsId" open="(" close=")" separator=",">
  53 + #{goodsId}
  54 + </foreach>
  55 + </select>
  56 +
48 </mapper> 57 </mapper>
@@ -8,48 +8,15 @@ @@ -8,48 +8,15 @@
8 <result column="flaw_attr" property="flawAttr" jdbcType="VARCHAR" /> 8 <result column="flaw_attr" property="flawAttr" jdbcType="VARCHAR" />
9 <result column="describe_info" property="describeInfo" jdbcType="VARCHAR" /> 9 <result column="describe_info" property="describeInfo" jdbcType="VARCHAR" />
10 <result column="create_time" property="createTime" jdbcType="INTEGER" /> 10 <result column="create_time" property="createTime" jdbcType="INTEGER" />
11 - <result column="status" property="status" jdbcType="INTEGER" />  
12 <result column="audit_uid" property="auditUid" jdbcType="INTEGER" /> 11 <result column="audit_uid" property="auditUid" jdbcType="INTEGER" />
13 <result column="audit_name" property="auditName" jdbcType="VARCHAR" /> 12 <result column="audit_name" property="auditName" jdbcType="VARCHAR" />
14 <result column="audit_time" property="auditTime" jdbcType="INTEGER" /> 13 <result column="audit_time" property="auditTime" jdbcType="INTEGER" />
15 <result column="reject_reason" property="rejectReason" jdbcType="VARCHAR" /> 14 <result column="reject_reason" property="rejectReason" jdbcType="VARCHAR" />
16 </resultMap> 15 </resultMap>
17 <sql id="Base_Column_List" > 16 <sql id="Base_Column_List" >
18 - id, skup, flaw_id, flaw_attr, describe_info, create_time, status, audit_uid, audit_name, audit_time, reject_reason 17 + id, skup, flaw_id, flaw_attr, describe_info, create_time, audit_uid, audit_name, audit_time, reject_reason
19 </sql> 18 </sql>
20 19
21 - <select id="selectCountByStatus" resultType="java.lang.Integer">  
22 - select count(1)  
23 - from secondhand_info where status != 0  
24 - <if test="status != null">  
25 - and status = #{status}  
26 - </if>  
27 - </select>  
28 -  
29 - <sql id="Query_Order_Sql" >  
30 - <if test="secondhandReq.status != null">  
31 - and status = #{secondhandReq.status}  
32 - </if>  
33 - </sql>  
34 -  
35 - <select id="selectTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.product.model.SecondhandReq">  
36 - select count(1)  
37 - from secondhand_info  
38 - where status != 0  
39 - <include refid="Query_Order_Sql" />  
40 - </select>  
41 -  
42 - <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.product.model.SecondhandReq">  
43 - select <include refid="Base_Column_List"></include>  
44 - from secondhand_info  
45 - where status != 0  
46 - <include refid="Query_Order_Sql" />  
47 - order by create_time desc  
48 - <if test="secondhandReq.start!=null and secondhandReq.size != null">  
49 - limit #{secondhandReq.start},#{secondhandReq.size}  
50 - </if>  
51 - </select>  
52 -  
53 <select id="selectBySkups" resultMap="BaseResultMap" > 20 <select id="selectBySkups" resultMap="BaseResultMap" >
54 select <include refid="Base_Column_List" /> 21 select <include refid="Base_Column_List" />
55 from secondhand_info where skup in 22 from secondhand_info where skup in
@@ -60,7 +27,7 @@ @@ -60,7 +27,7 @@
60 27
61 <update id="updateAuditInfoBySkup" parameterType="com.yoho.product.model.SecondhandInfo"> 28 <update id="updateAuditInfoBySkup" parameterType="com.yoho.product.model.SecondhandInfo">
62 update secondhand_info 29 update secondhand_info
63 - set status=#{status}, reject_reason=#{rejectReason}, 30 + set reject_reason=#{rejectReason},
64 audit_uid=#{auditUid}, audit_name=#{auditName}, audit_time=#{auditTime} 31 audit_uid=#{auditUid}, audit_name=#{auditName}, audit_time=#{auditTime}
65 where skup=#{skup} 32 where skup=#{skup}
66 </update> 33 </update>
@@ -371,7 +371,40 @@ @@ -371,7 +371,40 @@
371 </foreach> 371 </foreach>
372 </select> 372 </select>
373 373
374 - <update id="updateStatusBySkup">  
375 - update storage_price set status=#{status}, update_time=unix_timestamp() where skup=#{skup} 374 + <select id="selectSecondCntByStatus" resultType="java.lang.Integer">
  375 + select count(1)
  376 + from storage_price where pre_sale_flag in (5,6) and status in (10,11,1)
  377 + <if test="status != null">
  378 + and status = #{status}
  379 + </if>
  380 + </select>
  381 +
  382 + <sql id="Query_Second_Sql" >
  383 + <if test="secondhandReq.status != null">
  384 + and status = #{secondhandReq.status}
  385 + </if>
  386 + </sql>
  387 +
  388 + <select id="selectSecondTotalByCondition" resultType="java.lang.Integer" parameterType="com.yoho.product.model.SecondhandReq">
  389 + select count(1)
  390 + from storage_price
  391 + where pre_sale_flag in (5,6) and status in (10,11,1)
  392 + <include refid="Query_Second_Sql" />
  393 + </select>
  394 +
  395 + <select id="selectSecondByCondition" resultMap="BaseResultMap" parameterType="com.yoho.product.model.SecondhandReq">
  396 + select id, skup, product_id, goods_id, storage_id, depot_num, seller_uid, price,
  397 + status, update_time, create_time, pre_sale_flag
  398 + from storage_price
  399 + where pre_sale_flag in (5,6) and status in (10,11,1)
  400 + <include refid="Query_Second_Sql" />
  401 + order by create_time desc
  402 + <if test="secondhandReq.start!=null and secondhandReq.size != null">
  403 + limit #{secondhandReq.start},#{secondhandReq.size}
  404 + </if>
  405 + </select>
  406 +
  407 + <update id="updateSecondhandStatusBySkup">
  408 + update storage_price set status=#{status}, update_time=unix_timestamp() where skup=#{skup} and status=10
376 </update> 409 </update>
377 </mapper> 410 </mapper>
@@ -26,10 +26,13 @@ import com.yoho.product.model.SecondhandImages; @@ -26,10 +26,13 @@ import com.yoho.product.model.SecondhandImages;
26 import com.yoho.product.model.SecondhandInfo; 26 import com.yoho.product.model.SecondhandInfo;
27 import com.yoho.product.model.SecondhandReq; 27 import com.yoho.product.model.SecondhandReq;
28 import com.yoho.product.model.SecondhandRsp; 28 import com.yoho.product.model.SecondhandRsp;
  29 +import com.yoho.ufo.dal.GoodsImagesMapper;
29 import com.yoho.ufo.dal.ProductMapper; 30 import com.yoho.ufo.dal.ProductMapper;
30 import com.yoho.ufo.dal.StoragePriceMapper; 31 import com.yoho.ufo.dal.StoragePriceMapper;
  32 +import com.yoho.ufo.dal.model.GoodsImages;
31 import com.yoho.ufo.dal.model.Product; 33 import com.yoho.ufo.dal.model.Product;
32 import com.yoho.ufo.dal.model.StoragePrice; 34 import com.yoho.ufo.dal.model.StoragePrice;
  35 +import com.yoho.ufo.exception.CommonException;
33 import com.yoho.ufo.service.ISecondhandProductService; 36 import com.yoho.ufo.service.ISecondhandProductService;
34 import com.yoho.ufo.service.model.PageResponseBO; 37 import com.yoho.ufo.service.model.PageResponseBO;
35 import com.yoho.ufo.util.DateUtil; 38 import com.yoho.ufo.util.DateUtil;
@@ -62,6 +65,9 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -62,6 +65,9 @@ public class SecondhandProductService implements ISecondhandProductService{
62 private SecondhandFlawMapper secondhandFlawMapper; 65 private SecondhandFlawMapper secondhandFlawMapper;
63 66
64 @Autowired 67 @Autowired
  68 + private GoodsImagesMapper goodsImagesMapper;
  69 +
  70 + @Autowired
65 private ServiceCaller serviceCaller; 71 private ServiceCaller serviceCaller;
66 72
67 private static final Integer STATUS_NEW = 0; 73 private static final Integer STATUS_NEW = 0;
@@ -75,10 +81,10 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -75,10 +81,10 @@ public class SecondhandProductService implements ISecondhandProductService{
75 @Override 81 @Override
76 public Map<String, Integer> getCountByStatus(){ 82 public Map<String, Integer> getCountByStatus(){
77 83
78 - int totalNum = secondhandInfoMapper.selectCountByStatus(null);  
79 - int toBeAuditedNum = secondhandInfoMapper.selectCountByStatus(STATUS_WAIT_TO_BE_AUDITED);  
80 - int auditPassNum = secondhandInfoMapper.selectCountByStatus(STATUS_AUDIT_PASS);  
81 - int auditRejectNum = secondhandInfoMapper.selectCountByStatus(STATUS_AUDIT_REJECT); 84 + int totalNum = storagePriceMapper.selectSecondCntByStatus(null);
  85 + int toBeAuditedNum = storagePriceMapper.selectSecondCntByStatus(STATUS_WAIT_TO_BE_AUDITED);
  86 + int auditPassNum = storagePriceMapper.selectSecondCntByStatus(STATUS_AUDIT_PASS);
  87 + int auditRejectNum = storagePriceMapper.selectSecondCntByStatus(STATUS_AUDIT_REJECT);
82 88
83 Map<String, Integer> resultMap = Maps.newHashMap(); 89 Map<String, Integer> resultMap = Maps.newHashMap();
84 resultMap.put("totalNum", totalNum); 90 resultMap.put("totalNum", totalNum);
@@ -92,23 +98,26 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -92,23 +98,26 @@ public class SecondhandProductService implements ISecondhandProductService{
92 @Override 98 @Override
93 public PageResponseBO<SecondhandRsp> querySecondhandSkupList(SecondhandReq req) { 99 public PageResponseBO<SecondhandRsp> querySecondhandSkupList(SecondhandReq req) {
94 100
95 - int total = secondhandInfoMapper.selectTotalByCondition(req); 101 + int total = storagePriceMapper.selectSecondTotalByCondition(req);
96 if(total == 0) { 102 if(total == 0) {
97 return null; 103 return null;
98 } 104 }
99 105
100 - List<SecondhandInfo> infoList = secondhandInfoMapper.selectByCondition(req);  
101 - if(CollectionUtils.isEmpty(infoList)) { 106 + List<StoragePrice> storagePriceList = storagePriceMapper.selectSecondByCondition(req);
  107 + if(CollectionUtils.isEmpty(storagePriceList)) {
102 return null; 108 return null;
103 } 109 }
104 110
  111 + List<Integer> skupList = storagePriceList.stream().map(StoragePrice::getSkup).collect(Collectors.toList());
  112 +
  113 + //查询secondhand_info
  114 + List<SecondhandInfo> infoList = secondhandInfoMapper.selectBySkups(skupList);
  115 +
105 //查询secondhand_images 116 //查询secondhand_images
106 - List<Integer> skupList = infoList.stream().map(SecondhandInfo::getSkup).collect(Collectors.toList());  
107 List<SecondhandImages> imageList = secondhandImagesMapper.selectBySkups(skupList); 117 List<SecondhandImages> imageList = secondhandImagesMapper.selectBySkups(skupList);
108 Map<Integer, List<SecondhandImages>> skupImageMap = imageList.stream().collect(Collectors.groupingBy(SecondhandImages::getSkup)); 118 Map<Integer, List<SecondhandImages>> skupImageMap = imageList.stream().collect(Collectors.groupingBy(SecondhandImages::getSkup));
109 119
110 //查询storage_price 120 //查询storage_price
111 - List<StoragePrice> storagePriceList = storagePriceMapper.selectBySkupList(skupList);  
112 Map<Integer, StoragePrice> storagePriceMap = storagePriceList.stream().collect(Collectors.toMap(StoragePrice::getSkup, s->s)); 121 Map<Integer, StoragePrice> storagePriceMap = storagePriceList.stream().collect(Collectors.toMap(StoragePrice::getSkup, s->s));
113 122
114 //查询seller_order_goods 123 //查询seller_order_goods
@@ -125,8 +134,13 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -125,8 +134,13 @@ public class SecondhandProductService implements ISecondhandProductService{
125 List<SecondhandFlaw> flawList = secondhandFlawMapper.selectBatchByIds(getFlawIdList(flawIdStrList)); 134 List<SecondhandFlaw> flawList = secondhandFlawMapper.selectBatchByIds(getFlawIdList(flawIdStrList));
126 Map<Integer, String> flawMap = flawList.stream().collect(Collectors.toMap(SecondhandFlaw::getId, SecondhandFlaw::getName)); 135 Map<Integer, String> flawMap = flawList.stream().collect(Collectors.toMap(SecondhandFlaw::getId, SecondhandFlaw::getName));
127 136
  137 + //查询goods_images
  138 + List<Integer> goodsIdList = storagePriceList.stream().map(StoragePrice::getGoodsId).collect(Collectors.toList());
  139 + List<GoodsImages> goodsImagesList = goodsImagesMapper.selectDefaultByGoodsIdList(goodsIdList);
  140 + Map<Integer, String> goodsIdImageMap = goodsImagesList.stream().collect(Collectors.toMap(GoodsImages::getGoodsId, GoodsImages::getImageUrl));
  141 +
128 //组装 142 //组装
129 - List<SecondhandRsp> respList = convertToResp(infoList, skupImageMap, storagePriceMap, sellerGoodsMap, productIdNameMap, flawMap); 143 + List<SecondhandRsp> respList = convertToResp(infoList, skupImageMap, storagePriceMap, sellerGoodsMap, productIdNameMap, flawMap, goodsIdImageMap);
130 144
131 PageResponseBO<SecondhandRsp> result=new PageResponseBO<>(); 145 PageResponseBO<SecondhandRsp> result=new PageResponseBO<>();
132 result.setList(respList); 146 result.setList(respList);
@@ -139,10 +153,15 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -139,10 +153,15 @@ public class SecondhandProductService implements ISecondhandProductService{
139 153
140 @Override 154 @Override
141 public int updateStatus(SecondhandReq req) { 155 public int updateStatus(SecondhandReq req) {
  156 + //查询storage_price中status
  157 + Integer status = storagePriceMapper.selectBySkup(req.getSkup()).getStatus();
  158 + if(!ProductSkupStatusEnum.CHECKING.getStatus().equals(status)) {//如果不是待审核状态，直接返回
  159 + throw new CommonException(400, "不是待审核状态,当前状态是"+ProductSkupStatusEnum.getTypeName(status));
  160 + }
  161 +
142 SecondhandInfo auditInfo = new SecondhandInfo(); 162 SecondhandInfo auditInfo = new SecondhandInfo();
143 UserHelper userInfo = new UserHelper(); 163 UserHelper userInfo = new UserHelper();
144 auditInfo.setSkup(req.getSkup()); 164 auditInfo.setSkup(req.getSkup());
145 - auditInfo.setStatus(req.getStatus());  
146 auditInfo.setRejectReason(req.getRejectReason()); 165 auditInfo.setRejectReason(req.getRejectReason());
147 auditInfo.setAuditName(userInfo.getUserName()); 166 auditInfo.setAuditName(userInfo.getUserName());
148 auditInfo.setAuditUid(userInfo.getUserId()); 167 auditInfo.setAuditUid(userInfo.getUserId());
@@ -152,7 +171,7 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -152,7 +171,7 @@ public class SecondhandProductService implements ISecondhandProductService{
152 return num; 171 return num;
153 } 172 }
154 //更新storage_price 173 //更新storage_price
155 - num = storagePriceMapper.updateStatusBySkup(req.getStatus(), req.getSkup()); 174 + num = storagePriceMapper.updateSecondhandStatusBySkup(req.getStatus(), req.getSkup());
156 if(num == 0) { 175 if(num == 0) {
157 return num; 176 return num;
158 } 177 }
@@ -204,7 +223,7 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -204,7 +223,7 @@ public class SecondhandProductService implements ISecondhandProductService{
204 223
205 private List<SecondhandRsp> convertToResp(List<SecondhandInfo> infoList, Map<Integer, List<SecondhandImages>> skupImageMap, 224 private List<SecondhandRsp> convertToResp(List<SecondhandInfo> infoList, Map<Integer, List<SecondhandImages>> skupImageMap,
206 Map<Integer, StoragePrice> storagePriceMap, Map<Integer, SellerOrderGoods> sellerGoodsMap, 225 Map<Integer, StoragePrice> storagePriceMap, Map<Integer, SellerOrderGoods> sellerGoodsMap,
207 - Map<Integer, String> productIdNameMap, Map<Integer, String> flawMap){ 226 + Map<Integer, String> productIdNameMap, Map<Integer, String> flawMap, Map<Integer, String> goodsIdImageMap){
208 List<SecondhandRsp> respList = Lists.newArrayList(); 227 List<SecondhandRsp> respList = Lists.newArrayList();
209 for(SecondhandInfo item : infoList) { 228 for(SecondhandInfo item : infoList) {
210 SecondhandRsp rsp = new SecondhandRsp(); 229 SecondhandRsp rsp = new SecondhandRsp();
@@ -225,13 +244,13 @@ public class SecondhandProductService implements ISecondhandProductService{ @@ -225,13 +244,13 @@ public class SecondhandProductService implements ISecondhandProductService{
225 if(null == sellerGoods) { 244 if(null == sellerGoods) {
226 continue; 245 continue;
227 } 246 }
228 - rsp.setProductImage(ImagesHelper.getImageAbsoluteUrl(sellerGoods.getImageUrl(), "goodsimg")); 247 + rsp.setProductImage(ImagesHelper.getImageAbsoluteUrl(goodsIdImageMap.get(storagePrice.getGoodsId()), "goodsimg"));
229 rsp.setColorName(sellerGoods.getColorName()); 248 rsp.setColorName(sellerGoods.getColorName());
230 rsp.setSizeName(sellerGoods.getSizeName()); 249 rsp.setSizeName(sellerGoods.getSizeName());
231 rsp.setSellerUid(storagePrice.getSellerUid()); 250 rsp.setSellerUid(storagePrice.getSellerUid());
232 rsp.setPrice(String.valueOf(storagePrice.getPrice())); 251 rsp.setPrice(String.valueOf(storagePrice.getPrice()));
233 - rsp.setStatus(item.getStatus());  
234 - rsp.setStatusStr(ProductSkupStatusEnum.getTypeName(item.getStatus())); 252 + rsp.setStatus(storagePrice.getStatus());
  253 +// rsp.setStatusStr(ProductSkupStatusEnum.getTypeName(storagePrice.getStatus()));
235 rsp.setCreateTimeStr(DateUtil.getDateFormatFromInt(item.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); 254 rsp.setCreateTimeStr(DateUtil.getDateFormatFromInt(item.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
236 rsp.setAuditTimeStr(null == item.getAuditTime() ? "" : DateUtil.getDateFormatFromInt(item.getAuditTime(), "yyyy-MM-dd HH:mm:ss")); 255 rsp.setAuditTimeStr(null == item.getAuditTime() ? "" : DateUtil.getDateFormatFromInt(item.getAuditTime(), "yyyy-MM-dd HH:mm:ss"));
237 rsp.setAuditName(null == item.getAuditName() ? "" : item.getAuditName()); 256 rsp.setAuditName(null == item.getAuditName() ? "" : item.getAuditName());
@@ -288,7 +288,12 @@ function getTableColumn() { @@ -288,7 +288,12 @@ function getTableColumn() {
288 width: 20, 288 width: 20,
289 align: "center", 289 align: "center",
290 formatter: function (value, rowData, rowIndex) { 290 formatter: function (value, rowData, rowIndex) {
291 - var auditInfo = rowData.statusStr; 291 + var auditInfo = "待审核";
  292 + if(rowData.status == 11){
  293 + auditInfo = "审核不通过";
  294 + }else if(rowData.status == 1){
  295 + auditInfo = "审核通过";
  296 + }
292 if(rowData.status==11){//审核不通过 297 if(rowData.status==11){//审核不通过
293 auditInfo += "（<font color='red' >原因："+ rowData.rejectReason + "</font>）" 298 auditInfo += "（<font color='red' >原因："+ rowData.rejectReason + "</font>）"
294 } 299 }