Tenlion/business-card
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

店铺新加字段

Browse Source
This commit is contained in:
ly19960718 2021-04-09 09:56:22 +08:00
parent e4888b4a93
commit 9546f17e9b
17 changed files with 497 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/cn/com/tenlion/controller/api/shopauditlog/ShopAuditLogController.java
View File

@ -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<ShopAuditLogDTO> list(@PathVariable("shopId") String shopId) {
Map<String, Object> 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<ShopAuditLogDTO> list() {
Map<String, Object> params = requestParams();
return shopAuditLogService.list(params);
}
@ApiOperation(value = "分页列表", notes = "分页列表接口")
@ApiImplicitParams({

10
src/main/java/cn/com/tenlion/controller/app/apis/shopauditlog/ShopAuditLogAppController.java
View File

@ -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<ShopAuditLogDTO> list(@RequestHeader("token") String token) {
@GetMapping("list/{bId}")
public List<ShopAuditLogDTO> list(@RequestHeader("token") String token,@PathVariable("bId") String bId) {
Map<String, Object> params = requestParams();
params.put("auditBId",bId);
return shopAuditLogService.list(params);
}

8
src/main/java/cn/com/tenlion/dao/shop/IShopDao.java
View File

@ -23,6 +23,14 @@ import java.util.Map;
@Repository
public interface IShopDao {
/**
* 修改认证状态
* @param params
* @throws UpdateException
*/
void updateIsCertification(Map<String, Object> params) throws UpdateException;
/**
* 修改审核结果
* @param params

29
src/main/java/cn/com/tenlion/pojo/bos/shop/ShopBO.java
View File

@ -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;
}

39
src/main/java/cn/com/tenlion/pojo/bos/shopauditlog/ShopAuditLogBO.java
View File

@ -5,23 +5,34 @@ package cn.com.tenlion.pojo.bos.shopauditlog;
* @ClassName: ShopAuditLogBO
* @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;
}
}

31
src/main/java/cn/com/tenlion/pojo/dtos/shop/ShopDTO.java
View File

@ -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;
}

44
src/main/java/cn/com/tenlion/pojo/dtos/shopauditlog/ShopAuditLogDTO.java
View File

@ -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;
}
}

27
src/main/java/cn/com/tenlion/pojo/pos/shop/ShopPO.java
View File

@ -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;
}

39
src/main/java/cn/com/tenlion/pojo/pos/shopauditlog/ShopAuditLogPO.java
View File

@ -5,23 +5,34 @@ package cn.com.tenlion.pojo.pos.shopauditlog;
* @ClassName: ShopAuditLogPO
* @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;
}
}

31
src/main/java/cn/com/tenlion/pojo/vos/shop/ShopVO.java
View File

@ -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;
}

45
src/main/java/cn/com/tenlion/pojo/vos/shopauditlog/ShopAuditLogVO.java
View File

@ -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;
}
}

6
src/main/java/cn/com/tenlion/service/shop/IShopService.java
View File

@ -22,6 +22,12 @@ import java.util.Map;
public interface IShopService {
/**
* 修改认证状态
* @param shopId
*/
void updateIsCertification(String shopId);
/**
* 新增
*

8
src/main/java/cn/com/tenlion/service/shop/impl/ShopServiceImpl.java
View File

@ -59,6 +59,14 @@ public class ShopServiceImpl extends DefaultBaseService implements IShopService
private IUserService userService;
public void updateIsCertification(String shopId){
Map<String, Object> params = new HashMap<String, Object>();
params.put("isCertification","1");
params.put("shopId",shopId);
shopDao.updateIsCertification(params);
}
@Override
public void save(ShopVO shopVO) {

7
src/main/java/cn/com/tenlion/service/shopauditlog/impl/ShopAuditLogServiceImpl.java
View File

@ -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<String, Object> 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;
}

57
src/main/resources/mybatis/mapper/shop/shop-mapper.xml
View File

@ -10,6 +10,9 @@
<result column="shop_star" property="shopStar"/>
<result column="shop_logo" property="shopLogo"/>
<result column="shop_template_id" property="shopTemplateId"/>
<result column="shop_longitude" property="shopLongitude"/>
<result column="shop_latitude" property="shopLatitude"/>
<result column="shop_video" property="shopVideo"/>
<result column="user_evaluate" property="userEvaluate"/>
<result column="is_open" property="isOpen"/>
@ -28,6 +31,9 @@
<result column="shop_star" property="shopStar"/>
<result column="shop_logo" property="shopLogo"/>
<result column="shop_template_id" property="shopTemplateId"/>
<result column="shop_longitude" property="shopLongitude"/>
<result column="shop_latitude" property="shopLatitude"/>
<result column="shop_video" property="shopVideo"/>
<result column="user_evaluate" property="userEvaluate"/>
<result column="is_open" property="isOpen"/>
<result column="open_date" property="openDate"/>
@ -47,6 +53,9 @@
<result column="shop_star" property="shopStar"/>
<result column="shop_logo" property="shopLogo"/>
<result column="shop_template_id" property="shopTemplateId"/>
<result column="shop_longitude" property="shopLongitude"/>
<result column="shop_latitude" property="shopLatitude"/>
<result column="shop_video" property="shopVideo"/>
<result column="user_evaluate" property="userEvaluate"/>
<result column="is_open" property="isOpen"/>
<result column="open_date" property="openDate"/>
@ -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 @@
<if test="shopTemplateId != null and shopTemplateId != ''">
shop_template_id = #{shopTemplateId},
</if>
<if test="shopLongitude != null and shopLongitude != ''">
shop_longitude = #{shopLongitude},
</if>
<if test="shopLatitude != null and shopLatitude != ''">
shop_latitude = #{shopLatitude},
</if>
<if test="shopVideo != null and shopVideo != ''">
shop_video = #{shopVideo},
</if>
<if test="userEvaluate != null">
user_evaluate = #{userEvaluate},
</if>
@ -177,6 +201,20 @@
shop_id = #{shopId}
</update>
<!-- 修改认证状态 -->
<update id="updateIsCertification" parameterType="map">
UPDATE
svc_shop
SET
is_certification = #{isCertification}
WHERE
shop_id = #{shopId}
</update>
<!-- 获取详情-->
<select id="get" parameterType="map" resultMap="shopDTO">
SELECT
@ -187,6 +225,9 @@
t1.shop_star,
t1.shop_logo,
t1.shop_template_id,
t1.shop_longitude,
t1.shop_latitude,
t1.shop_video,
t1.user_evaluate,
t1.is_open,
t1.open_date,
@ -212,6 +253,9 @@
t1.shop_star,
t1.shop_logo,
t1.shop_template_id,
t1.shop_longitude,
t1.shop_latitude,
t1.shop_video,
t1.user_evaluate,
t1.audit_result,
t1.is_open,
@ -242,6 +286,9 @@
t1.shop_star,
t1.shop_logo,
t1.shop_template_id,
t1.shop_longitude,
t1.shop_latitude,
t1.shop_video,
t1.user_evaluate,
t1.is_open,
t1.open_date,
@ -271,6 +318,9 @@
t1.shop_star,
t1.shop_logo,
t1.shop_template_id,
t1.shop_longitude,
t1.shop_latitude,
t1.shop_video,
t1.user_evaluate,
t1.is_open,
t1.open_date,
@ -311,6 +361,9 @@
t1.shop_star,
t1.shop_logo,
t1.shop_template_id,
t1.shop_longitude,
t1.shop_latitude,
t1.shop_video,
t1.user_evaluate,
t1.is_open,
t1.open_date,
@ -357,6 +410,9 @@
t1.shop_star,
t1.shop_logo,
t1.shop_template_id,
t1.shop_longitude,
t1.shop_latitude,
t1.shop_video,
t1.user_evaluate,
t1.is_open,
t1.open_date,
@ -373,7 +429,6 @@
t1.is_delete = 0
<if test="keywords != null and keywords != ''">
AND (
<!-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
</if>

147
src/main/resources/mybatis/mapper/shopauditlog/shopauditlog-mapper.xml
View File

@ -3,67 +3,83 @@
<mapper namespace="cn.com.tenlion.dao.shopauditlog.IShopAuditLogDao">
<resultMap id="shopAuditLogDTO" type="cn.com.tenlion.pojo.dtos.shopauditlog.ShopAuditLogDTO">
<result column="shop_id" property="shopId"/>
<result column="shop_audit_id" property="shopAuditId"/>
<result column="audit_b_id" property="auditBId"/>
<result column="audit_user" property="auditUser"/>
<result column="audit_user_name" property="auditUserName"/>
<result column="audit_status" property="auditStatus"/>
<result column="audit_result" property="auditResult"/>
<result column="audit_date" property="auditDate"/>
<result column="audit_type" property="auditType"/>
</resultMap>
<resultMap id="shopAuditLogBO" type="cn.com.tenlion.pojo.bos.shopauditlog.ShopAuditLogBO">
<result column="shop_id" property="shopId"/>
<result column="shop_audit_id" property="shopAuditId"/>
<result column="audit_b_id" property="auditBId"/>
<result column="audit_user" property="auditUser"/>
<result column="audit_user_name" property="auditUserName"/>
<result column="audit_status" property="auditStatus"/>
<result column="audit_result" property="auditResult"/>
<result column="audit_date" property="auditDate"/>
<result column="audit_type" property="auditType"/>
</resultMap>
<resultMap id="shopAuditLogPO" type="cn.com.tenlion.pojo.pos.shopauditlog.ShopAuditLogPO">
<result column="shop_id" property="shopId"/>
<result column="shop_audit_id" property="shopAuditId"/>
<result column="audit_b_id" property="auditBId"/>
<result column="audit_user" property="auditUser"/>
<result column="audit_user_name" property="auditUserName"/>
<result column="audit_status" property="auditStatus"/>
<result column="audit_result" property="auditResult"/>
<result column="audit_date" property="auditDate"/>
<result column="audit_type" property="auditType"/>
</resultMap>
<!-- 新增 -->
<insert id="save" parameterType="map">
INSERT INTO svc_shop_audit_log(
shop_id,
shop_audit_id,
audit_b_id,
audit_user,
audit_user_name,
audit_status,
audit_result,
audit_date
audit_date,
audit_type
) VALUES(
#{shopId},
#{shopAuditId},
#{auditBId},
#{auditUser},
#{auditUserName},
#{auditStatus},
#{auditResult},
#{auditDate}
#{auditDate},
#{auditType}
)
</insert>
<!-- 删除（物理） -->
<update id="delete" parameterType="map">
DELETE FROM
svc_shop_audit_log
WHERE
</update>
<!-- 修改 -->
<update id="update" parameterType="map">
UPDATE
svc_shop_audit_log
SET
<if test="shopId != null and shopId != ''">
shop_id = #{shopId},
<if test="auditBId != null and auditBId != ''">
audit_b_id = #{auditBId},
</if>
<if test="auditUser != null and auditUser != ''">
audit_user = #{auditUser},
</if>
<if test="auditUserName != null and auditUserName != ''">
audit_user_name = #{auditUserName},
</if>
<if test="auditStatus != null">
audit_status = #{auditStatus},
</if>
@ -71,116 +87,143 @@
audit_result = #{auditResult},
</if>
<if test="auditDate != null and auditDate != ''">
audit_date = #{auditDate}
audit_date = #{auditDate},
</if>
<if test="auditType != null and auditType != ''">
audit_type = #{auditType},
</if>
WHERE
t1.shop_audit_id = #{shopAuditId}
</update>
<!-- 详情 -->
<select id="get" parameterType="map" resultMap="shopAuditLogDTO">
SELECT
t1.shop_id,
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_date,
t1.audit_type
FROM
svc_shop_audit_log t1
WHERE
1 = 1
t1.shop_audit_id = #{shopAuditId}
</select>
<!-- <EFBFBD><EFBFBD><EFBFBD><EFBFBD> -->
<!-- 详情 -->
<select id="getBO" parameterType="map" resultMap="shopAuditLogBO">
SELECT
t1.shop_id,
t1.audit_user,
t1.audit_status,
t1.audit_result,
t1.audit_date
FROM
svc_shop_audit_log t1
WHERE
1 = 1
</select>
<select id="getPO" parameterType="map" resultMap="shopAuditLogPO">
SELECT
t1.shop_id,
t1.audit_user,
t1.audit_status,
t1.audit_result,
t1.audit_date
FROM
svc_shop_audit_log t1
WHERE
1 = 1
</select>
<select id="list" parameterType="map" resultMap="shopAuditLogDTO">
SELECT
t1.shop_id,
t1.shop_audit_id,
t1.audit_b_id,
t1.audit_user,
t1.audit_user_name,
t1.audit_status,
t1.audit_result,
t1.audit_date,
1
t1.audit_type
FROM
svc_shop_audit_log t1
WHERE
t1.shop_id = #{shopId}
t1.shop_audit_id = #{shopAuditId}
</select>
<!-- 详情 -->
<select id="getPO" parameterType="map" resultMap="shopAuditLogPO">
SELECT
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
WHERE
t1.shop_audit_id = #{shopAuditId}
</select>
<!-- 列表 -->
<select id="list" parameterType="map" resultMap="shopAuditLogDTO">
SELECT
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
WHERE
t1.audit_b_id = #{auditBId}
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
</if>
ORDER BY t1.audit_date DESC
</select>
<!-- 列表 -->
<select id="listBO" parameterType="map" resultMap="shopAuditLogBO">
SELECT
t1.shop_id,
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_date,
t1.audit_type
FROM
svc_shop_audit_log t1
WHERE
1 = 1
t1.audit_b_id = #{auditBId}
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
</if>
</select>
<!-- 列表 -->
<select id="listPO" parameterType="map" resultMap="shopAuditLogPO">
SELECT
t1.shop_id,
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_date,
t1.audit_type
FROM
svc_shop_audit_log t1
WHERE
1 = 1
t1.audit_b_id = #{auditBId}
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
)
</if>
</select>
<!-- 统计 -->
<select id="count" parameterType="map" resultType="Integer">
SELECT
COUNT(*)
FROM
svc_shop_audit_log t1
WHERE
1 = 1
t1.audit_b_id = #{auditBId}
</select>
</mapper>

30
src/main/resources/static/route/shopcertification/list.html
View File

@ -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 = '<div class="layui-btn-group">' +
'<button type="button" class="layui-btn layui-btn-xs" lay-event="show">详情</button>' +
'<button type="button" class="layui-btn layui-btn-xs" lay-event="shop">店铺</button>' +
'<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="audit">审核</button>' +
'</div>';
var rowData = '<div class="layui-btn-group">'
+'<button type="button" class="layui-btn layui-btn-xs" lay-event="show">详情</button>'
+'<button type="button" class="layui-btn layui-btn-xs" lay-event="shop">店铺</button>'
if(row['auditStatus'] === 0){
rowData += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="audit">审核</button>'
}
rowData += '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="auditHistory">审核记录</button>'
rowData += '</div>';
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();
}
});
}
});
});