Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ExctabCell.java

@@ -43,7 +43,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @TableName("m_exctab_cell")
 @ApiModel(value = "ExctabCell对象", description = "ExctabCell对象")
-public class ExctabCell implements Serializable {
+public class ExctabCell extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
     /**
@@ -79,20 +79,4 @@ public class ExctabCell implements Serializable {
      */
     private String textDeviation;
 
-    /**
-     * 是否已删除
-     */
-    @TableLogic
-    @ApiModelProperty(value = "是否已删除")
-    private Integer isDeleted;
-
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-    @JsonSerialize(
-            using = ToStringSerializer.class
-    )
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ExctabCellVO2.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.ExctabCell;
 
 import java.io.Serializable;
+import java.sql.Date;
 
 @Data
 public class ExctabCellVO2 implements Serializable {
@@ -54,4 +55,16 @@ public class ExctabCellVO2 implements Serializable {
 	@TableLogic
 	@ApiModelProperty(value = "是否已删除")
 	private Integer isDeleted;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+	/**
+	 * 修改时间
+	 */
+	private Date updateTime;
+
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExctabCellController.java

@@ -27,6 +27,7 @@ import javax.validation.Valid;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.entity.WbsFormElement;
 import org.springblade.manager.utils.CopyUtil;
@@ -39,6 +40,8 @@ import org.springblade.manager.vo.ExctabCellVO;
 import org.springblade.manager.service.IExctabCellService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -96,6 +99,11 @@ public class ExctabCellController extends BladeController {
     @ApiOperation(value = "新增", notes = "传入exctabCell")
     public R save(@Valid @RequestBody List<ExctabCellVO2> exctabCellList) {
         List<ExctabCell> exctabCells = CopyUtil.convert(exctabCellList, ExctabCell.class);
+        for (ExctabCell exctabCell : exctabCells) {
+            Date date = new Date();
+            Timestamp timestamp = new Timestamp(date.getTime());
+            exctabCell.setCreateTime(timestamp);
+        }
         return R.status(exctabCellService.saveBatch(exctabCells));
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExctabCellMapper.xml

@@ -9,6 +9,13 @@
         <result column="exctab_id" property="exctabId"/>
         <result column="xys" property="xys"/>
         <result column="text_info" property="textInfo"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="status" property="status"/>
+        <result column="update_user" property="updateUser"/>
     </resultMap>
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IExctabCellService.java

@@ -32,7 +32,7 @@ import java.util.List;
  * @author BladeX
  * @since 2022-05-26
  */
-public interface IExctabCellService extends IService<ExctabCell> {
+public interface IExctabCellService extends BaseService<ExctabCell> {
 
 	/**
 	 * 自定义分页

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExctabCellServiceImpl.java

@@ -40,7 +40,7 @@ import java.util.List;
  */
 @Service
 @AllArgsConstructor
-public class ExctabCellServiceImpl extends ServiceImpl<ExctabCellMapper, ExctabCell> implements IExctabCellService {
+public class ExctabCellServiceImpl extends BaseServiceImpl<ExctabCellMapper, ExctabCell> implements IExctabCellService {
 
     private final WbsFormElementServiceImpl wbsFormElementService;