[admin]增加评价功能

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/BbsController.java

@@ -20,15 +20,14 @@ import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
- * @Description: 评论
+ * @Description: 评价
  * @Author: jeecg-boot
- * @Date:   2023-06-05
+ * @Date:   2023-06-07
  * @Version: V1.0
  */
-@Api(tags="评论")
+@Api(tags="评价")
 @RestController
 @RequestMapping("/erp/bbs")
 @Slf4j
@@ -45,8 +44,8 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "评论-分页列表查询")
-	@ApiOperation(value="评论-分页列表查询", notes="评论-分页列表查询")
+	//@AutoLog(value = "评价-分页列表查询")
+	@ApiOperation(value="评价-分页列表查询", notes="评价-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<Bbs>> queryPageList(Bbs bbs,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -64,9 +63,8 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
 	 * @param bbs
 	 * @return
 	 */
-	@AutoLog(value = "评论-添加")
-	@ApiOperation(value="评论-添加", notes="评论-添加")
-	//@RequiresPermissions("erp:bbs:add")
+	@AutoLog(value = "评价-添加")
+	@ApiOperation(value="评价-添加", notes="评价-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Bbs bbs) {
 		bbsService.save(bbs);
@@ -79,9 +77,8 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
 	 * @param bbs
 	 * @return
 	 */
-	@AutoLog(value = "评论-编辑")
-	@ApiOperation(value="评论-编辑", notes="评论-编辑")
-	//@RequiresPermissions("erp:bbs:edit")
+	@AutoLog(value = "评价-编辑")
+	@ApiOperation(value="评价-编辑", notes="评价-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Bbs bbs) {
 		bbsService.updateById(bbs);
@@ -94,9 +91,8 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "评论-通过id删除")
-	@ApiOperation(value="评论-通过id删除", notes="评论-通过id删除")
-	//@RequiresPermissions("erp:bbs:delete")
+	@AutoLog(value = "评价-通过id删除")
+	@ApiOperation(value="评价-通过id删除", notes="评价-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		bbsService.removeById(id);
@@ -109,9 +105,8 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "评论-批量删除")
-	@ApiOperation(value="评论-批量删除", notes="评论-批量删除")
-	//@RequiresPermissions("erp:bbs:deleteBatch")
+	@AutoLog(value = "评价-批量删除")
+	@ApiOperation(value="评价-批量删除", notes="评价-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.bbsService.removeByIds(Arrays.asList(ids.split(",")));
@@ -124,8 +119,8 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "评论-通过id查询")
-	@ApiOperation(value="评论-通过id查询", notes="评论-通过id查询")
+	//@AutoLog(value = "评价-通过id查询")
+	@ApiOperation(value="评价-通过id查询", notes="评价-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<Bbs> queryById(@RequestParam(name="id",required=true) String id) {
 		Bbs bbs = bbsService.getById(id);
@@ -141,10 +136,9 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
     * @param request
     * @param bbs
     */
-    //@RequiresPermissions("erp:bbs:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Bbs bbs) {
-        return super.exportXls(request, bbs, Bbs.class, "评论");
+        return super.exportXls(request, bbs, Bbs.class, "评价");
     }
 
     /**
@@ -154,7 +148,6 @@ public class BbsController extends JeecgController<Bbs, IBbsService> {
     * @param response
     * @return
     */
-    //@RequiresPermissions("erp:bbs:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, Bbs.class);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Bbs.java

@@ -16,16 +16,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 评论
+ * @Description: 评价
  * @Author: jeecg-boot
- * @Date:   2023-06-05
+ * @Date:   2023-06-07
  * @Version: V1.0
  */
 @Data
 @TableName("bbs")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="bbs对象", description="评论")
+@ApiModel(value="bbs对象", description="评价")
 public class Bbs implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -58,6 +58,30 @@ public class Bbs implements Serializable {
 	@Excel(name = "用户id", width = 15)
     @ApiModelProperty(value = "用户id")
     private java.lang.String userId;
+	/**物流打分，满分5星*/
+	@Excel(name = "物流打分，满分5星", width = 15)
+    @ApiModelProperty(value = "物流打分，满分5星")
+    private java.lang.String deliveryScore;
+	/**商品打分，满分5星*/
+	@Excel(name = "商品打分，满分5星", width = 15)
+    @ApiModelProperty(value = "商品打分，满分5星")
+    private java.lang.String qualityScore;
+	/**服务打分，满分5星*/
+	@Excel(name = "服务打分，满分5星", width = 15)
+    @ApiModelProperty(value = "服务打分，满分5星")
+    private java.lang.String serviceScore;
+	/**是否推荐打分，满分5星*/
+	@Excel(name = "是否推荐打分，满分5星", width = 15)
+    @ApiModelProperty(value = "是否推荐打分，满分5星")
+    private java.lang.String suggestScore;
+	/**图片url*/
+	@Excel(name = "图片url", width = 15)
+    @ApiModelProperty(value = "图片url")
+    private java.lang.String url;
+	/**产品id*/
+	@Excel(name = "产品id", width = 15)
+    @ApiModelProperty(value = "产品id")
+    private java.lang.Integer goodId;
 	/**产品*/
 	@Excel(name = "产品", width = 15)
     @ApiModelProperty(value = "产品")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Order.java

@@ -67,6 +67,10 @@ public class Order implements Serializable {
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
+    /**审核人id*/
+    @Excel(name = "审核人id", width = 15)
+    @ApiModelProperty(value = "审核人id")
+    private java.lang.String financeId;
 	/**审核人*/
 	@Excel(name = "审核人", width = 15)
     @ApiModelProperty(value = "审核人")
@@ -81,10 +85,22 @@ public class Order implements Serializable {
 	@Excel(name = "审核意见", width = 15)
     @ApiModelProperty(value = "审核意见")
     private java.lang.String financeRemark;
+    /**派单人Id*/
+    @Excel(name = "派单人Id", width = 15)
+    @ApiModelProperty(value = "派单人Id")
+    private java.lang.String dispacherId;
 	/**派单人*/
 	@Excel(name = "派单人", width = 15)
     @ApiModelProperty(value = "派单人")
     private java.lang.String dispacher;
+    /**物流单号*/
+    @Excel(name = "物流单号", width = 15)
+    @ApiModelProperty(value = "物流单号")
+    private java.lang.String logisticsId;
+    /**派单备注*/
+    @Excel(name = "派单备注", width = 15)
+    @ApiModelProperty(value = "派单备注")
+    private java.lang.String dispacherRemark;
 	/**派发时间*/
 	@Excel(name = "派发时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/BbsMapper.java

@@ -7,9 +7,9 @@ import org.jeecg.modules.demo.erp.entity.Bbs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 评论
+ * @Description: 评价
  * @Author: jeecg-boot
- * @Date:   2023-06-05
+ * @Date:   2023-06-07
  * @Version: V1.0
  */
 public interface BbsMapper extends BaseMapper<Bbs> {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/service/IBbsService.java

@@ -4,9 +4,9 @@ import org.jeecg.modules.demo.erp.entity.Bbs;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 评论
+ * @Description: 评价
  * @Author: jeecg-boot
- * @Date:   2023-06-05
+ * @Date:   2023-06-07
  * @Version: V1.0
  */
 public interface IBbsService extends IService<Bbs> {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/service/impl/BbsServiceImpl.java

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 评论
+ * @Description: 评价
  * @Author: jeecg-boot
- * @Date:   2023-06-05
+ * @Date:   2023-06-07
  * @Version: V1.0
  */
 @Service