修改流程代码提交

liusheng

2024-02-22 d5c2c0762ccbb2bb33635f99480d404f1fb10d5a

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -11,6 +11,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.ChineseUtils;
@@ -108,6 +109,9 @@
        if (serviceFund.getUploadtime() != null) {
            wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime());
        }
        if (serviceFund.getUploadStates() != null) {
            wrappers.eq(ServiceFund::getUploadStates, serviceFund.getUploadStates());
        }
        if (serviceFund.getFlowlevel() != null) {
            wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel());
        }
@@ -138,8 +142,18 @@
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public Boolean addFundSharedInfo(Long id) {
        log.info("fund表的id：{}", id);
        //判断一下，share表是否已经存在了
        Map<String, Object> map = new HashMap<>();
        map.put("serfunid", id);
        map.put("del_flag", 0);
        List<ServiceFundShared> serviceFundSharedList = serviceFundSharedMapper.selectByMap(map);
        if (!CollectionUtils.isEmpty(serviceFundSharedList)) {
            return true;
        }

        ServiceFund serviceFund = serviceFundMapper.selectById(id);
        ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
        serviceFundShared.setSerfunid(serviceFundShared.getId());
@@ -669,7 +683,6 @@
    @Override
    public int countItem(Long infoid, Long itemid) {
        List<ServiceFund> serviceFunds = serviceFundMapper.getInfoByInfoId(infoid);

        int count = 0;
        for (ServiceFund s : serviceFunds) {
            long fundid = s.getId();
@@ -695,6 +708,10 @@
        BigDecimal bigDecimal = new BigDecimal(0.0);
        // 保存详情数据
        for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
            //去掉身份证的首尾空格
            if (StringUtils.isNotEmpty(serviceFunddetailVO.getIdcardno())) {
                serviceFunddetailVO.setIdcardno(serviceFunddetailVO.getIdcardno().trim());
            }

            if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
                throw new BaseException("请检查银行卡号是否为空,姓名：" + serviceFunddetailVO.getBeneficiaryname());
@@ -703,9 +720,13 @@
            //將附件转成json
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
                serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
            } else {
                serviceFunddetailVO.setAnnexfiles(null);
            }
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
                serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
            } else {
                serviceFunddetailVO.setInvoicefiles(null);
            }
            ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);