status修改

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -119,7 +119,7 @@ public class UserInfo extends BaseBusinessEntity{
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private Integer status;
+    private String status;
 
     /** 全国平台照片ID */
     @Excel(name = "全国平台照片ID")

hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachEvaluate.java

@@ -77,6 +77,6 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @Excel(name = "状态   0：启用 1：禁用")
     @TableField("status")
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachEvaluateLabel.java

@@ -35,6 +35,6 @@ public class CoachEvaluateLabel extends BaseBusinessEntity {
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/coach/domain/CoachInfo.java

@@ -131,6 +131,6 @@ public class CoachInfo extends BaseBusinessEntity {
     @Excel(name = "状态   0：启用 1：禁用")
     @TableField("status")
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/coach/dto/CoachEvaluatePcDTO.java

@@ -25,6 +25,6 @@ public class CoachEvaluatePcDTO extends BaseBusinessEntity {
     private Integer isAnonymous;
 
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/coach/dto/CoachInfoPcDTO.java

@@ -43,7 +43,7 @@ public class CoachInfoPcDTO extends BaseBusinessEntity {
     private String dripermitted;
 
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 
 }

hzgzpt-service/src/main/java/com/miaxis/coach/service/impl/CoachEvaluateServiceImpl.java

@@ -74,7 +74,7 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
             coachEvaluate.setTotelStars(coachEvaluateDto.getTotalStars());
             coachEvaluate.setContent(coachEvaluateDto.getContent());
             coachEvaluate.setLabelIds(coachEvaluateDto.getLabelIds());
-            coachEvaluate.setStatus(0);
+            coachEvaluate.setStatus("0");
             coachEvaluate.setIsAnonymous(Integer.valueOf(coachEvaluateDto.getIsAnonymous()));
             coachEvaluateMapper.insert(coachEvaluate);
 

hzgzpt-service/src/main/java/com/miaxis/coach/vo/CoachEvaluatePcVO.java

@@ -45,7 +45,7 @@ public class CoachEvaluatePcVO {
     private Integer isAnonymous;
 
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
     @ApiModelProperty(value = "创建时间"  ,hidden = true)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

hzgzpt-service/src/main/java/com/miaxis/coach/vo/CoachInfoPcVO.java

@@ -56,7 +56,7 @@ public class CoachInfoPcVO {
     private Date createTime;
 
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolClassType.java

@@ -123,7 +123,7 @@ public class SchoolClassType extends BaseBusinessEntity{
     @Excel(name = "状态   0：启用 1：禁用")
     @TableField("status")
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
     /** 合同到期时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolEvaluate.java

@@ -77,6 +77,6 @@ public class SchoolEvaluate extends BaseBusinessEntity {
     @Excel(name = "status 状态   0：启用 1：禁用")
     @TableField("status")
     @ApiModelProperty(value = "status 状态   0：启用 1：禁用")
-    private Long status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolEvaluateLabel.java

@@ -35,6 +35,6 @@ public class SchoolEvaluateLabel extends BaseBusinessEntity {
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolInfo.java

@@ -224,7 +224,7 @@ public class SchoolInfo extends BaseBusinessEntity {
     @Excel(name = "逻辑删除标识", readConverterExp = "1=：是；0：否")
     @TableField("removed")
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
     /**
      * 初次领证日期

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolRegion.java

@@ -132,6 +132,6 @@ public class SchoolRegion extends BaseBusinessEntity{
     @Excel(name = "逻辑删除标识", readConverterExp = "1=：是；0：否")
     @TableField("removed")
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolClassTypePcDTO.java

@@ -39,6 +39,6 @@ public class SchoolClassTypePcDTO extends BaseBusinessEntity {
     private Integer payType;
 
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoPcDTO.java

@@ -91,7 +91,7 @@ public class SchoolInfoPcDTO extends BaseBusinessEntity {
      * 逻辑删除标识（1：是；0：否）
      */
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
     /**
      * 业户经营状态

hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolEvaluateServiceImpl.java

@@ -74,7 +74,7 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
             schoolEvaluate.setContent(schoolEvaluateDto.getContent());
             schoolEvaluate.setSchoolLabelIds(schoolEvaluateDto.getSchoolLabelIds());
             schoolEvaluate.setIsAnonymous(Long.valueOf(schoolEvaluateDto.getIsAnonymous()));
-            schoolEvaluate.setStatus(0l);
+            schoolEvaluate.setStatus("0");
             schoolEvaluateMapper.insert(schoolEvaluate);
 
             //保存照片

hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolClassTypePcVO.java

@@ -43,6 +43,6 @@ public class SchoolClassTypePcVO extends BaseBusinessEntity{
     private String payType;
 
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolInfoDetailPcVO.java

@@ -83,7 +83,7 @@ public class SchoolInfoDetailPcVO{
     private String bizlicense;
 
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "初次领证日期")

hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolRegionPcVO.java

@@ -54,6 +54,6 @@ public class SchoolRegionPcVO extends BaseBusinessEntity{
     private BigDecimal poiLat;
 
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
 }

hzgzpt-service/src/main/resources/mapper/coach/CoachInfoMapper.xml

@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="status == null"> and ci.`status` = '0'</if>
             <if test="status == '2'.toString()"> and exists(SELECT `status` FROM `coach_info`) </if>
-            <if test="status != null  and status != ''"> and ci.`status` = #{status}</if>
+            <if test="status != null  and status != '' and status != '2'.toString()"> and ci.`status` = #{status}</if>
             <if test="name != null  and name != ''"> and ci.`name` like concat('%', #{name}, '%')</if>
             <if test="coachnum != null  and coachnum != ''"> and ci.coachnum = #{coachnum}</if>
             <if test="mobile != null  and mobile != ''"> and ci.mobile = #{mobile}</if>

hzgzpt-service/src/main/resources/mapper/school/SchoolClassTypeMapper.xml

@@ -42,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         school_class_type sc
         JOIN school_info s ON s.inscode = sc.inscode
         <where>
-            <if test="status != null  and status != ''"> and sc.`status` = #{status}</if>
+            <if test="status == null"> and sc.`status` = '0'</if>
+            <if test="status == '2'.toString()"> and exists(SELECT `status` FROM `coach_info`) </if>
+            <if test="status != null  and status != '' and status != '2'.toString()"> and sc.`status` = #{status}</if>
             <if test="className != null  and className != ''"> and sc.`class_name` like concat('%', #{className}, '%')</if>
             <if test="totalPrice != null  and totalPrice != ''"> and sc.total_price = #{totalPrice}</if>
             <if test="train != null  and train != ''"> and sc.train = #{train}</if>

hzgzpt-service/src/main/resources/mapper/school/SchoolInfoMapper.xml

@@ -247,12 +247,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         school_info s
         <where>
-            <if test="removed != null  and removed != ''"> and s.`removed` = #{removed}</if>
+            <if test="removed == null"> and s.`removed` = '0'</if>
+            <if test="removed == '2'.toString()"> and exists(SELECT `removed` FROM `school_info`) </if>
+            <if test="removed != null  and removed != '' and removed != '2'.toString()"> and s.`removed` = #{removed}</if>
             <if test="id != null  and id != ''"> and s.id = #{id}</if>
             <if test="inscode != null  and inscode != ''"> and s.inscode = #{inscode}</if>
             <if test="name != null  and name != ''"> and s.`name` like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''"> and s.address = #{address}</if>
-            <if test="removed != null  and removed != ''"> and s.removed = #{removed}</if>
             <if test="areaName != null  and areaName != ''"> and s.area_name = #{areaName}</if>
             <if test="tel != null  and tel != ''"> and s.tel = #{tel}</if>
             <if test="credibilityScore != null  and credibilityScore != ''"> and s.credibility_score = #{credibilityScore}</if>

hzgzpt-service/src/main/resources/mapper/school/SchoolRegionMapper.xml

@@ -46,7 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         school_region sr
         join school_info s on s.inscode= sr.inscode
         <where>
-            <if test="removed != null  and removed != ''"> and sr.`removed` = #{removed}</if>
+            <if test="removed == null"> and sr.`removed` = '0'</if>
+            <if test="removed == '2'.toString()"> and exists(SELECT `removed` FROM `school_info`) </if>
+            <if test="removed != null and removed != '' and removed != '2'.toString()"> and sr.`removed` = #{removed}</if>
             <if test="name != null  and name != ''"> and sr.`name` like concat('%', #{name}, '%')</if>
         </where>