金融认款申请移动端

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -222,4 +222,8 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("手机端—提交款项确认申请")
     @PostMapping("/submitRskCollectionConfirm")
     ResultBean submitRskCollectionConfirm(@RequestBody AppFinCollectionConfirmationRskDto appFinCollectionConfirmationDto);
+
+    @ApiOperation("手机端—初始化收款确认申请")
+    @GetMapping("/getRskCollectionConfirmDetail")
+    ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(@SpringQueryMap AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -238,4 +238,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean submitRskCollectionConfirm(AppFinCollectionConfirmationRskDto appFinCollectionConfirmationDto) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/AppFinCollectionConfirmationInitRskVo.java

@@ -15,9 +15,12 @@ import java.util.List;
  */
 @Data
 public class AppFinCollectionConfirmationInitRskVo implements Vo {
+
+    private String publishInfo;
     @ApiModelProperty("款项确认sid")
     private String sid;
-
+    @ApiModelProperty("汇款确认")
+    private List<String> images = new ArrayList<>();
     @ApiModelProperty("收款银行")
     private String collectionBank;
 
@@ -89,7 +92,8 @@ public class AppFinCollectionConfirmationInitRskVo implements Vo {
 
     @ApiModelProperty("单据编号")
     private String billNo;
-
+    private String reason;
+    private String cotlectionBitiStateValue;
 
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.fin.api.kingdee.voucher;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/19 11:18
+ */
+@Data
+@ApiModel(value = "收款凭证 数据传输对象", description = "收款凭证 数据传输对象")
+public class CollectionVoucher {
+    @ApiModelProperty("分公司编码")
+    public String useOrgCode;
+    @ApiModelProperty("收款方式编码")
+    public String payTypeCode;
+    @ApiModelProperty("银行账号")
+    public String bankAccount;
+    @ApiModelProperty("凭证明细")
+    public List<CollectionVoucher.CollectionVoucherDetail> voucherDetails;
+
+    @Data
+    public static class CollectionVoucherDetail {
+
+        @ApiModelProperty("场景编码")
+        public String sceneCode;
+        @ApiModelProperty("数据日期")
+        public Date dataTime;
+        @ApiModelProperty("部门编码")
+        public String deptCode;
+        @ApiModelProperty("部门名称")
+        public String deptName;
+        @ApiModelProperty("客户编码")
+        public String customerCode;
+        @ApiModelProperty("客户名称")
+        public String customerName;
+        @ApiModelProperty("备注")
+        public String remarks;
+    }
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.fin.api.kingdee.voucher;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/19 11:16
+ */
+@Data
+@ApiModel(value = "一般凭证 数据传输对象", description = "一般凭证 数据传输对象")
+public class GeneralVoucher {
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.fin.api.kingdee.voucher;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/19 11:18
+ */
+@Data
+@ApiModel(value = "一般凭证 数据传输对象", description = "一般凭证 数据传输对象")
+public class PaymentVoucher {
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java

@@ -30,7 +30,7 @@ public class Voucher {
 
 
         @ApiModelProperty("摘要")
-        public String remark;
+        public String summary;
         @ApiModelProperty("科目编码")
         public String subjectNo;
         @ApiModelProperty("核算维度部门")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -162,4 +162,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     IPage<AppFinCollectionConfirmationPageVo> getRskCollectionConfirmList(IPage<AppFinCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinCollectionConfirmationPageVo> qw, @Param("name") String name);
 
     AppFinCollectionConfirmationInitRskVo initRskCollectionConfirm(@Param("collectionBillSid")String collectionBillSid,@Param("useOrgSid") String useOrgSid);
+
+    AppFinCollectionConfirmationInitRskVo getRskCollectionConfirmDetail(@Param("collectionBillSid") String collectionBillSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -386,4 +386,31 @@
         WHERE sid = #{collectionBillSid}
           AND useOrgSid = #{useOrgSid}
     </select>
+    <select id="getRskCollectionConfirmDetail"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.rsk.AppFinCollectionConfirmationInitRskVo">
+        SELECT sid                  AS collectionBillSid,
+               collectionBankNumKey AS collectionNumKey,
+               collectionBankNum    AS collectionNum,
+               collectionBank,
+               collectionBankKey,
+               collectionTypeValue  AS collectionType,
+               collectionTypeKey    AS collectionTypeKey,
+               collectionDate,
+               payerName            AS paymentName,
+               collectionMoney      AS paymentMoney,
+               remarks,
+               balance,
+               createDept,
+               createDate,
+               receivingName,
+               payAccount,
+               payBank,
+               accountSid,
+               createByName,
+               billNo,
+               purchaseSystemName,
+               purchaseSystemSid
+        FROM fin_collection_confirmation
+        WHERE sid = #{collectionBillSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -329,4 +329,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean submitRskCollectionConfirm(AppFinCollectionConfirmationRskDto appFinCollectionConfirmationDto) {
         return finCollectionConfirmationService.submitRskCollectionConfirm(appFinCollectionConfirmationDto);
     }
+
+    @Override
+    public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery) {
+        return finCollectionConfirmationService.getRskCollectionConfirmDetail(appFinCollectionConfirmationOrgPathQuery);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -3981,6 +3981,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 );
             }
         }
+        qw.eq("1", "1");
         qw.orderBy(true, true, "t.loanContractNo")
                 .orderBy(true, true, "t.vin")
                 .orderBy(true, true, "t.period")
@@ -4003,6 +4004,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         AppFinCollectionConfirmationInitRskVo vo = baseMapper.initRskCollectionConfirm(collectionBillSid, useOrgSid);
         List<AppFinUncollectedReceivablesDetailedRskVo> rskList = new ArrayList<>();
         if (null != vo) {
+            if (StringUtils.isNotBlank(vo.getCreateByName()) && StringUtils.isNotBlank(vo.getCreateDept())) {
+                String createByName = vo.getCreateByName();
+                String createDept = vo.getCreateDept();
+                String createDate = vo.getCreateDate();
+                vo.setPublishInfo(createByName + "（" + createDept + "）" + createDate + "申请");
+            }
             List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(collectionBillSid);
             if (!finSelectedReceivablesDetailedVos.isEmpty()) {
                 finSelectedReceivablesDetailedVos.stream().forEach(v -> {
@@ -4179,4 +4186,103 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         return rb.success();
     }
+
+    public ResultBean<AppFinCollectionConfirmationInitRskVo> getRskCollectionConfirmDetail(AppFinCollectionConfirmationOrgPathQuery query) {
+        ResultBean<AppFinCollectionConfirmationInitRskVo> rb = ResultBean.fireFail();
+        String orgPath = query.getOrgPath();
+        String collectionBillSid = query.getCollectionBillSid();
+//        String useOrgSid = "";
+//        if (StringUtils.isNotBlank(orgPath)) {
+//            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+//        } else {
+//            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+//        }
+        AppFinCollectionConfirmationInitRskVo vo = baseMapper.getRskCollectionConfirmDetail(collectionBillSid);
+        List<AppFinUncollectedReceivablesDetailedRskVo> rskList = new ArrayList<>();
+        List<CommonAppendixVo> commonAppendixVoList1 = commonAppendixFeign.getAppAppendixList(collectionBillSid, CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()).getData();
+        List<String> images = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : commonAppendixVoList1) {
+            String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
+            images.add(url);
+        }
+        vo.setImages(images);
+        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(query.getCollectionBillSid());
+        if (null != finCollectionConfirmation) {
+            if (null != finCollectionConfirmation.getAuditState()) {
+                if (finCollectionConfirmation.getAuditState() == 2) {
+                    vo.setCotlectionBitiStateValue("驳回");
+                    vo.setReason(finCollectionConfirmation.getReason());
+                } else if (finCollectionConfirmation.getAuditState() == 3) {
+                    vo.setCotlectionBitiStateValue("确认");
+                }
+            }
+        }
+        if (null != vo) {
+            if (StringUtils.isNotBlank(vo.getCreateByName()) && StringUtils.isNotBlank(vo.getCreateDept())) {
+                String createByName = vo.getCreateByName();
+                String createDept = vo.getCreateDept();
+                String createDate = vo.getCreateDate();
+                vo.setPublishInfo(createByName + "（" + createDept + "）" + createDate + "申请");
+            }
+            List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(collectionBillSid);
+            if (!finSelectedReceivablesDetailedVos.isEmpty()) {
+                finSelectedReceivablesDetailedVos.stream().forEach(v -> {
+                    AppFinUncollectedReceivablesDetailedRskVo rsk = new AppFinUncollectedReceivablesDetailedRskVo();
+                    String receivablesSid = v.getReceivablesSid();
+                    if (v.getReceivablesName().equals("月还")) {
+                        LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData();
+                        if (null != data) {
+                            BeanUtil.copyProperties(data, rsk, "sid");
+                            if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
+                                rsk.setVin(data.getVinNo() + "/" + data.getVehMark());
+                            }
+                            String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid);
+                            if (StringUtils.isNotBlank(noReturnMoney)) {
+                                rsk.setNoReceivable(new BigDecimal(noReturnMoney));
+                            }
+                        }
+                    } else {
+                        FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid);
+                        if (jr != null) {
+                            String busSid = jr.getBusSid();
+                            LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData();
+                            if (null != data) {
+                                BeanUtil.copyProperties(data, rsk, "sid");
+                                if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
+                                    rsk.setVin(data.getVinNo() + "/" + data.getVehMark());
+                                }
+                                String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid);
+                                if (StringUtils.isNotBlank(noReturnMoney)) {
+                                    rsk.setNoReceivable(new BigDecimal(noReturnMoney));
+                                }
+                            }
+                        }
+                    }
+                    if (StringUtils.isNotBlank(v.getSubscriptionDate())) {
+                        rsk.setConfirmDate(v.getSubscriptionDate());
+                    }
+                    if (null != v.getAuditState()) {
+                        rsk.setState(String.valueOf(v.getAuditState()));
+                    }
+                    rsk.setProjectName(v.getReceivablesName());
+//                    rsk.setSid(v.getSid());
+                    rsk.setConfirmMoney(v.getSubscriptionMoney());
+                    rsk.setReceivablesSid(v.getReceivablesSid());
+                    rskList.add(rsk);
+                });
+            }
+        }
+        vo.setContractList(rskList);
+        List<CommonAppendixVo> commonAppendixVoList = commonAppendixFeign.getAppAppendixList(vo.getCollectionBillSid(), CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()).getData();
+        List<String> payFiles = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : commonAppendixVoList) {
+            String url = fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath();
+            payFiles.add(url);
+        }
+        vo.setPayFiles(payFiles);
+        vo.setUserSid(query.getUserSid());
+        String fils = fileUploadComponent.getUrlPrefix() + "confirm.docx";
+        vo.setDownLoadUrl(fils);
+        return rb.success().setData(vo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@@ -9,10 +9,8 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class VoucherService extends FinKingDeeService {
@@ -29,24 +27,25 @@ public class VoucherService extends FinKingDeeService {
         Map<String, String> map_fEntityModel_ = new HashMap<>();
         //物料的数组集合
         //账簿
-        if (StringUtils.isBlank(voucher.getAccountBook())) {
-            return rb.setMsg("账簿不能为空");
-        }
+//        if (StringUtils.isBlank(voucher.getAccountBook())) {
+//            return rb.setMsg("账簿不能为空");
+//        }
         map_fEntityModel_.put("FAccountBookID", voucher.getAccountBook());
         //业务日期
-        if (StringUtils.isBlank(voucher.getBussDate())) {
-            return rb.setMsg("业务日期不能为空");
-        }
-        map_fEntityModel_.put("FDate", voucher.getBussDate());
+//        if (StringUtils.isBlank(voucher.getBussDate())) {
+//            return rb.setMsg("业务日期不能为空");
+//        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        map_fEntityModel_.put("FDate", sdf.format(new Date()));
         //凭证字
-        if (StringUtils.isBlank(voucher.getVoucherWord())) {
-            return rb.setMsg("凭证字不能为空");
-        }
+//        if (StringUtils.isBlank(voucher.getVoucherWord())) {
+//            return rb.setMsg("凭证字不能为空");
+//        }
         map_fEntityModel_.put("FVOUCHERGROUPID", voucher.getVoucherWord());
         //凭证号
-        if (StringUtils.isBlank(voucher.getVoucherNo())) {
-            return rb.setMsg("凭证号不能为空");
-        }
+//        if (StringUtils.isBlank(voucher.getVoucherNo())) {
+//            return rb.setMsg("凭证号不能为空");
+//        }
         map_fEntityModel_.put("FVOUCHERGROUPNO", voucher.getVoucherNo());
 
         List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails();
@@ -85,7 +84,7 @@ public class VoucherService extends FinKingDeeService {
             if (StringUtils.isBlank(c.getSubjectNo())) {
                 return rb.setMsg("科目编码不能为空");
             }
-            m.put("FEXPLANATION", c.getRemark());
+            m.put("FEXPLANATION", c.getSummary());
             m.put("FACCOUNTID", c.getSubjectNo());
             m.put("FFLEX5", c.getDimensionDept());
             m.put("FFLEX6", c.getDimensionCustom());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/data_FEntity.json

@@ -9,6 +9,9 @@
     },
     "FDETAILID__FFLEX6": {
       "FNumber": "@KD_FFLEX6"
+    },
+    "FDETAILID__FF100002": {
+      "FNumber": "@KD_FF100002"
     }
   },
   "FCURRENCYID": {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/remarks.txt

@@ -78,4 +78,8 @@
 取消复核操(作辅助):FCancleRecheck
 来源系统:FSystemID
 是否调整期凭证:FISADJUSTVOUCHER
-出纳复核操作(辅助):FCashierRecheck
+出纳复核操作(辅助):FCashierRecheck
+维度：
+FDETAILID__FF100002 银行账号
+FDETAILID__FFLEX5 部门编号
+FDETAILID__FFLEX6 客户编码

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -125,4 +125,8 @@ public interface AppFinCollectionConfirmationFeign {
     @PostMapping("/submitRskCollectionConfirm")
     public ResultBean submitRskCollectionConfirm(@RequestBody ConfirmationRskDto dto);
 
+    @ApiOperation("手机端—款项确认申请详情")
+    @GetMapping("/getRskCollectionConfirmDetail")
+    public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(@SpringQueryMap CollectionConfirmationOrgPathQuery query);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -131,4 +131,9 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	public ResultBean submitRskCollectionConfirm(ConfirmationRskDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
+		return null;
+	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitRskVo.java

@@ -16,6 +16,9 @@ import java.util.List;
 @Data
 public class ConfirmationInitRskVo implements Vo {
 
+    private String publishInfo;
+    private String reason;
+    private String cotlectionBitiStateValue;
     @ApiModelProperty("款项确认sid")
     private String sid;
 
@@ -64,6 +67,9 @@ public class ConfirmationInitRskVo implements Vo {
     @ApiModelProperty("款项明细")
     private List<UncollectedReceivablesDetailedRskVo> contractList = new ArrayList<>();
 
+    @ApiModelProperty("汇款确认")
+    private List<String> images = new ArrayList<>();
+
     @ApiModelProperty("余额")
     private String balance;
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -181,4 +181,9 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     public ResultBean submitRskCollectionConfirm(ConfirmationRskDto dto) {
         return appfinCollectionConfirmationService.submitRskCollectionConfirm(dto);
     }
+
+    @Override
+    public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
+        return appfinCollectionConfirmationService.getRskCollectionConfirmDetail(query);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -295,4 +295,18 @@ public class AppFinCollectionConfirmationService {
         ResultBean resultBean = finCollectionConfirmationFeign.submitRskCollectionConfirm(appFinCollectionConfirmationDto);
         return resultBean;
     }
+
+    public ResultBean<ConfirmationInitRskVo> getRskCollectionConfirmDetail(CollectionConfirmationOrgPathQuery query) {
+        ResultBean<ConfirmationInitRskVo> rb = ResultBean.fireFail();
+        ConfirmationInitRskVo vo = new ConfirmationInitRskVo();
+        AppFinCollectionConfirmationOrgPathQuery appFinCollectionConfirmationOrgPathQuery = new AppFinCollectionConfirmationOrgPathQuery();
+        BeanUtil.copyProperties(query, appFinCollectionConfirmationOrgPathQuery);
+        ResultBean<AppFinCollectionConfirmationInitRskVo> resultBean = finCollectionConfirmationFeign.getRskCollectionConfirmDetail(appFinCollectionConfirmationOrgPathQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppFinCollectionConfirmationInitRskVo data = resultBean.getData();
+        BeanUtil.copyProperties(data, vo);
+        return rb.success().setData(vo);
+    }
 }