Browse Source

驾校-教练评价

wwl 4 years ago
parent
commit
35af3e1fed
24 changed files with 459 additions and 354 deletions
  1. 21 12
      hzgzpt-admin/src/main/java/com/miaxis/app/controller/coach/CoachEvaluateController.java
  2. 16 11
      hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolEvaluateController.java
  3. 22 84
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachEvaluate.java
  4. 47 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/dto/CoachEvaluateDto.java
  5. 0 26
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachEvaluateMapper.java
  6. 15 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachEvaluateImagesService.java
  7. 8 9
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachEvaluateService.java
  8. 19 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateImagesServiceImpl.java
  9. 55 12
      hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateServiceImpl.java
  10. 18 6
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluate.java
  11. 4 8
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluateImages.java
  12. 55 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/dto/SchoolEvaluateDto.java
  13. 0 18
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolEvaluateMapper.java
  14. 15 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateImagesService.java
  15. 8 8
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateService.java
  16. 19 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolEvaluateImagesServiceImpl.java
  17. 51 14
      hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolEvaluateServiceImpl.java
  18. 3 5
      hzgzpt-service-app/src/main/java/com/miaxis/app/sms/ISmsService.java
  19. 31 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/sms/domain/SmsParameter.java
  20. 24 23
      hzgzpt-service-app/src/main/java/com/miaxis/app/sms/impl/SmsServiceImpl.java
  21. 3 0
      hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/dto/UserDto.java
  22. 16 14
      hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java
  23. 5 58
      hzgzpt-service-app/src/main/resources/mapper/coach/CoachEvaluateMapper.xml
  24. 4 46
      hzgzpt-service-app/src/main/resources/mapper/school/SchoolEvaluateMapper.xml

+ 21 - 12
hzgzpt-admin/src/main/java/com/miaxis/app/controller/coach/CoachEvaluateController.java

@@ -1,7 +1,7 @@
 package com.miaxis.app.controller.coach;
 
-import com.miaxis.app.coach.domain.CoachEvaluate;
 import com.miaxis.app.coach.domain.CoachEvaluateLabel;
+import com.miaxis.app.coach.domain.dto.CoachEvaluateDto;
 import com.miaxis.app.coach.service.ICoachEvaluateService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
