常规陈列、档期补差、档期陈列、品类信息，为null时也更新大表数据

a745028c · 000516 · 1c78d00a · a745028c · a745028c
--- a/src/main/java/com/sfa/operation/domain/risk/dao/impl/RiskStoreTaskDaoImpl.java
+++ b/src/main/java/com/sfa/operation/domain/risk/dao/impl/RiskStoreTaskDaoImpl.java
@@ -91,8 +91,6 @@ public class RiskStoreTaskDaoImpl implements IRiskStoreTaskDao {
        taskDetailDtos.forEach(detailDto -> rDetail(detailDto));
        Map<String, List<RiskStoreTaskDto.RiskStoreTaskDetailDto>> detailMap = taskDetailDtos.stream().collect(Collectors.groupingBy(RiskStoreTaskDto.RiskStoreTaskDetailDto::getDetailName));
        tDto.setDetailMap(detailMap);
-
-
        return tDto;
    }


--- a/src/main/java/com/sfa/operation/domain/risk/entity/RiskStoreTask.java
+++ b/src/main/java/com/sfa/operation/domain/risk/entity/RiskStoreTask.java
 package com.sfa.operation.domain.risk.entity;

-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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.experimental.Accessors;

@@ -114,291 +111,349 @@ public class RiskStoreTask implements Serializable {
    /**
     * 常规陈列-1-形式
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dModal1;

    /**
     * 常规陈列-1-陈列费用
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal dCost1;

    /**
     * 常规陈列-1-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dPhotos1;

    /**
     * 常规陈列-1-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dRiskR1;

    /**
     * 常规陈列-2-形式
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dModal2;

    /**
     * 常规陈列-2-陈列费用
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal dCost2;

    /**
     * 常规陈列-2-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dPhotos2;

    /**
     * 常规陈列-2-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dRiskR2;

    /**
     * 常规陈列-3-形式
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dModal3;

    /**
     * 常规陈列-3-陈列费用
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal dCost3;

    /**
     * 常规陈列-3-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dPhotos3;

    /**
     * 常规陈列-3-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String dRiskR3;

    /**
     * 档期陈列-1-形式
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pModal1;

    /**
     * 档期陈列-1-陈列费用
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal pCost1;

    /**
     * 档期陈列-1-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pPhotos1;

    /**
     * 档期陈列-1-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pRiskR1;

    /**
     * 档期陈列-2-形式
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pModal2;

    /**
     * 档期陈列-2-陈列费用
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal pCost2;

    /**
     * 档期陈列-2-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pPhotos2;

    /**
     * 档期陈列-2-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pRiskR2;

    /**
     * 档期陈列-3-形式
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pModal3;

    /**
     * 档期陈列-3-陈列费用
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal pCost3;

    /**
     * 档期陈列-3-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pPhotos3;

    /**
     * 档期陈列-3-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String pRiskR3;

    /**
     * 档期补差1-内容
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcNr1;

    /**
     * 档期补差1-情况
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcQk1;

    /**
     * 档期补差1-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcPhotos1;

    /**
     * 档期补差1-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcRiskR1;

    /**
     * 档期补差2-内容
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcNr2;

    /**
     * 档期补差2-情况
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcQk2;

    /**
     * 档期补差2-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcPhotos2;

    /**
     * 档期补差2-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcRiskR2;

    /**
     * 档期补差3-内容
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcNr3;

    /**
     * 档期补差3-情况
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcQk3;

    /**
     * 档期补差3-照片
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcPhotos3;

    /**
     * 档期补差3-检核结果
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String bcRiskR3;

    /**
     * 虎皮210g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceHp210;

    /**
     * 虎皮210g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmHp210;

    /**
     * 虎皮105g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceHp105;

    /**
     * 虎皮105g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmHp105;

    /**
     * 虎皮68g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceHp68;

    /**
     * 虎皮68g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmHp68;

    /**
     * 鸡肉豆堡120g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceJrdb120;

    /**
     * 鸡肉豆堡120g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmJrdb120;

    /**
     * 牛肉豆堡120g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceNrdb120;

    /**
     * 牛肉豆堡120g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmNrdb120;

    /**
     * 去骨凤爪72g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceQg72;

    /**
     * 去骨凤爪72g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmQg72;

    /**
     * 去骨凤爪138g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceQg138;

    /**
     * 去骨凤爪138g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmQg138;

    /**
     * 虎皮小鸡腿80g价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceHpjt80;

    /**
     * 虎皮小鸡腿80g口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmHpjt80;

    /**
     * 老卤价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceLl;

    /**
     * 老卤口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmLl;

    /**
     * 虎皮单支价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceHpDz;

    /**
     * 虎皮单支口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmHpDz;

    /**
     * 虎皮散称价格
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String priceHpSc;

    /**
     * 虎皮散称口味铺市月份
     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String kwYmHpSc;

    /**