Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java

@@ -1,6 +1,7 @@
package com.example.erp.service.sd;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.sd.BasicOtherMoney;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
import org.springframework.stereotype.Service;
@@ -25,9 +26,31 @@
        return basicOtherMoneyMapper.deleteById(id);
    }

    public int save(String alias) {
        BasicOtherMoney basicOtherMoney = new  BasicOtherMoney();
        basicOtherMoney.setAlias(alias);
        return basicOtherMoneyMapper.insert(basicOtherMoney);
    public boolean save(String alias) {
        //判断是否已经存在
        QueryWrapper<BasicOtherMoney> queryWrapperByName = new QueryWrapper<>();
        queryWrapperByName.eq("alias", alias);
        int count = Math.toIntExact(basicOtherMoneyMapper.selectCount(queryWrapperByName));
        if(count>0){
            return false;
        }

        //查询最大的列名
        QueryWrapper<BasicOtherMoney> queryWrapper = new QueryWrapper<>();
        queryWrapper.orderByDesc("id");
        List<BasicOtherMoney> basicOtherMoneyList = basicOtherMoneyMapper.selectList(queryWrapper);
        //超过100条不执行
        if(basicOtherMoneyList.size()==100){
            return false;
        }

        BasicOtherMoney basicOtherMoney = basicOtherMoneyList.get(0);
        String getColumn = basicOtherMoney.getColumn()==null?"0":basicOtherMoney.getColumn().replace("M","");
        int  columnNum = Integer.parseInt(getColumn)+1;
        BasicOtherMoney newBasicOtherMoney = new  BasicOtherMoney();
        newBasicOtherMoney.setColumn("M"+String.format("%02d", columnNum));
        newBasicOtherMoney.setAlias(alias);
        basicOtherMoneyMapper.insert(newBasicOtherMoney);
        return true;
    }
}