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

chenlu

2025-07-30 e9f8d23f55f64903d834308f9f167aaf3195c20d

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

File was renamed from north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
@@ -5,24 +5,23 @@
import com.example.erp.entity.sd.BasicData;
import com.example.erp.entity.sd.BasicOtherMoney;
import com.example.erp.entity.sd.Customer;
import com.example.erp.mapper.sd.BasicDateMapper;
import com.example.erp.mapper.sd.BasicDataMapper;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
import com.example.erp.mapper.sd.CustomerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;

@Service
@DS("sd")
public class BasicDateService {
    private final BasicDateMapper basicDateMapper;
public class BasicDataService {
    private final BasicDataMapper basicDataMapper;

    private final CustomerMapper customerMapper;
    private final BasicOtherMoneyMapper basicOtherMoneyMapper;

    public BasicDateService(BasicDateMapper basicDateMapper, CustomerMapper customerMapper, BasicOtherMoneyMapper basicOtherMoneyMapper) {
        this.basicDateMapper = basicDateMapper;
    public BasicDataService(BasicDataMapper basicDataMapper, CustomerMapper customerMapper, BasicOtherMoneyMapper basicOtherMoneyMapper) {
        this.basicDataMapper = basicDataMapper;
        this.customerMapper = customerMapper;
        this.basicOtherMoneyMapper = basicOtherMoneyMapper;
    }
@@ -79,9 +78,9 @@

    public Map<String, List<Object>> getBasicDataByType(String type){
        //返回基础数据里的所有类型
        List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType(type);
        List<String> orderBasicDataType = basicDataMapper.getOrderBasicDataType(type);
        //返回此类型基础数据所有数据
        List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData(type);
        List<BasicData> orderBasicData = basicDataMapper.getOrderBasicData(type);
        Map<String, List<Object>> BasicDataMap = new HashMap<>();
        //创建List对象

@@ -102,17 +101,17 @@

    public List<BasicData> getBasicDataByTypeAndChildType(String type, String childType) {
        Map<String, List<Object>> BasicDataMap = new HashMap<>();
        return basicDateMapper.getOrderBasicDataByTypeAndChildType(type, childType);
        return basicDataMapper.getOrderBasicDataByTypeAndChildType(type, childType);

    }

    public List<BasicData> getBasicData() {
        return basicDateMapper.getBasicData();
        return basicDataMapper.getBasicData();
    }

    public Object getBasicDataType() {
       List<BasicData> lastType =  basicDateMapper.getBasicDataLastType();
       List<BasicData> firstType= basicDateMapper.getBasicDataFirstType();
       List<BasicData> lastType =  basicDataMapper.getBasicDataLastType();
       List<BasicData> firstType= basicDataMapper.getBasicDataFirstType();
       List<Map<String,Object>> list = new ArrayList<>();
       if(!firstType.isEmpty()){
           firstType.forEach(item->{
@@ -143,17 +142,17 @@
            basicData.setBasicCategory(basicTypeList.get(1));
            basicData.setBasicName(map.get("input").toString());
            basicData.setNickname(map.get("nickname").toString());
            basicDateMapper.insert(basicData);
            basicDataMapper.insert(basicData);
        }
        return true;
    }

    public int deleteBasicData(BasicData basicData) {

        return  basicDateMapper.deleteById(basicData.getId());
        return  basicDataMapper.deleteById(basicData.getId());
    }

    public int updateBasicData(BasicData basicData) {
        return  basicDateMapper.updateById(basicData);
        return  basicDataMapper.updateById(basicData);
    }
}