@@ -10,7 +10,10 @@ import com.miaxis.common.enums.BusinessTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -30,16 +33,6 @@ public class CoachEvaluateController extends BaseController{
     private ICoachEvaluateService coachEvaluateService;
 
 
-    /**
-     * 新增教练评价
-     */
-    @Log(title = "教练评价", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增教练评价")
-    public Response<Integer> add(@RequestBody CoachEvaluate coachEvaluate){
-        return toResponse(coachEvaluateService.insertCoachEvaluate(coachEvaluate));
-    }
-
 
     /**
      * 查询教练评价标签列表
@@ -51,4 +44,20 @@ public class CoachEvaluateController extends BaseController{
         return Response.success(list);
     }
 
+
+    /**
+     * 新增教练评价
+     */
+    @Log(title = "教练评价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/addCoachEvaluate")
+    @ApiOperation("新增教练评价")
+    public Response addCoachEvaluate(CoachEvaluateDto coachEvaluateDto){
+        try {
+            return coachEvaluateService.addCoachEvaluate(coachEvaluateDto);
+        }catch (Exception e){
+            return Response.error();
+        }
+    }
+
+
 }

+ 16 - 11
hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolEvaluateController.java

@@ -3,6 +3,7 @@ package com.miaxis.app.controller.school;
 
 import com.miaxis.app.school.domain.SchoolEvaluate;
 import com.miaxis.app.school.domain.SchoolEvaluateLabel;
+import com.miaxis.app.school.domain.dto.SchoolEvaluateDto;
 import com.miaxis.app.school.service.ISchoolEvaluateService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
@@ -32,17 +33,6 @@ public class SchoolEvaluateController extends BaseController{
     private ISchoolEvaluateService schoolEvaluateService;
 
 
-    /**
-     * 新增驾校评价
-     */
-    @Log(title = "驾校评价", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增驾校评价")
-    public Response<Integer> add(@RequestBody SchoolEvaluate schoolEvaluate){
-        return toResponse(schoolEvaluateService.insertSchoolEvaluate(schoolEvaluate));
-    }
-
-
     /**
      * 查询驾校评价标签列表
      */
@@ -53,5 +43,20 @@ public class SchoolEvaluateController extends BaseController{
         return Response.success(list);
     }
 
+    /**
+     * 新增驾校评价
+     */
+    @Log(title = "驾校评价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping("/addSchoolEvaluate")
+    @ApiOperation("新增驾校评价")
+    public Response addSchoolEvaluate(SchoolEvaluateDto schoolEvaluateDto){
+        try {
+            return schoolEvaluateService.addSchoolEvaluate(schoolEvaluateDto);
+        }catch (Exception e){
+            return Response.error();
+        }
+    }
+
+
 
 }

+ 22 - 84
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachEvaluate.java

@@ -8,8 +8,6 @@ import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 /**
  * 教练评价对象 coach_evaluate
  *
@@ -33,17 +31,29 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "评价用户ID")
     private Long userId;
 
+    /** 服务态度 */
+    @Excel(name = "服务态度")
+    @TableField("attitude_starts")
+    @ApiModelProperty(value = "服务态度")
+    private Long attitudeStarts;
+
     /** 教练员全国统一编号 */
     @Excel(name = "教练员全国统一编号")
     @TableField("coachnum")
     @ApiModelProperty(value = "教练员全国统一编号")
     private String coachnum;
 
-    /** 评价星数1-5 */
-    @Excel(name = "评价星数1-5")
-    @TableField("star")
-    @ApiModelProperty(value = "评价星数1-5")
-    private Long star;
+    /** 场地星级 */
+    @Excel(name = "场地星级")
+    @TableField("area_starts")
+    @ApiModelProperty(value = "场地星级")
+    private Long areaStarts;
+
+    /** 总体星级1-5 */
+    @Excel(name = "总体星级1-5")
+    @TableField("totel_starts")
+    @ApiModelProperty(value = "总体星级1-5")
+    private Long totelStarts;
 
     /** 评价内容 */
     @Excel(name = "评价内容")
@@ -57,11 +67,11 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "标签表ID串")
     private String labelIds;
 
-    /** $column.columnComment */
-    @Excel(name = "标签表ID串")
-    @TableField("images_id")
-    @ApiModelProperty(value = "$column.columnComment")
-    private String imagesId;
+    /** 是否匿名:0 :公开  1匿名 */
+    @Excel(name = "是否匿名:0 :公开  1匿名")
+    @TableField("is_anonymous")
+    @ApiModelProperty(value = "是否匿名:0 :公开  1匿名")
+    private Integer isAnonymous;
 
     /** 状态   0:启用 1:禁用 */
     @Excel(name = "状态   0:启用 1:禁用")
@@ -69,76 +79,4 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "状态   0:启用 1:禁用")
     private Integer status;
 
-    public void setId(Long id){
-        this.id = id;
-    }
-
-    public Long getId(){
-        return id;
-    }
-    public void setUserId(Long userId){
-        this.userId = userId;
-    }
-
-    public Long getUserId(){
-        return userId;
-    }
-    public void setCoachnum(String coachnum){
-        this.coachnum = coachnum;
-    }
-
-    public String getCoachnum(){
-        return coachnum;
-    }
-    public void setStar(Long star){
-        this.star = star;
-    }
-
-    public Long getStar(){
-        return star;
-    }
-    public void setContent(String content){
-        this.content = content;
-    }
-
-    public String getContent(){
-        return content;
-    }
-    public void setLabelIds(String labelIds){
-        this.labelIds = labelIds;
-    }
-
-    public String getLabelIds(){
-        return labelIds;
-    }
-    public void setImagesId(String imagesId){
-        this.imagesId = imagesId;
-    }
-
-    public String getImagesId(){
-        return imagesId;
-    }
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-
-    public Integer getStatus(){
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("userId", getUserId())
-            .append("coachnum", getCoachnum())
-            .append("star", getStar())
-            .append("content", getContent())
-            .append("labelIds", getLabelIds())
-            .append("imagesId", getImagesId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("status", getStatus())
-            .toString();
-    }
 }

+ 47 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/dto/CoachEvaluateDto.java

@@ -0,0 +1,47 @@
+package com.miaxis.app.coach.domain.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 教练评价对象 coach_evaluate
+ *
+ * @author wwl
+ * @date 2020-12-28
+ */
+@Data
+public class CoachEvaluateDto extends BaseBusinessEntity {
+
+    @ApiModelProperty(value = "评价用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "教练员全国统一编号")
+    private String coachnum;
+
+    @ApiModelProperty(value = "态度星级")
+    private Long attitudeStarts;
+
+    @ApiModelProperty(value = "场级星级")
+    private Long areaStarts;
+
+    @ApiModelProperty(value = "总体星数:星星数1-5星")
+    private Long totalStarts;
+
+    @ApiModelProperty(value = "评价内容")
+    private String content;
+
+    @ApiModelProperty(value = "标签表ID串")
+    private String labelIds;
+
+    @ApiModelProperty(value = "是否匿名:0 :公开  1匿名")
+    private String isAnonymous;
+
+    /**
+     * [{"imagePath":"/test/1.png","imageUrl":"http://image.jppt.com.cn/test/1.png"},{"imagePath":"/test/2.png","imageUrl":"http://image.jppt.com.cn/test/2.png"}]
+     */
+    @ApiModelProperty(value = "图片json串")
+    private String imagesJson;
+
+
+}

+ 0 - 26
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachEvaluateMapper.java

@@ -4,8 +4,6 @@ package com.miaxis.app.coach.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.app.coach.domain.CoachEvaluate;
 
-import java.util.List;
-
 /**
  * 教练评价Mapper接口
  *
@@ -14,29 +12,5 @@ import java.util.List;
  */
 public interface CoachEvaluateMapper extends BaseMapper<CoachEvaluate> {
 
-    /**
-     * 查询教练评价列表
-     *
-     * @param coachEvaluate 教练评价
-     * @return 教练评价集合
-     */
-    public List<CoachEvaluate> selectCoachEvaluateList(CoachEvaluate coachEvaluate);
-
-    /**
-     * 新增教练评价
-     *
-     * @param coachEvaluate 教练评价
-     * @return 结果
-     */
-    public int insertCoachEvaluate(CoachEvaluate coachEvaluate);
-
-    /**
-     * 修改教练评价
-     *
-     * @param coachEvaluate 教练评价
-     * @return 结果
-     */
-    public int updateCoachEvaluate(CoachEvaluate coachEvaluate);
-
 
 }

+ 15 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachEvaluateImagesService.java

@@ -0,0 +1,15 @@
+package com.miaxis.app.coach.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.coach.domain.CoachEvaluateImages;
+
+/**
+ * 教练评价照片Service接口
+ * 
+ * @author miaxis
+ * @date 2020-12-28
+ */
+public interface ICoachEvaluateImagesService extends IService<CoachEvaluateImages> {
+
+}

+ 8 - 9
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachEvaluateService.java

@@ -4,6 +4,8 @@ package com.miaxis.app.coach.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.app.coach.domain.CoachEvaluate;
 import com.miaxis.app.coach.domain.CoachEvaluateLabel;
+import com.miaxis.app.coach.domain.dto.CoachEvaluateDto;
+import com.miaxis.common.core.domain.Response;
 
 import java.util.List;
 
@@ -16,19 +18,16 @@ import java.util.List;
 public interface  ICoachEvaluateService extends IService<CoachEvaluate> {
 
 
-    /**
-     * 新增教练评价
-     * 
-     * @param coachEvaluate 教练评价
-     * @return 结果
-     */
-    int insertCoachEvaluate(CoachEvaluate coachEvaluate);
-
-
     /**
      * 查询教练评价标签列表
      * @return
      */
     List<CoachEvaluateLabel> selectCoachEvaluateLabelList();
 
+    /**
+     * 新增教练评价
+     * @param coachEvaluateDto
+     * @return
+     */
+    Response addCoachEvaluate(CoachEvaluateDto coachEvaluateDto);
 }

+ 19 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateImagesServiceImpl.java

@@ -0,0 +1,19 @@
+package com.miaxis.app.coach.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.coach.domain.CoachEvaluateImages;
+import com.miaxis.app.coach.mapper.CoachEvaluateImagesMapper;
+import com.miaxis.app.coach.service.ICoachEvaluateImagesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 教练评价照片Service业务层处理
+ *
+ * @author miaxis
+ * @date 2020-12-28
+ */
+@Service
+public class CoachEvaluateImagesServiceImpl extends ServiceImpl<CoachEvaluateImagesMapper, CoachEvaluateImages> implements ICoachEvaluateImagesService {
+
+}

+ 55 - 12
hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateServiceImpl.java

@@ -1,17 +1,27 @@
 package com.miaxis.app.coach.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.app.coach.domain.CoachEvaluate;
+import com.miaxis.app.coach.domain.CoachEvaluateImages;
 import com.miaxis.app.coach.domain.CoachEvaluateLabel;
+import com.miaxis.app.coach.domain.dto.CoachEvaluateDto;
+import com.miaxis.app.coach.mapper.CoachEvaluateImagesMapper;
 import com.miaxis.app.coach.mapper.CoachEvaluateLabelMapper;
 import com.miaxis.app.coach.mapper.CoachEvaluateMapper;
+import com.miaxis.app.coach.service.ICoachEvaluateImagesService;
 import com.miaxis.app.coach.service.ICoachEvaluateService;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -29,18 +39,8 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
     @Resource
     private CoachEvaluateLabelMapper coachEvaluateLabelMapper;
 
-
-    /**
-     * 新增教练评价
-     *
-     * @param coachEvaluate 教练评价
-     * @return 结果
-     */
-    @Override
-    public int insertCoachEvaluate(CoachEvaluate coachEvaluate){
-        coachEvaluate.setCreateTime(DateUtils.getNowDate());
-        return coachEvaluateMapper.insertCoachEvaluate(coachEvaluate);
-    }
+    @Resource
+    private ICoachEvaluateImagesService coachEvaluateImagesService;
 
 
     /**
@@ -54,4 +54,47 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
         return coachEvaluateLabelMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 新增教练评价
+     * @param coachEvaluateDto
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Response addCoachEvaluate(CoachEvaluateDto coachEvaluateDto) {
+        try{
+            //保存评价
+            CoachEvaluate coachEvaluate = new CoachEvaluate();
+            coachEvaluate.setUserId(Long.valueOf(coachEvaluateDto.getUserId()));
+            coachEvaluate.setCoachnum(coachEvaluateDto.getCoachnum());
+            coachEvaluate.setAreaStarts(Long.valueOf(coachEvaluateDto.getAreaStarts()));
+            coachEvaluate.setAttitudeStarts(coachEvaluateDto.getAttitudeStarts());
+            coachEvaluate.setTotelStarts(coachEvaluateDto.getTotalStarts());
+            coachEvaluate.setContent(coachEvaluateDto.getContent());
+            coachEvaluate.setLabelIds(coachEvaluateDto.getLabelIds());
+            coachEvaluate.setStatus(0);
+            coachEvaluate.setIsAnonymous(Integer.valueOf(coachEvaluateDto.getIsAnonymous()));
+            coachEvaluateMapper.insert(coachEvaluate);
+
+            //保存照片
+            ArrayList<CoachEvaluateImages> evaluateImages = new ArrayList<>();
+            JSONArray jsonArray = JSONArray.parseArray(coachEvaluateDto.getImagesJson());
+            System.out.println(jsonArray);
+            List<Map> lists = jsonArray.toJavaList(Map.class);
+            for (Map list : lists) {
+                CoachEvaluateImages images = new CoachEvaluateImages();
+                images.setCoachEvaluateId(coachEvaluate.getId());
+                images.setImagePath(list.get("imagePath").toString());
+                images.setImageUrl(list.get("imageUrl").toString());
+                evaluateImages.add(images);
+            }
+            coachEvaluateImagesService.saveBatch(evaluateImages);
+
+            return Response.success();
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+
+    }
+
 }

+ 18 - 6
hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluate.java

@@ -41,18 +41,30 @@ public class SchoolEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "评价内容")
     private String content;
 
-    /** 评价星数:星星数1-5星 */
-    @Excel(name = "评价星数:星星数1-5星")
-    @TableField("star")
-    @ApiModelProperty(value = "评价星数:星星数1-5星")
-    private Long star;
-
     /** 评价用户ID */
     @Excel(name = "评价用户ID")
     @TableField("user_id")
     @ApiModelProperty(value = "评价用户ID")
     private Long userId;
 
+    /** 态度星级 */
+    @Excel(name = "态度星级")
+    @TableField("attitude_starts")
+    @ApiModelProperty(value = "态度星级")
+    private Long attitudeStarts;
+
+    /** 场级星级 */
+    @Excel(name = "场级星级")
+    @TableField("area_starts")
+    @ApiModelProperty(value = "场级星级")
+    private Long areaStarts;
+
+    /** 总体星数:星星数1-5星 */
+    @Excel(name = "总体星数:星星数1-5星")
+    @TableField("total_starts")
+    @ApiModelProperty(value = "总体星数:星星数1-5星")
+    private Long totalStarts;
+
     /** 是否匿名:0 :公开  1匿名 */
     @Excel(name = "是否匿名:0 :公开  1匿名")
     @TableField("is_anonymous")

+ 4 - 8
hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/SchoolEvaluateImages.java

@@ -1,16 +1,12 @@
 package com.miaxis.app.school.domain;
 
-import com.miaxis.common.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 /**
  * 驾校评价照片对象 school_evaluate_images

+ 55 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/school/domain/dto/SchoolEvaluateDto.java

@@ -0,0 +1,55 @@
+package com.miaxis.app.school.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 驾校评价对象 school_evaluate
+ *
+ * @author miaxis
+ * @date 2020-12-28
+ */
+@Data
+@TableName("school_evaluate")
+@ApiModel(value = "SchoolEvaluate", description = "驾校评价对象 school_evaluate")
+public class SchoolEvaluateDto extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "评价用户ID")
+    private String userId;
+
+    @ApiModelProperty(value = "驾校编号")
+    private String inscode;
+
+    @ApiModelProperty(value = "态度星级")
+    private Long attitudeStarts;
+
+    @ApiModelProperty(value = "场级星级")
+    private Long areaStarts;
+
+    @ApiModelProperty(value = "总体星数:星星数1-5星")
+    private Long totalStarts;
+
+    @ApiModelProperty(value = "评价内容")
+    private String content;
+
+    @ApiModelProperty(value = "标签表ID串")
+    private String schoolLabelIds;
+
+    @ApiModelProperty(value = "是否匿名:0 :公开  1匿名")
+    private String isAnonymous;
+
+    /**
+     * [{"imagePath":"/test/1.png","imageUrl":"http://image.jppt.com.cn/test/1.png"},{"imagePath":"/test/2.png","imageUrl":"http://image.jppt.com.cn/test/2.png"}]
+     */
+    @ApiModelProperty(value = "图片json串")
+    private String imagesJson;
+
+
+}

