diff --git a/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java b/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java index 6609826..afac523 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.MouldPatch; import com.iformall.domain.po.sm.MouldPatchSign; +import com.iformall.enums.EnumColour; import com.iformall.enums.EnumMouldSendType; import com.iformall.enums.EnumaMouldPatchStatus; import com.iformall.service.sm.MouldPatchService; @@ -61,6 +62,9 @@ public class MouldPatchController extends BaseController { List signList = mouldPatchSignService.getList(signQ); mouldPatch.setMouldPatchSign(signList); } + if(mouldPatch.getColour() != null){ + mouldPatch.setColourStr(EnumColour.getEnum(mouldPatch.getColour()).getMessage()); + } return new ResultData(mouldPatch); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java index 46b9223..a8c180c 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java @@ -60,6 +60,9 @@ public class MouldPatch extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="EnumColour",name="colour") private Integer colour; + @TableField(exist = false) + private String colourStr; + @io.swagger.annotations.ApiModelProperty(value="标签",name="sceneSign") private String sceneSign; diff --git a/suimangService/src/main/java/com/iformall/enums/EnumColour.java b/suimangService/src/main/java/com/iformall/enums/EnumColour.java index 4fcb987..dc469fe 100644 --- a/suimangService/src/main/java/com/iformall/enums/EnumColour.java +++ b/suimangService/src/main/java/com/iformall/enums/EnumColour.java @@ -19,6 +19,15 @@ public enum EnumColour { private Integer code; private String message; + public static EnumColour getEnum(Integer code) { + for (EnumColour value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + public String getMessage() { diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 921ad98..576a052 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -58,7 +58,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { record.setUpdateDate(now); userMouldVideoMapper.updateById(record); } - return new ResultData(); + return new ResultData(record); } @Override diff --git a/suimangService/src/main/resources/mapper/MouldPatchMapper.xml b/suimangService/src/main/resources/mapper/MouldPatchMapper.xml index f48a212..7492b08 100644 --- a/suimangService/src/main/resources/mapper/MouldPatchMapper.xml +++ b/suimangService/src/main/resources/mapper/MouldPatchMapper.xml @@ -120,7 +120,7 @@ select `id``type`, `cover_img`, `cover_picture`, `title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`, - `send_type`, `status`, `create_date`, `update_date` + `send_type`, `mould_path`, `status`, `create_date`, `update_date` from mould_patch diff --git a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml index 24985d2..5dd7027 100644 --- a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml @@ -113,7 +113,7 @@