diff --git a/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java b/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java index ef16dd9..d03f36a 100644 --- a/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java +++ b/src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java @@ -23,10 +23,10 @@ import java.util.Map; * @ClassName: ShopAuditLogController * @Description: * @Author: CodeFactory - * @Date: 2021-03-18 15:09:25 + * @Date: 2021-04-08 17:02:19 * @Version: 3.0 **/ -@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "店铺审核记录接口") +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "审核日志接口") @RestController @RequestMapping(ISystemConstant.API_PREFIX + "/shopauditlog") public class ShopAuditLogController extends DefaultBaseController { @@ -34,21 +34,6 @@ public class ShopAuditLogController extends DefaultBaseController { @Autowired private IShopAuditLogService shopAuditLogService; - - @ApiOperation(value = "获取店铺审核记录列表", notes = "获取店铺审核记录列表接口") - @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("list/{shopId}") - public List list(@PathVariable("shopId") String shopId) { - Map params = requestParams(); - params.put("shopId",shopId); - return shopAuditLogService.list(params); - } - - - - - - @ApiOperation(value = "新增", notes = "新增接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @PostMapping("save") @@ -91,7 +76,13 @@ public class ShopAuditLogController extends DefaultBaseController { return shopAuditLogService.get(shopAuditLogId); } - + @ApiOperation(value = "列表", notes = "列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return shopAuditLogService.list(params); + } @ApiOperation(value = "分页列表", notes = "分页列表接口") @ApiImplicitParams({ diff --git a/src/main/java/cn/com/tenlion/controller/app/apis/shopauditlog/ShopAuditLogAppController.java b/src/main/java/cn/com/tenlion/controller/app/apis/shopauditlog/ShopAuditLogAppController.java index ec6832e..fca2889 100644 --- a/src/main/java/cn/com/tenlion/controller/app/apis/shopauditlog/ShopAuditLogAppController.java +++ b/src/main/java/cn/com/tenlion/controller/app/apis/shopauditlog/ShopAuditLogAppController.java @@ -1,4 +1,4 @@ -package cn.com.tenlion.controller.app.api.shopauditlog; +package cn.com.tenlion.controller.app.apis.shopauditlog; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -38,12 +38,14 @@ public class ShopAuditLogAppController extends DefaultBaseController { @ApiOperation(value = "列表", notes = "列表接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "token", value = "token", paramType = "header") + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "bId", value = "业务ID", paramType = "header") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("list") - public List list(@RequestHeader("token") String token) { + @GetMapping("list/{bId}") + public List list(@RequestHeader("token") String token,@PathVariable("bId") String bId) { Map params = requestParams(); + params.put("auditBId",bId); return shopAuditLogService.list(params); } diff --git a/src/main/java/cn/com/tenlion/dao/shop/IShopDao.java b/src/main/java/cn/com/tenlion/dao/shop/IShopDao.java index d752d53..d79e6e8 100644 --- a/src/main/java/cn/com/tenlion/dao/shop/IShopDao.java +++ b/src/main/java/cn/com/tenlion/dao/shop/IShopDao.java @@ -23,6 +23,14 @@ import java.util.Map; @Repository public interface IShopDao { + /** + * 修改认证状态 + * @param params + * @throws UpdateException + */ + void updateIsCertification(Map params) throws UpdateException; + + /** * 修改审核结果 * @param params diff --git a/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java b/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java index e5384d4..ea7908e 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java +++ b/src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java @@ -16,6 +16,11 @@ public class ShopBO { private Double shopStar; private String shopLogo; private Integer shopTemplateId; + + private String shopLongitude; + private String shopLatitude; + private String shopVideo; + private Double userEvaluate; private Integer isOpen; private String openDate; @@ -75,6 +80,30 @@ public class ShopBO { this.shopTemplateId = shopTemplateId; } + public String getShopLongitude() { + return shopLongitude; + } + + public void setShopLongitude(String shopLongitude) { + this.shopLongitude = shopLongitude; + } + + public String getShopLatitude() { + return shopLatitude; + } + + public void setShopLatitude(String shopLatitude) { + this.shopLatitude = shopLatitude; + } + + public String getShopVideo() { + return shopVideo; + } + + public void setShopVideo(String shopVideo) { + this.shopVideo = shopVideo; + } + public Double getUserEvaluate() { return userEvaluate == null ? 0D : userEvaluate; } diff --git a/src/main/java/cn/com/tenlion/pojo/bos/shopauditlog/ShopAuditLogBO.java b/src/main/java/cn/com/tenlion/pojo/bos/shopauditlog/ShopAuditLogBO.java index 8315a4d..d919258 100644 --- a/src/main/java/cn/com/tenlion/pojo/bos/shopauditlog/ShopAuditLogBO.java +++ b/src/main/java/cn/com/tenlion/pojo/bos/shopauditlog/ShopAuditLogBO.java @@ -3,25 +3,36 @@ package cn.com.tenlion.pojo.bos.shopauditlog; /** * * @ClassName: ShopAuditLogBO - * @Description: + * @Description: * @Author: CodeFactory - * @Date: 2021-03-18 15:09:25 + * @Date: 2021-04-08 17:02:19 * @Version: 3.0 **/ public class ShopAuditLogBO { - private String shopId; + private String shopAuditId; + private String auditBId; private String auditUser; + private String auditUserName; private Integer auditStatus; private String auditResult; private String auditDate; + private String auditType; - public String getShopId() { - return shopId == null ? "" : shopId.trim(); + public String getShopAuditId() { + return shopAuditId; } - public void setShopId(String shopId) { - this.shopId = shopId; + public void setShopAuditId(String shopAuditId) { + this.shopAuditId = shopAuditId; + } + + public String getAuditBId() { + return auditBId == null ? "" : auditBId.trim(); + } + + public void setAuditBId(String auditBId) { + this.auditBId = auditBId; } public String getAuditUser() { @@ -32,6 +43,14 @@ public class ShopAuditLogBO { this.auditUser = auditUser; } + public String getAuditUserName() { + return auditUserName == null ? "" : auditUserName.trim(); + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + public Integer getAuditStatus() { return auditStatus == null ? 0 : auditStatus; } @@ -56,5 +75,13 @@ public class ShopAuditLogBO { this.auditDate = auditDate; } + public String getAuditType() { + return auditType == null ? "" : auditType.trim(); + } + + public void setAuditType(String auditType) { + this.auditType = auditType; + } + } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java index 17a03ba..25d1984 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java @@ -28,6 +28,13 @@ public class ShopDTO { private String shopLogo; @ApiModelProperty(name = "shopTemplateId", value = "模板ID") private Integer shopTemplateId; + @ApiModelProperty(name = "shopLongitude", value = "店铺经度") + private String shopLongitude; + @ApiModelProperty(name = "shopLatitude", value = "店铺维度") + private String shopLatitude; + @ApiModelProperty(name = "shopVideo", value = "店铺宣传视频") + private String shopVideo; + @ApiModelProperty(name = "userEvaluate", value = "用户评价，分数，满分10分，通过用户对商品的满意度计算") private Double userEvaluate; @ApiModelProperty(name = "isOpen", value = "是否营业 0:未开业，1:开业中") @@ -102,6 +109,30 @@ public class ShopDTO { this.shopTemplateId = shopTemplateId; } + public String getShopLongitude() { + return shopLongitude; + } + + public void setShopLongitude(String shopLongitude) { + this.shopLongitude = shopLongitude; + } + + public String getShopLatitude() { + return shopLatitude; + } + + public void setShopLatitude(String shopLatitude) { + this.shopLatitude = shopLatitude; + } + + public String getShopVideo() { + return shopVideo; + } + + public void setShopVideo(String shopVideo) { + this.shopVideo = shopVideo; + } + public Double getUserEvaluate() { return userEvaluate == null ? 0D : userEvaluate; } diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/shopauditlog/ShopAuditLogDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/shopauditlog/ShopAuditLogDTO.java index b27fbf0..9df8c77 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/shopauditlog/ShopAuditLogDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/shopauditlog/ShopAuditLogDTO.java @@ -8,29 +8,43 @@ import io.swagger.annotations.ApiModelProperty; * @ClassName: ShopAuditLogDTO * @Description: * @Author: CodeFactory - * @Date: 2021-03-18 15:09:25 + * @Date: 2021-04-08 17:02:19 * @Version: 3.0 **/ @ApiModel public class ShopAuditLogDTO { - @ApiModelProperty(name = "shopId", value = "店铺ID") - private String shopId; + @ApiModelProperty(name = "shopAuditId", value = "审核ID") + private String shopAuditId; + @ApiModelProperty(name = "auditBId", value = "审核业务ID") + private String auditBId; @ApiModelProperty(name = "auditUser", value = "审核人") private String auditUser; + @ApiModelProperty(name = "auditUserName", value = "审核人姓名") + private String auditUserName; @ApiModelProperty(name = "auditStatus", value = "审核状态：0未审核 1审核通过 -1审核未通过") private Integer auditStatus; @ApiModelProperty(name = "auditResult", value = "审核说明") private String auditResult; @ApiModelProperty(name = "auditDate", value = "审核时间") private String auditDate; + @ApiModelProperty(name = "auditType", value = "审核类型") + private String auditType; - public String getShopId() { - return shopId == null ? "" : shopId.trim(); + public String getShopAuditId() { + return shopAuditId; } - public void setShopId(String shopId) { - this.shopId = shopId; + public void setShopAuditId(String shopAuditId) { + this.shopAuditId = shopAuditId; + } + + public String getAuditBId() { + return auditBId == null ? "" : auditBId.trim(); + } + + public void setAuditBId(String auditBId) { + this.auditBId = auditBId; } public String getAuditUser() { @@ -41,6 +55,14 @@ public class ShopAuditLogDTO { this.auditUser = auditUser; } + public String getAuditUserName() { + return auditUserName == null ? "" : auditUserName.trim(); + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + public Integer getAuditStatus() { return auditStatus == null ? 0 : auditStatus; } @@ -65,5 +87,13 @@ public class ShopAuditLogDTO { this.auditDate = auditDate; } + public String getAuditType() { + return auditType == null ? "" : auditType.trim(); + } + + public void setAuditType(String auditType) { + this.auditType = auditType; + } + } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java b/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java index 61404be..29551e6 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java @@ -16,6 +16,9 @@ public class ShopPO { private Double shopStar; private String shopLogo; private Integer shopTemplateId; + private String shopLongitude; + private String shopLatitude; + private String shopVideo; private Double userEvaluate; private Integer isOpen; private String openDate; @@ -75,6 +78,30 @@ public class ShopPO { this.shopTemplateId = shopTemplateId; } + public String getShopLongitude() { + return shopLongitude; + } + + public void setShopLongitude(String shopLongitude) { + this.shopLongitude = shopLongitude; + } + + public String getShopLatitude() { + return shopLatitude; + } + + public void setShopLatitude(String shopLatitude) { + this.shopLatitude = shopLatitude; + } + + public String getShopVideo() { + return shopVideo; + } + + public void setShopVideo(String shopVideo) { + this.shopVideo = shopVideo; + } + public Double getUserEvaluate() { return userEvaluate == null ? 0D : userEvaluate; } diff --git a/src/main/java/cn/com/tenlion/pojo/pos/shopauditlog/ShopAuditLogPO.java b/src/main/java/cn/com/tenlion/pojo/pos/shopauditlog/ShopAuditLogPO.java index d04f7bf..50f0661 100644 --- a/src/main/java/cn/com/tenlion/pojo/pos/shopauditlog/ShopAuditLogPO.java +++ b/src/main/java/cn/com/tenlion/pojo/pos/shopauditlog/ShopAuditLogPO.java @@ -3,25 +3,36 @@ package cn.com.tenlion.pojo.pos.shopauditlog; /** * * @ClassName: ShopAuditLogPO - * @Description: + * @Description: * @Author: CodeFactory - * @Date: 2021-03-18 15:09:25 + * @Date: 2021-04-08 17:02:19 * @Version: 3.0 **/ public class ShopAuditLogPO { - private String shopId; + private String shopAuditId; + private String auditBId; private String auditUser; + private String auditUserName; private Integer auditStatus; private String auditResult; private String auditDate; + private String auditType; - public String getShopId() { - return shopId == null ? "" : shopId.trim(); + public String getShopAuditId() { + return shopAuditId; } - public void setShopId(String shopId) { - this.shopId = shopId; + public void setShopAuditId(String shopAuditId) { + this.shopAuditId = shopAuditId; + } + + public String getAuditBId() { + return auditBId == null ? "" : auditBId.trim(); + } + + public void setAuditBId(String auditBId) { + this.auditBId = auditBId; } public String getAuditUser() { @@ -32,6 +43,14 @@ public class ShopAuditLogPO { this.auditUser = auditUser; } + public String getAuditUserName() { + return auditUserName == null ? "" : auditUserName.trim(); + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + public Integer getAuditStatus() { return auditStatus == null ? 0 : auditStatus; } @@ -56,5 +75,13 @@ public class ShopAuditLogPO { this.auditDate = auditDate; } + public String getAuditType() { + return auditType == null ? "" : auditType.trim(); + } + + public void setAuditType(String auditType) { + this.auditType = auditType; + } + } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java b/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java index 1fd58bc..720c138 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java @@ -35,6 +35,13 @@ public class ShopVO { @CheckNumberAnnotation(name = "模板ID") private Integer shopTemplateId; + @ApiModelProperty(name = "shopLongitude", value = "店铺经度") + private String shopLongitude; + @ApiModelProperty(name = "shopLatitude", value = "店铺维度") + private String shopLatitude; + @ApiModelProperty(name = "shopVideo", value = "店铺宣传视频") + private String shopVideo; + @ApiModelProperty(name = "isOpen", value = "是否营业0:未开业，1:开业中") @CheckNumberAnnotation(name = "是否营业0:未开业，1:开业中") private Integer isOpen; @@ -93,6 +100,30 @@ public class ShopVO { this.shopTemplateId = shopTemplateId; } + public String getShopLongitude() { + return shopLongitude; + } + + public void setShopLongitude(String shopLongitude) { + this.shopLongitude = shopLongitude; + } + + public String getShopLatitude() { + return shopLatitude; + } + + public void setShopLatitude(String shopLatitude) { + this.shopLatitude = shopLatitude; + } + + public String getShopVideo() { + return shopVideo; + } + + public void setShopVideo(String shopVideo) { + this.shopVideo = shopVideo; + } + public Integer getIsOpen() { return isOpen == null ? 0 : isOpen; } diff --git a/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java b/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java index e6afd69..6f2c194 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java @@ -10,30 +10,45 @@ import io.swagger.annotations.ApiModelProperty; * @ClassName: ShopAuditLogVO * @Description: * @Author: CodeFactory - * @Date: 2021-03-18 15:09:25 + * @Date: 2021-04-08 17:02:19 * @Version: 3.0 **/ @ApiModel public class ShopAuditLogVO { - @ApiModelProperty(name = "shopId", value = "店铺ID") - private String shopId; + @ApiModelProperty(name = "shopAuditId", value = "审核ID") + private String shopAuditId; + @ApiModelProperty(name = "auditBId", value = "审核业务ID") + private String auditBId; @ApiModelProperty(name = "auditUser", value = "审核人") private String auditUser; + @ApiModelProperty(name = "auditUserName", value = "审核人姓名") + private String auditUserName; @ApiModelProperty(name = "auditStatus", value = "审核状态：0未审核 1审核通过 -1审核未通过") @CheckNumberAnnotation(name = "审核状态：0未审核 1审核通过 -1审核未通过") private Integer auditStatus; @ApiModelProperty(name = "auditResult", value = "审核说明") private String auditResult; @ApiModelProperty(name = "auditDate", value = "审核时间") + @CheckEmptyAnnotation(name = "审核时间", verifyType = "datetime") private String auditDate; + @ApiModelProperty(name = "auditType", value = "审核类型") + private String auditType; - public String getShopId() { - return shopId == null ? "" : shopId.trim(); + public String getShopAuditId() { + return shopAuditId; } - public void setShopId(String shopId) { - this.shopId = shopId; + public void setShopAuditId(String shopAuditId) { + this.shopAuditId = shopAuditId; + } + + public String getAuditBId() { + return auditBId == null ? "" : auditBId.trim(); + } + + public void setAuditBId(String auditBId) { + this.auditBId = auditBId; } public String getAuditUser() { @@ -44,6 +59,14 @@ public class ShopAuditLogVO { this.auditUser = auditUser; } + public String getAuditUserName() { + return auditUserName == null ? "" : auditUserName.trim(); + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + public Integer getAuditStatus() { return auditStatus == null ? 0 : auditStatus; } @@ -68,5 +91,13 @@ public class ShopAuditLogVO { this.auditDate = auditDate; } + public String getAuditType() { + return auditType == null ? "" : auditType.trim(); + } + + public void setAuditType(String auditType) { + this.auditType = auditType; + } + } diff --git a/src/main/java/cn/com/tenlion/service/shop/IShopService.java b/src/main/java/cn/com/tenlion/service/shop/IShopService.java index cac7c01..295b751 100644 --- a/src/main/java/cn/com/tenlion/service/shop/IShopService.java +++ b/src/main/java/cn/com/tenlion/service/shop/IShopService.java @@ -22,6 +22,12 @@ import java.util.Map; public interface IShopService { + /** + * 修改认证状态 + * @param shopId + */ + void updateIsCertification(String shopId); + /** * 新增 * diff --git a/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java b/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java index 572ac7d..013cdcd 100644 --- a/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java @@ -59,6 +59,14 @@ public class ShopServiceImpl extends DefaultBaseService implements IShopService private IUserService userService; + public void updateIsCertification(String shopId){ + Map params = new HashMap(); + params.put("isCertification","1"); + params.put("shopId",shopId); + shopDao.updateIsCertification(params); + } + + @Override public void save(ShopVO shopVO) { diff --git a/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java b/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java index 6f1133f..dbe7e80 100644 --- a/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java @@ -58,21 +58,18 @@ public class ShopAuditLogServiceImpl extends DefaultBaseService implements IShop @Override public String saveReturnId(String token, ShopAuditLogVO shopAuditLogVO) { + shopAuditLogVO.setAuditUserName(securityComponent.getCurrentUser().getUserName()); + shopAuditLogVO.setAuditUser(securityComponent.getCurrentUser().getUserId()); String shopAuditLogId = UUIDUtil.getUUID(); Map params = HashMapUtil.beanToMap(shopAuditLogVO); params.put("shopAuditLogId", shopAuditLogId); params.put("auditDate", DateUtil.getTime()); - params.put("auditUser", securityComponent.getCurrentUser().getUserId()); - params.put("auditUserName", securityComponent.getCurrentUser().getUserName()); if (StringUtils.isBlank(token)) { setSaveInfo(params); } else { setAppSaveInfo(token, params); } shopAuditLogDao.save(params); - - - return shopAuditLogId; } diff --git a/src/main/resources/mybatis/mapper/shop/shop-mapper.xml b/src/main/resources/mybatis/mapper/shop/shop-mapper.xml index 8d116b6..4cbece3 100644 --- a/src/main/resources/mybatis/mapper/shop/shop-mapper.xml +++ b/src/main/resources/mybatis/mapper/shop/shop-mapper.xml @@ -10,6 +10,9 @@ + + + @@ -28,6 +31,9 @@ + + + @@ -47,6 +53,9 @@ + + + @@ -69,6 +78,9 @@ shop_star, shop_logo, shop_template_id, + shop_longitude, + shop_latitude, + shop_video, user_evaluate, is_open, open_date, @@ -87,6 +99,9 @@ #{shopStar}, #{shopLogo}, #{shopTemplateId}, + #{shopLongitude}, + #{shopLatitude}, + #{shopVideo}, #{userEvaluate}, #{isOpen}, #{openDate}, @@ -152,6 +167,15 @@ shop_template_id = #{shopTemplateId}, + + shop_longitude = #{shopLongitude}, + + + shop_latitude = #{shopLatitude}, + + + shop_video = #{shopVideo}, + user_evaluate = #{userEvaluate}, @@ -177,6 +201,20 @@ shop_id = #{shopId} + + + + UPDATE + svc_shop + SET + is_certification = #{isCertification} + WHERE + shop_id = #{shopId} + + + + + SELECT - t1.shop_id, - t1.audit_user, - t1.audit_user_name, - t1.audit_status, - t1.audit_result, - t1.audit_date - + t1.shop_audit_id, + t1.audit_b_id, + t1.audit_user, + t1.audit_user_name, + t1.audit_status, + t1.audit_result, + t1.audit_date, + t1.audit_type FROM - svc_shop_audit_log t1 + svc_shop_audit_log t1 WHERE - 1 = 1 + t1.shop_audit_id = #{shopAuditId} - + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/shopcertification/list.html b/src/main/resources/static/route/shopcertification/list.html index 9d6a8fe..697185e 100644 --- a/src/main/resources/static/route/shopcertification/list.html +++ b/src/main/resources/static/route/shopcertification/list.html @@ -147,7 +147,7 @@ return rowData; } }, - {field: 'certificationFoundTime', width: 180, title: '企业注册时间', align:'center', + {field: 'creator', width: 180, title: '申请人', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -156,7 +156,7 @@ return rowData; } }, - {field: 'certificationLicenseTerm', width: 180, title: '营业期限', align:'center', + {field: 'gmtCreate', width: 180, title: '申请时间', align:'center',fixed: 'right', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -182,11 +182,14 @@ }, {field:'cz', width:220, title: '操作', align:'center', fixed: 'right', templet: function(row) { - var rowData = '
' + - '' + - '' + - '' + - '
'; + var rowData = '
' + +'' + +'' + if(row['auditStatus'] === 0){ + rowData += '' + } + rowData += '' + rowData += '
'; return rowData; } } @@ -361,6 +364,19 @@ reloadTable(); } }); + } else if (event === 'auditHistory'){ + layer.open({ + type: 2, + title: false, + closeBtn: 0, + area: ['50%', '50%'], + shadeClose: true, + anim: 2, + content: top.restAjax.path('route/shopauditlog/audit.html?shopId={shopId}', [data.shopId]), + end: function() { + reloadTable(); + } + }); } }); });