+ 0 - 18
hzgzpt-service-app/src/main/java/com/miaxis/app/school/mapper/SchoolEvaluateMapper.java

@@ -13,22 +13,4 @@ import com.miaxis.app.school.domain.SchoolEvaluate;
 public interface SchoolEvaluateMapper extends BaseMapper<SchoolEvaluate> {
 
 
-    /**
-     * 新增驾校评价
-     *
-     * @param schoolEvaluate 驾校评价
-     * @return 结果
-     */
-    int insertSchoolEvaluate(SchoolEvaluate schoolEvaluate);
-
-    /**
-     * 修改驾校评价
-     *
-     * @param schoolEvaluate 驾校评价
-     * @return 结果
-     */
-    int updateSchoolEvaluate(SchoolEvaluate schoolEvaluate);
-
-
-
 }

+ 15 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateImagesService.java

@@ -0,0 +1,15 @@
+package com.miaxis.app.school.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.school.domain.SchoolEvaluateImages;
+
+/**
+ * 驾校评价照片Service接口
+ * 
+ * @author miaxis
+ * @date 2020-12-29
+ */
+public interface ISchoolEvaluateImagesService extends IService<SchoolEvaluateImages> {
+
+}

+ 8 - 8
hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateService.java

@@ -4,6 +4,8 @@ package com.miaxis.app.school.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.app.school.domain.SchoolEvaluate;
 import com.miaxis.app.school.domain.SchoolEvaluateLabel;
