增加物理删除基础entity,明细数据改为物理删除

zjugis-business/src/main/java/com/zjugis/business/flow/attendancenote/entity/AttendanceNoteTimeDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -15,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_ATTENDANCE_NOTE_TIME")
-public class AttendanceNoteTimeDO extends BaseEntity {
+public class AttendanceNoteTimeDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/flow/businesstravel/entity/TravelTimeDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -15,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_BUSINESS_TRAVEL_TIME")
-public class TravelTimeDO extends BaseEntity {
+public class TravelTimeDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/entity/CommonCostDetailDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_COMMON_COST_DETAIL")
-public class CommonCostDetailDO extends BaseEntity {
+public class CommonCostDetailDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/service/CommonCostServiceImpl.java

@@ -152,15 +152,17 @@ public class CommonCostServiceImpl implements CommonCostService {
         // 更新
         CommonCostDO updateObj = CommonCostConvert.INSTANCE.convert(updateReqVO);
         commonCostDao.updateById(updateObj);
-        Set<String> idList = convertSet(commonCostDetailService.getListByCommonCostId(updateObj.getId()), CommonCostDetailDO::getId);
-        if (CollectionUtil.isNotEmpty(idList)) {
-            commonCostDetailDao.deleteBatchIds(idList);
+        if (CollectionUtil.isNotEmpty(updateReqVO.getDetailList())) {
+            Set<String> idList = convertSet(commonCostDetailService.getListByCommonCostId(updateObj.getId()), CommonCostDetailDO::getId);
+            if (CollectionUtil.isNotEmpty(idList)) {
+                commonCostDetailDao.deleteBatchIds(idList);
+            }
+            List<CommonCostDetailDO> detailDOS = CommonCostDetailConvert.INSTANCE.convertList(updateReqVO.getDetailList());
+            detailDOS.forEach(detailDO -> {
+                detailDO.setCommonCostId(updateObj.getId());
+            });
+            commonCostDetailDao.insertBatch(detailDOS);
         }
-        List<CommonCostDetailDO> detailDOS = CommonCostDetailConvert.INSTANCE.convertList(updateReqVO.getDetailList());
-        detailDOS.forEach(detailDO -> {
-            detailDO.setCommonCostId(updateObj.getId());
-        });
-        commonCostDetailDao.insertBatch(detailDOS);
     }
 
     private void validateCommonCostExists(String id) {

zjugis-business/src/main/java/com/zjugis/business/flow/leave/entity/LeaveTimeDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -15,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_LEAVE_TIME")
-public class LeaveTimeDO extends BaseEntity {
+public class LeaveTimeDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/entity/TravelCostBoatCarDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_TRAVEL_COST_BOAT_CAR")
-public class TravelCostBoatCarDO extends BaseEntity {
+public class TravelCostBoatCarDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/entity/TravelCostOtherDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_TRAVEL_COST_OTHER")
-public class TravelCostOtherDO extends BaseEntity {
+public class TravelCostOtherDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/entity/UseMoneyDetailDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zjugis.business.mybatis.entity.BaseEntity;
+import com.zjugis.business.mybatis.entity.BaseNotLogicEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName(value = "WF_USE_MONEY_DETAIL")
-public class UseMoneyDetailDO extends BaseEntity {
+public class UseMoneyDetailDO extends BaseNotLogicEntity {
 
     /**
      * 主键ID

zjugis-business/src/main/java/com/zjugis/business/mybatis/entity/BaseNotLogicEntity.java

@@ -0,0 +1,57 @@
+package com.zjugis.business.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author chenjun
+ * @version 1.0
+ * @date 2024-2-27 14:41:50
+ */
+@Data
+public class BaseNotLogicEntity implements Serializable {
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT,jdbcType = JdbcType.DATE)
+    private LocalDateTime createTime;
+    /**
+     * 最后更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE,jdbcType = JdbcType.DATE)
+    private LocalDateTime latestModifyTime;
+
+    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
+    private String createWorker;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE, jdbcType = JdbcType.VARCHAR)
+    private String latestModifyWorker;
+
+    /**
+     * 排序序号
+     */
+    private Integer indexCode;
+
+    /**
+     * 备注1
+     */
+    private String bz1;
+
+    /**
+     * 备注2
+     */
+    private String bz2;
+
+    /**
+     * 备注3
+     */
+    private String bz3;
+
+}