售点稽核查询最新数据，回写RiskStoreTask表常规陈列、档期补差、档期陈列、品类信息

src/main/java/com/sfa/operation/controller/risk/core/RiskStoreTaskCoreController.java

@@ -68,6 +68,7 @@ public class RiskStoreTaskCoreController {
         if (Objects.isNull(taskDetailVo.getRstdId())){
             return riskstoreTaskCoreService.saveStoreDetail(taskDetailVo);
         }
+        // 更新稽核详情
         RiskStoreTaskDto.RiskStoreTaskDetailDto riskStoreTaskDetailDto = new RiskStoreTaskDto.RiskStoreTaskDetailDto();
         BeanUtils.copyProperties(taskDetailVo,riskStoreTaskDetailDto);
         riskStoreTaskDetailDto.setPhotos(pArr(taskDetailVo.getPhotoArr()));

src/main/java/com/sfa/operation/domain/risk/dao/impl/RiskStoreTaskDaoImpl.java

@@ -107,6 +107,116 @@ public class RiskStoreTaskDaoImpl implements IRiskStoreTaskDao {
     public RiskStoreTaskDto.RiskStoreTaskDetailDto updateStoreDetail(RiskStoreTaskDto.RiskStoreTaskDetailDto riskStoreTaskDetailDto) {
         RiskStoreTaskDetail detailDo = BeanUtils.transitionDto(riskStoreTaskDetailDto, RiskStoreTaskDetail.class);
         riskStoreTaskDetailMapper.updateById(detailDo);
+
+        // 查询最新数据，回写RiskStoreTask表
+        RiskStoreTask riskStoreTask = riskStoreTaskMapper.selectById(detailDo.getRstId());
+        riskStoreTask.detailInit();
+        List<RiskStoreTaskDetail> details = riskStoreTaskDetailMapper.selectList(new LambdaQueryWrapper<RiskStoreTaskDetail>().eq(RiskStoreTaskDetail::getRstId, detailDo.getRstId()).orderByAsc(RiskStoreTaskDetail::getRstdId));
+        Map<String, List<RiskStoreTaskDetail>> detailMap = details.stream().collect(Collectors.groupingBy(RiskStoreTaskDetail::getDetailName));
+
+        // 常规陈列、档期补差、档期陈列、品类信息
+        List<RiskStoreTaskDetail> cgcls = detailMap.get("常规陈列");
+        if (!CollectionUtils.isEmpty(cgcls)){
+            if (cgcls.size() >= 1){
+                RiskStoreTaskDetail cgcl = cgcls.get(0);
+                riskStoreTask.setDModal1(cgcl.getModal());
+                riskStoreTask.setDCost1(cgcl.getCost());
+                riskStoreTask.setDPhotos1(cgcl.getPhotos());
+                riskStoreTask.setDRiskR1(cgcl.getRiskR());
+            }
+            if (cgcls.size() >= 2){
+                RiskStoreTaskDetail cgcl = cgcls.get(1);
+                riskStoreTask.setDModal2(cgcl.getModal());
+                riskStoreTask.setDCost2(cgcl.getCost());
+                riskStoreTask.setDPhotos2(cgcl.getPhotos());
+                riskStoreTask.setDRiskR2(cgcl.getRiskR());
+            }
+            if (cgcls.size() >= 3){
+                RiskStoreTaskDetail cgcl = cgcls.get(2);
+                riskStoreTask.setDModal3(cgcl.getModal());
+                riskStoreTask.setDCost3(cgcl.getCost());
+                riskStoreTask.setDPhotos3(cgcl.getPhotos());
+                riskStoreTask.setDRiskR3(cgcl.getRiskR());
+            }
+
+        }
+
+        List<RiskStoreTaskDetail> dqbcs = detailMap.get("档期补差");
+        if (!CollectionUtils.isEmpty(dqbcs)){
+            if (dqbcs.size() >= 1){
+                RiskStoreTaskDetail dqbc = dqbcs.get(0);
+                riskStoreTask.setBcNr1(dqbc.getBcNr());
+                riskStoreTask.setBcQk1(dqbc.getBcQk());
+                riskStoreTask.setBcPhotos1(dqbc.getPhotos());
+                riskStoreTask.setBcRiskR1(dqbc.getRiskR());
+            }
+            if (dqbcs.size() >= 2){
+                RiskStoreTaskDetail dqbc = dqbcs.get(1);
+                riskStoreTask.setBcNr2(dqbc.getBcNr());
+                riskStoreTask.setBcQk2(dqbc.getBcQk());
+                riskStoreTask.setBcPhotos2(dqbc.getPhotos());
+                riskStoreTask.setBcRiskR2(dqbc.getRiskR());
+            }
+            if (dqbcs.size() >= 3){
+                RiskStoreTaskDetail dqbc = dqbcs.get(2);
+                riskStoreTask.setBcNr3(dqbc.getBcNr());
+                riskStoreTask.setBcQk3(dqbc.getBcQk());
+                riskStoreTask.setBcPhotos3(dqbc.getPhotos());
+                riskStoreTask.setBcRiskR3(dqbc.getRiskR());
+            }
+        }
+
+        List<RiskStoreTaskDetail> dqcls = detailMap.get("档期陈列");
+        if (!CollectionUtils.isEmpty(dqcls)){
+            if (dqcls.size() >= 1){
+                RiskStoreTaskDetail dqcl = dqcls.get(0);
+                riskStoreTask.setPModal1(dqcl.getModal());
+                riskStoreTask.setPCost1(dqcl.getCost());
+                riskStoreTask.setPPhotos1(dqcl.getPhotos());
+                riskStoreTask.setPRiskR1(dqcl.getRiskR());
+            }
+            if (dqcls.size() >= 2){
+                RiskStoreTaskDetail dqcl = dqcls.get(1);
+                riskStoreTask.setPModal2(dqcl.getModal());
+                riskStoreTask.setPCost2(dqcl.getCost());
+                riskStoreTask.setPPhotos2(dqcl.getPhotos());
+                riskStoreTask.setPRiskR2(dqcl.getRiskR());
+            }
+            if (dqcls.size() >= 3){
+                RiskStoreTaskDetail dqcl = dqcls.get(2);
+                riskStoreTask.setPModal3(dqcl.getModal());
+                riskStoreTask.setPCost3(dqcl.getCost());
+                riskStoreTask.setPPhotos3(dqcl.getPhotos());
+                riskStoreTask.setPRiskR3(dqcl.getRiskR());
+            }
+        }
+        List<RiskStoreTaskDetail> plxxs = detailMap.get("品类信息");
+        if (!CollectionUtils.isEmpty(plxxs)){
+            RiskStoreTaskDetail plxx = plxxs.get(0);
+            riskStoreTask.setPriceHp210(plxx.getPriceHp210());
+            riskStoreTask.setKwYmHp210(plxx.getKwYmHp210());
+            riskStoreTask.setPriceHp105(plxx.getPriceHp105());
+            riskStoreTask.setKwYmHp105(plxx.getKwYmHp105());
+            riskStoreTask.setPriceHp68(plxx.getPriceHp68());
+            riskStoreTask.setKwYmHp68(plxx.getKwYmHp68());
+            riskStoreTask.setPriceJrdb120(plxx.getPriceJrdb120());
+            riskStoreTask.setKwYmJrdb120(plxx.getKwYmJrdb120());
+            riskStoreTask.setPriceNrdb120(plxx.getPriceNrdb120());
+            riskStoreTask.setKwYmNrdb120(plxx.getKwYmNrdb120());
+            riskStoreTask.setPriceQg72(plxx.getPriceQg72());
+            riskStoreTask.setKwYmQg72(plxx.getKwYmQg72());
+            riskStoreTask.setPriceQg138(plxx.getPriceQg138());
+            riskStoreTask.setKwYmQg138(plxx.getKwYmQg138());
+            riskStoreTask.setPriceHpjt80(plxx.getPriceHpjt80());
+            riskStoreTask.setKwYmHpjt80(plxx.getKwYmHpjt80());
+            riskStoreTask.setPriceLl(plxx.getPriceLl());
+            riskStoreTask.setKwYmLl(plxx.getKwYmLl());
+            riskStoreTask.setPriceHpDz(plxx.getPriceHpDz());
+            riskStoreTask.setKwYmHpDz(plxx.getKwYmHpDz());
+            riskStoreTask.setPriceHpSc(plxx.getPriceHpSc());
+            riskStoreTask.setKwYmHpSc(plxx.getKwYmHpSc());
+        }
+        riskStoreTaskMapper.updateById(riskStoreTask);
         RiskStoreTaskDetail riskStoreTaskDetail = riskStoreTaskDetailMapper.selectById(detailDo.getRstdId());
         RiskStoreTaskDto.RiskStoreTaskDetailDto tDto = BeanUtils.transitionDto(riskStoreTaskDetail, RiskStoreTaskDto.RiskStoreTaskDetailDto.class);
         rDetail(tDto);

src/main/java/com/sfa/operation/domain/risk/entity/RiskStoreTask.java

@@ -8,14 +8,16 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * 风控门店任务表
+ *
  * @TableName risk_store_task
  */
 @Accessors(chain = true)
-@TableName(value ="risk_store_task")
+@TableName(value = "risk_store_task")
 @Data
 public class RiskStoreTask implements Serializable {
     /**
@@ -90,7 +92,7 @@ public class RiskStoreTask implements Serializable {
     private Integer skuNum;
 
     /**
-     * 长效图片(逗号分隔)
+     * 大日期图片(逗号分隔)
      */
     private String longTimePictures;
 
@@ -98,15 +100,307 @@ public class RiskStoreTask implements Serializable {
      * 备注
      */
     private String remark;
+
     /**
      * 常规陈列判定结果
      */
     private String cgclRiskR;
+
     /**
      * 档期陈列判定结果
      */
     private String dqclRiskR;
 
+    /**
+     * 常规陈列-1-形式
+     */
+    private String dModal1;
+
+    /**
+     * 常规陈列-1-陈列费用
+     */
+    private BigDecimal dCost1;
+
+    /**
+     * 常规陈列-1-照片
+     */
+    private String dPhotos1;
+
+    /**
+     * 常规陈列-1-检核结果
+     */
+    private String dRiskR1;
+
+    /**
+     * 常规陈列-2-形式
+     */
+    private String dModal2;
+
+    /**
+     * 常规陈列-2-陈列费用
+     */
+    private BigDecimal dCost2;
+
+    /**
+     * 常规陈列-2-照片
+     */
+    private String dPhotos2;
+
+    /**
+     * 常规陈列-2-检核结果
+     */
+    private String dRiskR2;
+
+    /**
+     * 常规陈列-3-形式
+     */
+    private String dModal3;
+
+    /**
+     * 常规陈列-3-陈列费用
+     */
+    private BigDecimal dCost3;
+
+    /**
+     * 常规陈列-3-照片
+     */
+    private String dPhotos3;
+
+    /**
+     * 常规陈列-3-检核结果
+     */
+    private String dRiskR3;
+
+    /**
+     * 档期陈列-1-形式
+     */
+    private String pModal1;
+
+    /**
+     * 档期陈列-1-陈列费用
+     */
+    private BigDecimal pCost1;
+
+    /**
+     * 档期陈列-1-照片
+     */
+    private String pPhotos1;
+
+    /**
+     * 档期陈列-1-检核结果
+     */
+    private String pRiskR1;
+
+    /**
+     * 档期陈列-2-形式
+     */
+    private String pModal2;
+
+    /**
+     * 档期陈列-2-陈列费用
+     */
+    private BigDecimal pCost2;
+
+    /**
+     * 档期陈列-2-照片
+     */
+    private String pPhotos2;
+
+    /**
+     * 档期陈列-2-检核结果
+     */
+    private String pRiskR2;
+
+    /**
+     * 档期陈列-3-形式
+     */
+    private String pModal3;
+
+    /**
+     * 档期陈列-3-陈列费用
+     */
+    private BigDecimal pCost3;
+
+    /**
+     * 档期陈列-3-照片
+     */
+    private String pPhotos3;
+
+    /**
+     * 档期陈列-3-检核结果
+     */
+    private String pRiskR3;
+
+    /**
+     * 档期补差1-内容
+     */
+    private String bcNr1;
+
+    /**
+     * 档期补差1-情况
+     */
+    private String bcQk1;
+
+    /**
+     * 档期补差1-照片
+     */
+    private String bcPhotos1;
+
+    /**
+     * 档期补差1-检核结果
+     */
+    private String bcRiskR1;
+
+    /**
+     * 档期补差2-内容
+     */
+    private String bcNr2;
+
+    /**
+     * 档期补差2-情况
+     */
+    private String bcQk2;
+
+    /**
+     * 档期补差2-照片
+     */
+    private String bcPhotos2;
+
+    /**
+     * 档期补差2-检核结果
+     */
+    private String bcRiskR2;
+
+    /**
+     * 档期补差3-内容
+     */
+    private String bcNr3;
+
+    /**
+     * 档期补差3-情况
+     */
+    private String bcQk3;
+
+    /**
+     * 档期补差3-照片
+     */
+    private String bcPhotos3;
+
+    /**
+     * 档期补差3-检核结果
+     */
+    private String bcRiskR3;
+
+    /**
+     * 虎皮210g价格
+     */
+    private String priceHp210;
+
+    /**
+     * 虎皮210g口味铺市月份
+     */
+    private String kwYmHp210;
+
+    /**
+     * 虎皮105g价格
+     */
+    private String priceHp105;
+
+    /**
+     * 虎皮105g口味铺市月份
+     */
+    private String kwYmHp105;
+
+    /**
+     * 虎皮68g价格
+     */
+    private String priceHp68;
+
+    /**
+     * 虎皮68g口味铺市月份
+     */
+    private String kwYmHp68;
+
+    /**
+     * 鸡肉豆堡120g价格
+     */
+    private String priceJrdb120;
+
+    /**
+     * 鸡肉豆堡120g口味铺市月份
+     */
+    private String kwYmJrdb120;
+
+    /**
+     * 牛肉豆堡120g价格
+     */
+    private String priceNrdb120;
+
+    /**
+     * 牛肉豆堡120g口味铺市月份
+     */
+    private String kwYmNrdb120;
+
+    /**
+     * 去骨凤爪72g价格
+     */
+    private String priceQg72;
+
+    /**
+     * 去骨凤爪72g口味铺市月份
+     */
+    private String kwYmQg72;
+
+    /**
+     * 去骨凤爪138g价格
+     */
+    private String priceQg138;
+
+    /**
+     * 去骨凤爪138g口味铺市月份
+     */
+    private String kwYmQg138;
+
+    /**
+     * 虎皮小鸡腿80g价格
+     */
+    private String priceHpjt80;
+
+    /**
+     * 虎皮小鸡腿80g口味铺市月份
+     */
+    private String kwYmHpjt80;
+
+    /**
+     * 老卤价格
+     */
+    private String priceLl;
+
+    /**
+     * 老卤口味铺市月份
+     */
+    private String kwYmLl;
+
+    /**
+     * 虎皮单支价格
+     */
+    private String priceHpDz;
+
+    /**
+     * 虎皮单支口味铺市月份
+     */
+    private String kwYmHpDz;
+
+    /**
+     * 虎皮散称价格
+     */
+    private String priceHpSc;
+
+    /**
+     * 虎皮散称口味铺市月份
+     */
+    private String kwYmHpSc;
+
     /**
      * 创建人
      */
@@ -134,4 +428,298 @@ public class RiskStoreTask implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    public void detailInit() {
+        /**
+         * 常规陈列-1-形式
+         */
+        this.dModal1 = null;
+
+        /**
+         * 常规陈列-1-陈列费用
+         */
+        this.dCost1 = null;
+
+        /**
+         * 常规陈列-1-照片
+         */
+        this.dPhotos1 = null;
+
+        /**
+         * 常规陈列-1-检核结果
+         */
+        this.dRiskR1 = null;
+
+        /**
+         * 常规陈列-2-形式
+         */
+        this.dModal2 = null;
+
+        /**
+         * 常规陈列-2-陈列费用
+         */
+        this.dCost2 = null;
+
+        /**
+         * 常规陈列-2-照片
+         */
+        this.dPhotos2 = null;
+
+        /**
+         * 常规陈列-2-检核结果
+         */
+        this.dRiskR2 = null;
+
+        /**
+         * 常规陈列-3-形式
+         */
+        this.dModal3 = null;
+
+        /**
+         * 常规陈列-3-陈列费用
+         */
+        this.dCost3 = null;
+
+        /**
+         * 常规陈列-3-照片
+         */
+        this.dPhotos3 = null;
+
+        /**
+         * 常规陈列-3-检核结果
+         */
+        this.dRiskR3 = null;
+
+        /**
+         * 档期陈列-1-形式
+         */
+        this.pModal1 = null;
+
+        /**
+         * 档期陈列-1-陈列费用
+         */
+        this.pCost1 = null;
+
+        /**
+         * 档期陈列-1-照片
+         */
+        this.pPhotos1 = null;
+
+        /**
+         * 档期陈列-1-检核结果
+         */
+        this.pRiskR1 = null;
+
+        /**
+         * 档期陈列-2-形式
+         */
+        this.pModal2 = null;
+
+        /**
+         * 档期陈列-2-陈列费用
+         */
+        this.pCost2 = null;
+
+        /**
+         * 档期陈列-2-照片
+         */
+        this.pPhotos2 = null;
+
+        /**
+         * 档期陈列-2-检核结果
+         */
+        this.pRiskR2 = null;
+
+        /**
+         * 档期陈列-3-形式
+         */
+        this.pModal3 = null;
+
+        /**
+         * 档期陈列-3-陈列费用
+         */
+        this.pCost3 = null;
+
+        /**
+         * 档期陈列-3-照片
+         */
+        this.pPhotos3 = null;
+
+        /**
+         * 档期陈列-3-检核结果
+         */
+        this.pRiskR3 = null;
+
+        /**
+         * 档期补差1-内容
+         */
+        this.bcNr1 = null;
+
+        /**
+         * 档期补差1-情况
+         */
+        this.bcQk1 = null;
+
+        /**
+         * 档期补差1-照片
+         */
+        this.bcPhotos1 = null;
+
+        /**
+         * 档期补差1-检核结果
+         */
+        this.bcRiskR1 = null;
+
+        /**
+         * 档期补差2-内容
+         */
+        this.bcNr2 = null;
+
+        /**
+         * 档期补差2-情况
+         */
+        this.bcQk2 = null;
+
+        /**
+         * 档期补差2-照片
+         */
+        this.bcPhotos2 = null;
+
+        /**
+         * 档期补差2-检核结果
+         */
+        this.bcRiskR2 = null;
+
+        /**
+         * 档期补差3-内容
+         */
+        this.bcNr3 = null;
+
+        /**
+         * 档期补差3-情况
+         */
+        this.bcQk3 = null;
+
+        /**
+         * 档期补差3-照片
+         */
+        this.bcPhotos3 = null;
+
+        /**
+         * 档期补差3-检核结果
+         */
+        this.bcRiskR3 = null;
+
+        /**
+         * 虎皮210g价格
+         */
+        this.priceHp210 = null;
+
+        /**
+         * 虎皮210g口味铺市月份
+         */
+        this.kwYmHp210 = null;
+
+        /**
+         * 虎皮105g价格
+         */
+        this.priceHp105 = null;
+
+        /**
+         * 虎皮105g口味铺市月份
+         */
+        this.kwYmHp105 = null;
+
+        /**
+         * 虎皮68g价格
+         */
+        this.priceHp68 = null;
+
+        /**
+         * 虎皮68g口味铺市月份
+         */
+        this.kwYmHp68 = null;
+
+        /**
+         * 鸡肉豆堡120g价格
+         */
+        this.priceJrdb120 = null;
+
+        /**
+         * 鸡肉豆堡120g口味铺市月份
+         */
+        this.kwYmJrdb120 = null;
+
+        /**
+         * 牛肉豆堡120g价格
+         */
+        this.priceNrdb120 = null;
+
+        /**
+         * 牛肉豆堡120g口味铺市月份
+         */
+        this.kwYmNrdb120 = null;
+
+        /**
+         * 去骨凤爪72g价格
+         */
+        this.priceQg72 = null;
+
+        /**
+         * 去骨凤爪72g口味铺市月份
+         */
+        this.kwYmQg72 = null;
+
+        /**
+         * 去骨凤爪138g价格
+         */
+        this.priceQg138 = null;
+
+        /**
+         * 去骨凤爪138g口味铺市月份
+         */
+        this.kwYmQg138 = null;
+
+        /**
+         * 虎皮小鸡腿80g价格
+         */
+        this.priceHpjt80 = null;
+
+        /**
+         * 虎皮小鸡腿80g口味铺市月份
+         */
+        this.kwYmHpjt80 = null;
+
+        /**
+         * 老卤价格
+         */
+        this.priceLl = null;
+
+        /**
+         * 老卤口味铺市月份
+         */
+        this.kwYmLl = null;
+
+        /**
+         * 虎皮单支价格
+         */
+        this.priceHpDz = null;
+
+        /**
+         * 虎皮单支口味铺市月份
+         */
+        this.kwYmHpDz = null;
+
+        /**
+         * 虎皮散称价格
+         */
+        this.priceHpSc = null;
+
+        /**
+         * 虎皮散称口味铺市月份
+         */
+        this.kwYmHpSc = null;
+
+    }
+
 }
\ No newline at end of file

src/main/resources/mapper/risk/RiskStoreTaskMapper.xml

@@ -21,6 +21,66 @@
         <result property="skuNum" column="sku_num" jdbcType="INTEGER"/>
         <result property="longTimePictures" column="long_time_pictures" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="cgclRiskR" column="cgcl_risk_r" jdbcType="VARCHAR"/>
+        <result property="dqclRiskR" column="dqcl_risk_r" jdbcType="VARCHAR"/>
+        <result property="dModal1" column="d_modal_1" jdbcType="VARCHAR"/>
+        <result property="dCost1" column="d_cost_1" jdbcType="DECIMAL"/>
+        <result property="dPhotos1" column="d_photos_1" jdbcType="VARCHAR"/>
+        <result property="dRiskR1" column="d_risk_r_1" jdbcType="VARCHAR"/>
+        <result property="dModal2" column="d_modal_2" jdbcType="VARCHAR"/>
+        <result property="dCost2" column="d_cost_2" jdbcType="DECIMAL"/>
+        <result property="dPhotos2" column="d_photos_2" jdbcType="VARCHAR"/>
+        <result property="dRiskR2" column="d_risk_r_2" jdbcType="VARCHAR"/>
+        <result property="dModal3" column="d_modal_3" jdbcType="VARCHAR"/>
+        <result property="dCost3" column="d_cost_3" jdbcType="DECIMAL"/>
+        <result property="dPhotos3" column="d_photos_3" jdbcType="VARCHAR"/>
+        <result property="dRiskR3" column="d_risk_r_3" jdbcType="VARCHAR"/>
+        <result property="pModal1" column="p_modal_1" jdbcType="VARCHAR"/>
+        <result property="pCost1" column="p_cost_1" jdbcType="DECIMAL"/>
+        <result property="pPhotos1" column="p_photos_1" jdbcType="VARCHAR"/>
+        <result property="pRiskR1" column="p_risk_r_1" jdbcType="VARCHAR"/>
+        <result property="pModal2" column="p_modal_2" jdbcType="VARCHAR"/>
+        <result property="pCost2" column="p_cost_2" jdbcType="DECIMAL"/>
+        <result property="pPhotos2" column="p_photos_2" jdbcType="VARCHAR"/>
+        <result property="pRiskR2" column="p_risk_r_2" jdbcType="VARCHAR"/>
+        <result property="pModal3" column="p_modal_3" jdbcType="VARCHAR"/>
+        <result property="pCost3" column="p_cost_3" jdbcType="DECIMAL"/>
+        <result property="pPhotos3" column="p_photos_3" jdbcType="VARCHAR"/>
+        <result property="pRiskR3" column="p_risk_r_3" jdbcType="VARCHAR"/>
+        <result property="bcNr1" column="bc_nr_1" jdbcType="VARCHAR"/>
+        <result property="bcQk1" column="bc_qk_1" jdbcType="VARCHAR"/>
+        <result property="bcPhotos1" column="bc_photos_1" jdbcType="VARCHAR"/>
+        <result property="bcRiskR1" column="bc_risk_r_1" jdbcType="VARCHAR"/>
+        <result property="bcNr2" column="bc_nr_2" jdbcType="VARCHAR"/>
+        <result property="bcQk2" column="bc_qk_2" jdbcType="VARCHAR"/>
+        <result property="bcPhotos2" column="bc_photos_2" jdbcType="VARCHAR"/>
+        <result property="bcRiskR2" column="bc_risk_r_2" jdbcType="VARCHAR"/>
+        <result property="bcNr3" column="bc_nr_3" jdbcType="VARCHAR"/>
+        <result property="bcQk3" column="bc_qk_3" jdbcType="VARCHAR"/>
+        <result property="bcPhotos3" column="bc_photos_3" jdbcType="VARCHAR"/>
+        <result property="bcRiskR3" column="bc_risk_r_3" jdbcType="VARCHAR"/>
+        <result property="priceHp210" column="price_hp210" jdbcType="VARCHAR"/>
+        <result property="kwYmHp210" column="kw_ym_hp210" jdbcType="VARCHAR"/>
+        <result property="priceHp105" column="price_hp105" jdbcType="VARCHAR"/>
+        <result property="kwYmHp105" column="kw_ym_hp105" jdbcType="VARCHAR"/>
+        <result property="priceHp68" column="price_hp68" jdbcType="VARCHAR"/>
+        <result property="kwYmHp68" column="kw_ym_hp68" jdbcType="VARCHAR"/>
+        <result property="priceJrdb120" column="price_jrdb120" jdbcType="VARCHAR"/>
+        <result property="kwYmJrdb120" column="kw_ym_jrdb120" jdbcType="VARCHAR"/>
+        <result property="priceNrdb120" column="price_nrdb120" jdbcType="VARCHAR"/>
+        <result property="kwYmNrdb120" column="kw_ym_nrdb120" jdbcType="VARCHAR"/>
+        <result property="priceQg72" column="price_qg72" jdbcType="VARCHAR"/>
+        <result property="kwYmQg72" column="kw_ym_qg72" jdbcType="VARCHAR"/>
+        <result property="priceQg138" column="price_qg138" jdbcType="VARCHAR"/>
+        <result property="kwYmQg138" column="kw_ym_qg138" jdbcType="VARCHAR"/>
+        <result property="priceHpjt80" column="price_hpjt80" jdbcType="VARCHAR"/>
+        <result property="kwYmHpjt80" column="kw_ym_hpjt80" jdbcType="VARCHAR"/>
+        <result property="priceLl" column="price_ll" jdbcType="VARCHAR"/>
+        <result property="kwYmLl" column="kw_ym_ll" jdbcType="VARCHAR"/>
+        <result property="priceHpDz" column="price_hp_dz" jdbcType="VARCHAR"/>
+        <result property="kwYmHpDz" column="kw_ym_hp_dz" jdbcType="VARCHAR"/>
+        <result property="priceHpSc" column="price_hp_sc" jdbcType="VARCHAR"/>
+        <result property="kwYmHpSc" column="kw_ym_hp_sc" jdbcType="VARCHAR"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
         <result property="createEmpNo" column="create_emp_no" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>