+import com.miaxis.app.school.domain.dto.SchoolEvaluateDto;
+import com.miaxis.common.core.domain.Response;
 
 import java.util.List;
 
@@ -17,17 +19,15 @@ public interface ISchoolEvaluateService extends IService<SchoolEvaluate> {
 
 
     /**
-     * 新增驾校评价
-     * 
-     * @param schoolEvaluate 驾校评价
-     * @return 结果
+     * 查询驾校评价标签列表
+     * @return
      */
-    int insertSchoolEvaluate(SchoolEvaluate schoolEvaluate);
-
+    List<SchoolEvaluateLabel> selectSchoolEvaluateLabelList();
 
     /**
-     * 查询驾校评价标签列表
+     * 新增驾校评价
+     * @param schoolEvaluateDto
      * @return
      */
-    List<SchoolEvaluateLabel> selectSchoolEvaluateLabelList();
+    Response addSchoolEvaluate(SchoolEvaluateDto schoolEvaluateDto);
 }

+ 19 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolEvaluateImagesServiceImpl.java

@@ -0,0 +1,19 @@
+package com.miaxis.app.school.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.school.domain.SchoolEvaluateImages;
+import com.miaxis.app.school.mapper.SchoolEvaluateImagesMapper;
+import com.miaxis.app.school.service.ISchoolEvaluateImagesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 驾校评价照片Service业务层处理
+ *
+ * @author miaxis
+ * @date 2020-12-29
+ */
+@Service
+public class SchoolEvaluateImagesServiceImpl extends ServiceImpl<SchoolEvaluateImagesMapper, SchoolEvaluateImages> implements ISchoolEvaluateImagesService {
+
+}

