水库白蚁普查增加年度

xieb

2024-03-11 3be630d678dd60603e557514a203a1f544034a4d

水库白蚁普查增加年度

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java

@@ -88,7 +88,7 @@
        if (tbResGeneralInvestigation.getGuid() == null) {
            tbResGeneralInvestigation.setCreateTime(new Date());
        }
        return R.status(tbResGeneralInvestigationService.saveOrUpdate(tbResGeneralInvestigation));
        return tbResGeneralInvestigationService.saveOrUpdateBy(tbResGeneralInvestigation);
    }

    @PostMapping("/remove")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResGeneralInvestigationService.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.tool.api.R;

/**
 * @PROJECT_NAME: skjcmanager
@@ -16,6 +17,6 @@
     * @param entity
     * @return
     */
    boolean saveOrUpdateBy(TbResGeneralInvestigation entity);
    R saveOrUpdateBy(TbResGeneralInvestigation entity);

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java

@@ -8,6 +8,8 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -22,29 +24,39 @@
@Transactional(rollbackFor = Exception.class)
public class TbResGeneralInvestigationServiceImpl extends ServiceImpl<TbResGeneralInvestigationMapper, TbResGeneralInvestigation> implements ITbResGeneralInvestigationService {

    @Autowired
    private ITbResGeneralInvestigationStateService tbResGeneralInvestigationStateService;

    @Override
    @Transactional
    public boolean saveOrUpdateBy(TbResGeneralInvestigation entity) {
    public R saveOrUpdateBy(TbResGeneralInvestigation entity) {

        QueryWrapper queryWrapper = new QueryWrapper();
        queryWrapper.eq("res_guid",entity.getResGuid());
        queryWrapper.eq("tb_year",entity.getTbYear());
        queryWrapper.eq("tb_quarter",entity.getTbYear());
        queryWrapper.eq("\"res_guid\"",entity.getResGuid());
        queryWrapper.eq("\"tb_year\"",entity.getTbYear());
        queryWrapper.eq("\"tb_quarter\"",entity.getTbQuarter());
        TbResGeneralInvestigationState state = tbResGeneralInvestigationStateService.getOne(queryWrapper);
        if (null == state) {
            state = new TbResGeneralInvestigationState();
            state.setResGuid(entity.getResGuid());
            state.setTbQuarter(entity.getTbQuarter());
            state.setTbYear(entity.getTbYear());
            state.setCreateTime(entity.getCreateTime());
            state.setCreateUser(entity.getCreateUser());
        } else {
            if (state.getCheckState() == 1 || state.getCheckState() == 2) {
                return R.fail(entity.getResName() + "本年度已经普查完成，不能在提交了。");
            }
        }

        // 是否普查完成 1是 0否
        state.setCheckState(entity.getIsInvCom());
        if (entity.getCheckState() != 0) {
            state.setCheckState(entity.getIsInvCom());
        }

        tbResGeneralInvestigationStateService.saveOrUpdate(state);

        return this.saveOrUpdate(entity);
        entity.setTbStateId(state.getGuid());
        return R.status(this.saveOrUpdate(entity));
    }
}