diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java index a736c0e30..27a468b97 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java @@ -1,85 +1,85 @@ -package com.iformall.controller.invest; - -import java.util.Arrays; -import java.util.List; - -import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ResultData; -import com.iformall.domain.po.InvestCustomerEntity; -import com.iformall.service.invest.InvestCustomerService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; - - -/** - * 客户管理 - * - * @author - * @email - * @date 2019-09-23 18:40:43 - */ -@Slf4j -@RestController -@RequestMapping("invest/customer") -@Api(tags = "客户管理") -public class InvestCustomerController { - @Autowired - private InvestCustomerService investCustomerService; - - /** - * 客户列表 - */ - @ApiOperation("客户列表") - @SystemControllerLog(description = "客户列表") - @PostMapping("/list") - public ResultData list(@RequestBody InvestCustomerEntity params) { - List page = investCustomerService.queryPage(params); - return new ResultData(page); - } - - - /** - * 客户详细信息 - */ - @SystemControllerLog(description = "客户详细信息") - @GetMapping("/info/{id}") - public ResultData info(@PathVariable("id") Long id) { - InvestCustomerEntity investCustomer = investCustomerService.getById(id); - return new ResultData(investCustomer); - } - - /** - * 保存客户 - */ - @SystemControllerLog(description = "保存客户") - @PostMapping("/save") - public ResultData save(@RequestBody InvestCustomerEntity investCustomer) { - investCustomerService.save(investCustomer); - return new ResultData(); - } - - /** - * 修改客户信息 - */ - @SystemControllerLog(description = "修改客户信息") - @PostMapping("/update") - public ResultData update(@RequestBody InvestCustomerEntity investCustomer) { - investCustomerService.updateById(investCustomer); - - return new ResultData(); - } - - /** - * 删除客户信息 - */ - @SystemControllerLog(description = "删除客户信息") - @GetMapping("/delete") - public ResultData delete(@RequestBody Long[] ids) { - investCustomerService.removeByIds(Arrays.asList(ids)); - return new ResultData(); - } - -} +//package com.iformall.controller.invest; +// +//import java.util.Arrays; +//import java.util.List; +// +//import com.iformall.annotation.SystemControllerLog; +//import com.iformall.common.ResultData; +//import com.iformall.domain.po.InvestCustomerEntity; +//import com.iformall.service.invest.InvestCustomerService; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.web.bind.annotation.*; +//import org.springframework.beans.factory.annotation.Autowired; +// +// +///** +// * 客户管理 +// * +// * @author +// * @email +// * @date 2019-09-23 18:40:43 +// */ +//@Slf4j +//@RestController +//@RequestMapping("invest/customer") +//@Api(tags = "客户管理") +//public class InvestCustomerController { +// @Autowired +// private InvestCustomerService investCustomerService; +// +// /** +// * 客户列表 +// */ +// @ApiOperation("客户列表") +// @SystemControllerLog(description = "客户列表") +// @PostMapping("/list") +// public ResultData list(@RequestBody InvestCustomerEntity params) { +// List page = investCustomerService.queryPage(params); +// return new ResultData(page); +// } +// +// +// /** +// * 客户详细信息 +// */ +// @SystemControllerLog(description = "客户详细信息") +// @GetMapping("/info/{id}") +// public ResultData info(@PathVariable("id") Long id) { +// InvestCustomerEntity investCustomer = investCustomerService.getById(id); +// return new ResultData(investCustomer); +// } +// +// /** +// * 保存客户 +// */ +// @SystemControllerLog(description = "保存客户") +// @PostMapping("/save") +// public ResultData save(@RequestBody InvestCustomerEntity investCustomer) { +// investCustomerService.save(investCustomer); +// return new ResultData(); +// } +// +// /** +// * 修改客户信息 +// */ +// @SystemControllerLog(description = "修改客户信息") +// @PostMapping("/update") +// public ResultData update(@RequestBody InvestCustomerEntity investCustomer) { +// investCustomerService.updateById(investCustomer); +// +// return new ResultData(); +// } +// +// /** +// * 删除客户信息 +// */ +// @SystemControllerLog(description = "删除客户信息") +// @GetMapping("/delete") +// public ResultData delete(@RequestBody Long[] ids) { +// investCustomerService.removeByIds(Arrays.asList(ids)); +// return new ResultData(); +// } +// +//} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index fc481c6e8..f6aeed183 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -2,7 +2,6 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; -import java.util.Map; import com.iformall.common.ResultData; import com.iformall.domain.po.InvestDemandEntity; import com.iformall.service.invest.InvestDemandService; @@ -10,8 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java index f828dc76c..7ceec0e30 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java @@ -2,7 +2,6 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; -import java.util.Map; import com.iformall.common.ResultData; import com.iformall.domain.po.InvestFollowRecordEntity; import com.iformall.service.invest.InvestFollowRecordService; @@ -10,8 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index 8d9b0a823..95493f051 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -2,7 +2,6 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; -import java.util.Map; import com.iformall.common.ResultData; import com.iformall.domain.po.InvestOperateRecordEntity; @@ -11,8 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index d08a5b47d..3e93edce4 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -2,7 +2,6 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; -import java.util.Map; import com.iformall.common.ResultData; import com.iformall.domain.po.InvestRemindEntity; @@ -11,8 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 028fc6a58..83c3810eb 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -2,7 +2,6 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; -import java.util.Map; import com.iformall.common.ResultData; import com.iformall.domain.po.InvestTaskEntity; @@ -11,8 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseInvestEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseInvestEntity.java new file mode 100644 index 000000000..b659cb068 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseInvestEntity.java @@ -0,0 +1,235 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.*; +import com.iformall.common.SortColumn; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.io.Serializable; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * @author luozukai + * @date 2019/4/24 14:32 + */ +@JsonIgnoreType() +@Data +@Slf4j +public class BaseInvestEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(type = IdType.ID_WORKER) + @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") + private Long id; + /** + * 租户ID + */ + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") + private String tenantId; + + /** + * 创建时间 + */ + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createDate; + /** + * 更新时间 + */ + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateDate; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private String sortColumn; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private String sortOrder; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private String sortColumns; + + @io.swagger.annotations.ApiModelProperty(value = "当前页", name = "pageIndex",example = "1") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private Integer pageIndex; + + @io.swagger.annotations.ApiModelProperty(value = "每页数据", name = "pageSize",example = "10") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private Integer pageSize ; + + public String getSortColumns() { + if(StringUtils.isBlank(sortColumn)){ + return sortColumns; + } + + try { + //扫描子类SortColumn注解的属性,替换sortColumn + if(StringUtils.isNotBlank(sortColumn)) { + List fieldList = new ArrayList<>() ; + Class tempClass = this.getClass(); + while (tempClass != null) {//当父类为null的时候说明到达了最上层的父类(Object类). + fieldList.addAll(Arrays.asList(tempClass.getDeclaredFields())); + tempClass = tempClass.getSuperclass(); //得到父类,然后赋给自己 + } + + //扫描注解,优先解析注解 + for (Field field : fieldList) { + SortColumn sortColumnField = field.getAnnotation(SortColumn.class); + if (sortColumnField != null && field.getName().equals(sortColumn)) { + return sortColumnField.column() + " "+sortOrder; + } + } + + //判断是否合法 + boolean find = false; + for (Field field : fieldList){ + if (field.getName().equals(sortColumn)) { + find = true; + break; + } + } + if(!find) { + return null; + } + + //默认驼峰解析 + return underscoreName(sortColumn) +" "+sortOrder; + } + } catch (Exception e) { + log.error("BaseEntity.getSortColumn解析失败",e); + e.printStackTrace(); + } + return sortColumns; + } + + /** + * 转换为下划线 + * + * @param camelCaseName + * @return + */ + private static String underscoreName(String camelCaseName) { + StringBuilder result = new StringBuilder(); + if (camelCaseName != null && camelCaseName.length() > 0) { + result.append(camelCaseName.substring(0, 1).toLowerCase()); + for (int i = 1; i < camelCaseName.length(); i++) { + char ch = camelCaseName.charAt(i); + if (Character.isUpperCase(ch)) { + result.append("_"); + result.append(Character.toLowerCase(ch)); + } else { + result.append(ch); + } + } + } + return result.toString(); + } + + public void setSortColumns(SortField... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + this.sortColumns=sb.toString(); + + } + + public enum SortField { + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + + CreateDate_ASC("`create_date` ASC"), + CreateDate_DESC("`create_date` DESC"), + + UpdateDate_ASC("`update_date` ASC"), + UpdateDate_DESC("`update_date` DESC"), + + Createtime_ASC("`createtime` ASC"), + Createtime_DESC("`createtime` DESC"), + + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"), + + ReportTime_ASC("`reportTime` ASC"), + ReportTime_DESC("`reportTime` DESC"), + + ActiveTime_ASC("`active_time` ASC"), + ActiveTime_DESC("`active_time` DESC"), + + TopTime_ASC("`top_time` ASC"), + TopTime_DESC("`top_time` DESC"), + + MerchantId_ASC("`merchant_id` ASC"), + MerchantId_DESC("`merchant_id` DESC"), + + LimitDate_ASC("`limit_date` ASC"), + LimitDate_DESC("`limit_date` DESC"), + + SortNum_ASC("`sort_num` ASC"), + SortNum_DESC("`sort_num` DESC"), + + Sort_ASC("`sort` ASC"), + Sort_DESC("`sort` DESC"), + + Points_ASC("`points` ASC"), + Points_DESC("`points` DESC"), + + Period_ASC("`period` ASC"), + Period_DESC("`period` DESC"), + + UsedPower_ASC("`usedPower` ASC"), + UsedPower_DESC("`usedPower` DESC"), + + Date_ASC("`date` ASC"), + Date_DESC("`date` DESC"), + + TradeAmt_ASC("`trade_amt` ASC"), + TradeAmt_DESC("`trade_amt` DESC"), + + ReportDate_ASC("`report_date` ASC"), + ReportDate_DESC("`report_date` DESC"), + ; + + private String value; + + SortField(String value) { + this.value = value; + } + public String getValue() { + return value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java index 1db203a7d..90c79b277 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java @@ -22,19 +22,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_customer") -public class InvestCustomerEntity extends BaseEntity { +public class InvestCustomerEntity extends BaseInvestEntity { - /** - * 主键ID - */ - @TableId(type = IdType.ID_WORKER) - @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") - private Long id; - /** - * 租户ID - */ - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; /** * 客户名称 */ @@ -72,17 +61,4 @@ public class InvestCustomerEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "招商渠道:0-无;1-电视;2-广播;3-报纸;4-刊物;5-物联网;6-招商活动;7-中介机构;8-自定义渠道", name = "investChannel") private EnumInvestChannel investChannel; - /** - * 创建时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createDate; - /** - * 更新时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateDate; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java index a14a0b109..09ecd6234 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java @@ -21,19 +21,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_demand") -public class InvestDemandEntity extends BaseEntity { +public class InvestDemandEntity extends BaseInvestEntity { - /** - * 主键ID - */ - @TableId(type = IdType.ID_WORKER) - @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") - private Long id; - /** - * 租户ID - */ - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; /** * 负责人 */ @@ -61,17 +50,4 @@ public class InvestDemandEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "目标ID", name = "targetId") private Long targetId; - /** - * 创建时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createDate; - /** - * 更新时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateDate; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java index 40e554b1a..4a5da8f84 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java @@ -21,19 +21,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_follow_record") -public class InvestFollowRecordEntity extends BaseEntity { +public class InvestFollowRecordEntity extends BaseInvestEntity { - /** - * 主键ID - */ - @TableId(type = IdType.ID_WORKER) - @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") - private Long id; - /** - * 租户ID - */ - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; /** * 主谈人 */ @@ -55,17 +44,5 @@ public class InvestFollowRecordEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "跟踪类型:0-招商任务;1-客户需求", name = "type") @JsonIgnore private EnumFollowType type; - /** - * 创建时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createDate; - /** - * 更新时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateDate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java index 5fc6bc02e..8c0362f30 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java @@ -1,13 +1,11 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumTableOperateType; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; @@ -21,19 +19,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_operate_record") -public class InvestOperateRecordEntity extends BaseEntity { +public class InvestOperateRecordEntity extends BaseInvestEntity { - /** - * 主键ID - */ - @TableId(type = IdType.ID_WORKER) - @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") - private Long id; - /** - * 租户ID - */ - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; /** * 表名称 */ @@ -73,4 +60,8 @@ public class InvestOperateRecordEntity extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createDate; + @JsonIgnore + @TableField(exist = false) + private Date updateDate; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java index 1edc30d24..d280889cf 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java @@ -19,19 +19,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_remind") -public class InvestRemindEntity extends BaseEntity { +public class InvestRemindEntity extends BaseInvestEntity { - /** - * 主键ID - */ - @TableId(type = IdType.ID_WORKER) - @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") - private Long id; - /** - * 租户ID - */ - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; /** * 提醒用户 */ @@ -59,17 +48,4 @@ public class InvestRemindEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endDate", example = "2018-10-01 12:18:48") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endDate; - /** - * 创建时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createDate; - /** - * 更新时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateDate; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java index cac21f201..12a072644 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java @@ -1,17 +1,11 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumInvestType; import com.iformall.enums.EnumTaskStatus; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 招商任务 @@ -22,19 +16,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_task") -public class InvestTaskEntity extends BaseEntity { +public class InvestTaskEntity extends BaseInvestEntity { - /** - * 主键ID - */ - @TableId(type = IdType.ID_WORKER) - @io.swagger.annotations.ApiModelProperty(value = "主键ID", name = "id") - private Long id; - /** - * 租户ID - */ - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; /** * 负责人 */ @@ -61,17 +44,5 @@ public class InvestTaskEntity extends BaseEntity { */ @io.swagger.annotations.ApiModelProperty(value = "任务设定条件", name = "content") private String content; - /** - * 创建时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createDate; - /** - * 更新时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateDate; }