+ 51 - 14
hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/impl/SchoolEvaluateServiceImpl.java

@@ -1,20 +1,26 @@
 package com.miaxis.app.school.service.impl;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.miaxis.app.coach.domain.CoachEvaluateLabel;
 import com.miaxis.app.school.domain.SchoolEvaluate;
+import com.miaxis.app.school.domain.SchoolEvaluateImages;
 import com.miaxis.app.school.domain.SchoolEvaluateLabel;
+import com.miaxis.app.school.domain.dto.SchoolEvaluateDto;
 import com.miaxis.app.school.mapper.SchoolEvaluateLabelMapper;
 import com.miaxis.app.school.mapper.SchoolEvaluateMapper;
+import com.miaxis.app.school.service.ISchoolEvaluateImagesService;
 import com.miaxis.app.school.service.ISchoolEvaluateService;
+import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -32,18 +38,8 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
     @Resource
     private SchoolEvaluateLabelMapper schoolEvaluateLabelMapper;
 
-
-    /**
-     * 新增驾校评价
-     *
-     * @param schoolEvaluate 驾校评价
-     * @return 结果
-     */
-    @Override
-    public int insertSchoolEvaluate(SchoolEvaluate schoolEvaluate){
-        schoolEvaluate.setCreateTime(DateUtils.getNowDate());
-        return schoolEvaluateMapper.insertSchoolEvaluate(schoolEvaluate);
-    }
+    @Resource
+    private ISchoolEvaluateImagesService schoolEvaluateImagesService;
 
 
     /**
@@ -57,5 +53,46 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
         return schoolEvaluateLabelMapper.selectList(queryWrapper);
     }
 
+    /**
+     * 新增驾校评价
+     * @param schoolEvaluateDto
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Response addSchoolEvaluate(SchoolEvaluateDto schoolEvaluateDto) {
+        try {
+            //保存评价
+            SchoolEvaluate schoolEvaluate = new SchoolEvaluate();
+            schoolEvaluate.setUserId(Long.valueOf(schoolEvaluateDto.getUserId()));
+            schoolEvaluate.setInscode(schoolEvaluateDto.getInscode());
+            schoolEvaluate.setAreaStarts(Long.valueOf(schoolEvaluateDto.getAreaStarts()));
+            schoolEvaluate.setAttitudeStarts(schoolEvaluateDto.getAttitudeStarts());
+            schoolEvaluate.setTotalStarts(schoolEvaluateDto.getTotalStarts());
+            schoolEvaluate.setContent(schoolEvaluateDto.getContent());
+            schoolEvaluate.setSchoolLabelIds(schoolEvaluateDto.getSchoolLabelIds());
+            schoolEvaluate.setIsAnonymous(Long.valueOf(schoolEvaluateDto.getIsAnonymous()));
+            schoolEvaluate.setStatus(0);
+            schoolEvaluateMapper.insert(schoolEvaluate);
+
+            //保存照片
+            ArrayList<SchoolEvaluateImages> evaluateImages = new ArrayList<>();
+            JSONArray jsonArray = JSONArray.parseArray(schoolEvaluateDto.getImagesJson());
+            List<Map> lists = jsonArray.toJavaList(Map.class);
+            for (Map list : lists) {
+                SchoolEvaluateImages images = new SchoolEvaluateImages();
+                images.setSchoolEvaluateId(schoolEvaluate.getId());
+                images.setImagePath(list.get("imagePath").toString());
+                images.setImageUrl(list.get("imageUrl").toString());
+                evaluateImages.add(images);
+            }
+            schoolEvaluateImagesService.saveBatch(evaluateImages);
+
+            return Response.success();
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
+
 
 }

+ 3 - 5
hzgzpt-service-app/src/main/java/com/miaxis/app/sms/ISmsService.java

@@ -1,9 +1,7 @@
 package com.miaxis.app.sms;
 
+import com.miaxis.app.sms.domain.SmsParameter;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.domain.entity.SysUser;
-
-import java.util.Map;
 
 /**
  * 短信服务层接口
@@ -15,8 +13,8 @@ public interface ISmsService {
 
     /**
      * 发送短信验证码
-     * @param map
+     * @param smsParameter
      * @return
      */
