Merge branch 'wb' into qa

cjl

2023-09-26 bd8b3f8e4b5d8af99f267eb5c6efaac03406c620

 screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java

@@ -16,6 +16,7 @@
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.AllocationService;
import com.moral.api.service.FileTableService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -30,11 +31,11 @@
@Service
public class AllocationExtensionServiceImpl extends ServiceImpl<AllocationExtensionMapper, AllocationExtension> implements AllocationExtensionService {

    private final AllocationService allocationService;
    @Autowired
    private AllocationService allocationService;
    private final FileTableService fileTableService;

    public AllocationExtensionServiceImpl(AllocationService allocationService, FileTableService fileTableService) {
        this.allocationService = allocationService;
    public AllocationExtensionServiceImpl( FileTableService fileTableService) {
        this.fileTableService = fileTableService;
    }

@@ -73,16 +74,16 @@

    @Override
    @Transactional
    public boolean check(Integer id, Integer sate) {
    public boolean check(Integer id, Integer state) {
        AllocationExtensionExt extensionExt = this.baseMapper.extOne(id);
        if(!AllocationExtensionApproveEnum.APPLYING.value.equals(extensionExt.getState())){
            throw new BusinessException("审批中才能发起审批！");
        }
        AllocationExtension allocationExtension = new AllocationExtension();
        allocationExtension.setId(id);
        allocationExtension.setState(sate);
        allocationExtension.setState(state);
        this.baseMapper.updateById(allocationExtension);
        if(AllocationExtensionApproveEnum.PASS.value.equals(sate)){
        if(AllocationExtensionApproveEnum.PASS.value.equals(state)){
            Allocation allocation = new Allocation();
            allocation.setAllocationId(extensionExt.getAllocationId());
            allocation.setChangeDay(extensionExt.getChangeDay()+extensionExt.getExtensionNum());