Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-03-26 b4bc05b29aa6d71072efdf39caf1808b4e69eca4

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectSv.java

@@ -5,7 +5,7 @@
import com.dy.pipIrrGlobal.daoIr.IrProjectMapper;
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.voIr.VoProject;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +34,7 @@
     * @return
     */
    public Integer addProject(IrProject po) {
        po.setOperateDt(new Date());
        po.setOperateTime(new Date());
        po.setDeleted((byte) 0);
        if (po.getVillageId() != null) {
            po.setTownId(irProjectMapper.getSupperByVillageId(po.getVillageId()));
@@ -80,7 +80,7 @@
     * @return
     */
    public Integer updateProject(IrProject po){
        po.setOperateDt(new Date());
        po.setOperateTime(new Date());
        if (po.getVillageId() != null) {
            po.setTownId(irProjectMapper.getSupperByVillageId(po.getVillageId()));
            po.setCountyId(irProjectMapper.getSupperByVillageId(po.getTownId()));
@@ -112,7 +112,7 @@
     * @return
     */
    public Integer updateProjectState(IrProject po){
        po.setOperateDt(new Date());
        po.setOperateTime(new Date());
        int rows = irProjectMapper.updateProjectState(po);
        if (rows == 0){
            return 0;
@@ -125,8 +125,8 @@
     * @param id
     * @return
     */
    public IrProject selectById(Long id){
        IrProject irProject = irProjectMapper.selectById(id);
    public VoProjectOne selectById(Long id){
        VoProjectOne irProject = irProjectMapper.selectById(id);
        return irProject;
    }