-    Response sendVerificationCode(Map map);
+    Response sendVerificationCode(SmsParameter smsParameter);
 }

+ 31 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/sms/domain/SmsParameter.java

@@ -0,0 +1,31 @@
+package com.miaxis.app.sms.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author wwl
+ * @Date 2020/12/29
+ * @Version 1.0
+ */
+@Data
+public class SmsParameter implements Serializable {
+
+    /** 手机号码 */
+    private String phone;
+
+    /** 发送短信类型(登录验证、修改手机号验证...) */
+    private String type;
+
+    /** 缓存key前缀 */
+    private String keyPrefix;
+
+    /** 验证次数 */
+    private String verificationCount;
+
+    /** 短信模板 */
+    private String smsTemplateConstants;
+
+}

+ 24 - 23
hzgzpt-service-app/src/main/java/com/miaxis/app/sms/impl/SmsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.miaxis.app.sms.impl;
 
 import com.miaxis.app.sms.ISmsService;
+import com.miaxis.app.sms.domain.SmsParameter;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.constant.SmsTemplateConstants;
 import com.miaxis.common.core.domain.Response;
@@ -44,29 +45,29 @@ public class SmsServiceImpl implements ISmsService {
 
     /**
      * 发送短信验证码
-     * @param map
+     * @param smsParameter
      * @return
      */
     @Override
-    public Response sendVerificationCode(Map map) {
+    public Response sendVerificationCode(SmsParameter smsParameter) {
         //字符编码
         String charset = "UTF-8";
 
         //type验证
         List<String> collect = Arrays.stream(SmsTemplateConstants.smsTemplateType)
                 .parallel()
-                .filter(str -> str.equals(map.get("type")))
+                .filter(str -> str.equals(smsParameter.getType()))
                 .collect(Collectors.toList());
         if (collect.size()==0){
             return Response.error(500,"参数{type}类型错误");
         }
 
         //手机号格式验证
-        if(map.get("phone").toString().length() != 11){
+        if(smsParameter.getPhone().length() != 11){
             return Response.error(500,"手机格式错误");
         } else {
             Pattern pattern = Pattern.compile(MOBILE_REGEX);
-            Matcher matcher = pattern.matcher(map.get("phone").toString());
+            Matcher matcher = pattern.matcher(smsParameter.getPhone());
             if(!matcher.matches()) {
                 return Response.error(500,"手机号格式错误");
             }
@@ -74,7 +75,7 @@ public class SmsServiceImpl implements ISmsService {
         try{
 
             //验证手机号
-            Response resultJson = validateMobile(map);
+            Response resultJson = validateMobile(smsParameter);
             if("500".equals(resultJson.getCode().toString())) {
                 return resultJson;
             }
@@ -84,13 +85,13 @@ public class SmsServiceImpl implements ISmsService {
             for (int i=0;i<6;i++){
                 code += new Random().nextInt(10);
             }
-            String content = map.get("smsTemplateConstants").toString().replace("code",code);
+            String content = smsParameter.getSmsTemplateConstants().replace("code",code);
 
             // 调用发送接口
             Client client = new Client(smsUserName, smsPassword);
             String content1 = URLEncoder.encode(content, charset);
             String ecodeContent = URLEncoder.encode(content1, charset);
-            String result = client.mtData(ecodeContent, map.get("phone").toString(), "", "", "", charset);
+            String result = client.mtData(ecodeContent, smsParameter.getPhone(), "", "", "", charset);
             String strCode = result.split("\n")[0];
             long codenum = 0;
             codenum = Long.valueOf(strCode);
@@ -98,7 +99,7 @@ public class SmsServiceImpl implements ISmsService {
             if (codenum > 0) {//成功提交
                 Info = "发送成功";
                 // 写入缓存中
-                writeCache(code,map);
+                writeCache(code,smsParameter);
                 return Response.success(Info);
 
             } else if (codenum == 0) {
@@ -139,19 +140,19 @@ public class SmsServiceImpl implements ISmsService {
      * 手机号验证
      * keyPrefix : 缓存key前缀
      * verificationCount : 验证次数
-     * @param map
+     * @param smsParameter
      * @return
      */
-    private Response validateMobile(Map map){
+    private Response validateMobile(SmsParameter smsParameter){
 
-        if(redisTemplate.hasKey(map.get("verificationCount") + map.get("phone").toString())){
+        if(redisTemplate.hasKey(smsParameter.getVerificationCount() + smsParameter.getPhone())){
             // 验证发送时间
-            if (redisTemplate.hasKey(map.get("keyPrefix") + map.get("phone").toString())){
+            if (redisTemplate.hasKey(smsParameter.getKeyPrefix() + smsParameter.getPhone())){
                 return Response.error(500,"验证码还未过期,不能重新发送!");
             }
 
             // 验证发送次数
-            Integer count = Integer.valueOf(redisTemplate.opsForValue().get(map.get("verificationCount") + map.get("phone").toString()).toString());
+            Integer count = Integer.valueOf(redisTemplate.opsForValue().get(smsParameter.getVerificationCount() + smsParameter.getPhone()).toString());
             if(count >= MAX_COUNT) {
                 return Response.error(500,"当前手机号发送验证码次数过多!");
             }
@@ -162,31 +163,31 @@ public class SmsServiceImpl implements ISmsService {
 
     /**
      * 写入缓存
-     * @param map
+     * @param smsParameter
      * @param code
      */
-    private void writeCache(String code,Map map){
+    private void writeCache(String code,SmsParameter smsParameter){
 
         //该手机号首次获取验证码
-        if(!redisTemplate.hasKey(map.get("keyPrefix") + map.get("phone").toString()) && !redisTemplate.hasKey(map.get("verificationCount") + map.get("phone").toString())){
+        if(!redisTemplate.hasKey(smsParameter.getKeyPrefix() + smsParameter.getPhone()) && !redisTemplate.hasKey(smsParameter.getVerificationCount() + smsParameter.getPhone())){
             synchronized(this){
                 //设置该手机号验证码 两分钟过期
-                redisTemplate.opsForValue().set(map.get("keyPrefix") + map.get("phone").toString() , code, SEND_INTERVAL, TimeUnit.MINUTES);
+                redisTemplate.opsForValue().set(smsParameter.getKeyPrefix() + smsParameter.getPhone() , code, SEND_INTERVAL, TimeUnit.MINUTES);
                 //设置该手机号验证次数 一天过期
-                redisTemplate.opsForValue().set(map.get("verificationCount") + map.get("phone").toString() , "1",1,TimeUnit.DAYS);
+                redisTemplate.opsForValue().set(smsParameter.getVerificationCount() + smsParameter.getPhone() , "1",1,TimeUnit.DAYS);
             }
         }
 
         //多次获取验证码
-        if (redisTemplate.hasKey(map.get("verificationCount") + map.get("phone").toString()) && !redisTemplate.hasKey(map.get("keyPrefix") + map.get("phone").toString())){
+        if (redisTemplate.hasKey(smsParameter.getVerificationCount() + smsParameter.getPhone()) && !redisTemplate.hasKey(smsParameter.getKeyPrefix() + smsParameter.getPhone())){
             //判断该手机验证次数
-            Integer count = Integer.valueOf(redisTemplate.opsForValue().get(map.get("verificationCount") + map.get("phone").toString()).toString());
+            Integer count = Integer.valueOf(redisTemplate.opsForValue().get(smsParameter.getVerificationCount() + smsParameter.getPhone()).toString());
             if (count < MAX_COUNT){
                 synchronized(this){
                     //该手机号验证次数+1 一天过期
-                    redisTemplate.opsForValue().set(map.get("verificationCount") + map.get("phone").toString(),String.valueOf(count+1),1,TimeUnit.DAYS);
+                    redisTemplate.opsForValue().set(smsParameter.getVerificationCount() + smsParameter.getPhone(),String.valueOf(count+1),1,TimeUnit.DAYS);
                     //设置该手机号验证码 两分钟过期
-                    redisTemplate.opsForValue().set(map.get("keyPrefix") + map.get("phone").toString() , code, SEND_INTERVAL, TimeUnit.MINUTES);
+                    redisTemplate.opsForValue().set(smsParameter.getKeyPrefix() + smsParameter.getPhone() , code, SEND_INTERVAL, TimeUnit.MINUTES);
                 }
             }
         }

+ 3 - 0
hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/dto/UserDto.java

@@ -50,6 +50,9 @@ public class UserDto extends BaseBusinessEntity {
     @ApiModelProperty(value = "驾校班型Id")
     private Long schoolClassTypeId;
 
+    @ApiModelProperty(value = "驾校班型金额")
+    private String schoolClassTypePrice;
+
     @ApiModelProperty(value = "教练全国统一编号")
     private String coachnum;
 

+ 16 - 14
hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.app.sms.ISmsService;
+import com.miaxis.app.sms.domain.SmsParameter;
 import com.miaxis.app.user.domain.UserImages;
 import com.miaxis.app.user.domain.UserRegister;
 import com.miaxis.app.user.domain.dto.UserDto;
@@ -205,13 +206,14 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
      */
     @Override
     public Response sendSignUpVerificationCode(String type, String phone) {
-        Map<String, String> map = new HashMap<>();
-        map.put("phone",phone);
-        map.put("type",type);
-        map.put("keyPrefix", Constants.SMS_SIGNUP_CODE);
-        map.put("verificationCount",Constants.SMS_SIGNUP_CODE_COUNT);
-        map.put("smsTemplateConstants",SmsTemplateConstants.signUp);
-        return smsService.sendVerificationCode(map);
+        SmsParameter smsParameter = new SmsParameter();
+        smsParameter.setPhone(phone);
+        smsParameter.setType(type);
+        smsParameter.setKeyPrefix(Constants.SMS_SIGNUP_CODE);
+        smsParameter.setVerificationCount(Constants.SMS_SIGNUP_CODE_COUNT);
+        smsParameter.setSmsTemplateConstants(SmsTemplateConstants.signUp);
+
+        return smsService.sendVerificationCode(smsParameter);
     }
 
 
@@ -228,14 +230,14 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
             return Response.error(500,"该手机号与当前绑定的手机号相同");
         }
 
-        Map<String, String> map = new HashMap<>();
-        map.put("phone",phone);
-        map.put("type",type);
-        map.put("keyPrefix", Constants.SMS_LOGIN_CODE);
-        map.put("verificationCount",Constants.SMS_LOGIN_CODE_COUNT);
-        map.put("smsTemplateConstants",SmsTemplateConstants.login);
+        SmsParameter smsParameter = new SmsParameter();
+        smsParameter.setPhone(phone);
+        smsParameter.setType(type);
+        smsParameter.setKeyPrefix(Constants.SMS_MODIFY_CODE);
+        smsParameter.setVerificationCount(Constants.SMS_MODIFY_CODE_COUNT);
+        smsParameter.setSmsTemplateConstants(SmsTemplateConstants.modify);
 
-        return smsService.sendVerificationCode(map);
+        return smsService.sendVerificationCode(smsParameter);
     }
 
     /**

+ 5 - 58
hzgzpt-service-app/src/main/resources/mapper/coach/CoachEvaluateMapper.xml

@@ -8,73 +8,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
         <result property="coachnum"    column="coachnum"    />
-        <result property="star"    column="star"    />
+        <result property="attitudeStarts"    column="attitude_starts"    />
+        <result property="areaStarts"    column="area_starts"    />
+        <result property="totelStarts"    column="totel_starts"    />
         <result property="content"    column="content"    />
         <result property="labelIds"    column="label_ids"    />
-        <result property="imagesId"    column="images_id"    />
         <result property="createTime"    column="create_time"    />
+        <result property="isAnonymous"    column="is_anonymous"    />
         <result property="updateTime"    column="update_time"    />
         <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectCoachEvaluateVo">
-        select id, user_id, coachnum, star, content, label_ids, images_id, create_time, update_time, status from coach_evaluate
+        select id, user_id, coachnum, attitude_starts, area_starts, totel_starts, content, label_ids, create_time, is_anonymous, update_time, status from coach_evaluate
     </sql>
 
-    <select id="selectCoachEvaluateList" parameterType="CoachEvaluate" resultMap="CoachEvaluateResult">
-        <include refid="selectCoachEvaluateVo"/>
-        <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="coachnum != null  and coachnum != ''"> and coachnum = #{coachnum}</if>
-            <if test="star != null "> and star = #{star}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="labelIds != null  and labelIds != ''"> and label_ids = #{labelIds}</if>
-            <if test="imagesId != null  and imagesId != ''"> and images_id = #{imagesId}</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
-    </select>
-        
-    <insert id="insertCoachEvaluate" parameterType="CoachEvaluate" useGeneratedKeys="true" keyProperty="id">
-        insert into coach_evaluate
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">user_id,</if>
-            <if test="coachnum != null">coachnum,</if>
-            <if test="star != null">star,</if>
-            <if test="content != null">content,</if>
-            <if test="labelIds != null">label_ids,</if>
-            <if test="imagesId != null">images_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="status != null">status,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">#{userId},</if>
-            <if test="coachnum != null">#{coachnum},</if>
-            <if test="star != null">#{star},</if>
-            <if test="content != null">#{content},</if>
-            <if test="labelIds != null">#{labelIds},</if>
-            <if test="imagesId != null">#{imagesId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="status != null">#{status},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCoachEvaluate" parameterType="CoachEvaluate">
-        update coach_evaluate
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="coachnum != null">coachnum = #{coachnum},</if>
-            <if test="star != null">star = #{star},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="labelIds != null">label_ids = #{labelIds},</if>
-            <if test="imagesId != null">images_id = #{imagesId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="status != null">status = #{status},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
     
 </mapper>

+ 4 - 46
hzgzpt-service-app/src/main/resources/mapper/school/SchoolEvaluateMapper.xml

@@ -8,9 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="inscode"    column="inscode"    />
         <result property="content"    column="content"    />
-        <result property="star"    column="star"    />
+        <result property="attitudeStarts"    column="attitude_starts"    />
+        <result property="areaStarts"    column="area_starts"    />
         <result property="userId"    column="user_id"    />
         <result property="createTime"    column="create_time"    />
+        <result property="totalStarts"    column="total_starts"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isAnonymous"    column="is_anonymous"    />
         <result property="schoolLabelIds"    column="school_label_ids"    />
@@ -18,52 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSchoolEvaluateVo">
-        select id, inscode, content, star, user_id, create_time, update_time, is_anonymous, school_label_ids, status from school_evaluate
+        select id, inscode, content, attitude_starts, area_starts, user_id, create_time, total_starts, update_time, is_anonymous, school_label_ids, status from school_evaluate
     </sql>
 
-        
-    <insert id="insertSchoolEvaluate" parameterType="SchoolEvaluate" useGeneratedKeys="true" keyProperty="id">
-        insert into school_evaluate
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="inscode != null">inscode,</if>
-            <if test="content != null">content,</if>
-            <if test="star != null">star,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="isAnonymous != null">is_anonymous,</if>
-            <if test="schoolLabelIds != null">school_label_ids,</if>
-            <if test="status != null">status,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="inscode != null">#{inscode},</if>
-            <if test="content != null">#{content},</if>
-            <if test="star != null">#{star},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="isAnonymous != null">#{isAnonymous},</if>
-            <if test="schoolLabelIds != null">#{schoolLabelIds},</if>
-            <if test="status != null">#{status},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSchoolEvaluate" parameterType="SchoolEvaluate">
-        update school_evaluate
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="inscode != null">inscode = #{inscode},</if>
-            <if test="content != null">content = #{content},</if>
-            <if test="star != null">star = #{star},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="isAnonymous != null">is_anonymous = #{isAnonymous},</if>
-            <if test="schoolLabelIds != null">school_label_ids = #{schoolLabelIds},</if>
-            <if test="status != null">status = #{status},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-
     
 </mapper>