diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java index a5c13dad3bac118e172da11df8ed7416bbab03fb..ce87ca873787add55479c74232bbe4260c19ccd2 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java @@ -35,4 +35,11 @@ public interface DataSubmitMapper { * @return 反馈查询到的数据 * */ List selectMine(DataSubmit dataSubmit); + + /** + * 根据ID 更新提交的信息 + * @param dataSubmit 更新的数据集合,通常dataSubmit一次查询只包含submitor或者approver中的一个。 + * @return 反馈查询到的数据个数 + * */ + Integer countMine(DataSubmit dataSubmit); } diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java index 74b93bf38149d7182f002d105856eaee77efb5fb..c1e5a5b1c7173d3c73a4a9013e92f72a6f71d109 100644 --- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java +++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java @@ -48,4 +48,11 @@ public interface DataSubmitService { * @return 反馈查询到的结果 * **/ public List selectMyApprove(DataSubmit dataSubmit); + + /** + * 根据ID 更新提交的信息 + * @param dataSubmit 更新的数据集合,通常dataSubmit一次查询只包含submitor或者approver中的一个。 + * @return 反馈查询到的数据个数 + * */ + public Integer countMine(DataSubmit dataSubmit); } diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java index 8e297cf5a91449dc8c938b39b2374163f1e97d9c..dd988928d5064f50c010e1dff31a58c6b1e0d0bd 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java @@ -12,11 +12,18 @@ package com.cetc32.dh.service.impl; import com.cetc32.dh.entity.DataSubmit; import com.cetc32.dh.mybatis.DataSubmitMapper; import com.cetc32.dh.service.DataSubmitService; +import com.google.inject.internal.cglib.core.$DefaultGeneratorStrategy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; +/** + * @Title: DataSubmitServiceImpl + * @Description: + * @author: youqing + * @version: 1.0 + * @date: 2020/11/21 11:04 + */ @Service public class DataSubmitServiceImpl implements DataSubmitService { @@ -30,7 +37,15 @@ public class DataSubmitServiceImpl implements DataSubmitService { **/ @Override public Integer insertDataSubmit(DataSubmit ds) { - return null; + if(ds==null){ + return -1; + } + if(ds.getApprover()==null||ds.getPath()==null||ds.getArea()==null||ds.getYear()==null) { + return -1; + } + else{ + return dsMapper.insertOne(ds); + } } /** @@ -41,7 +56,15 @@ public class DataSubmitServiceImpl implements DataSubmitService { **/ @Override public Integer rejectSubmit(DataSubmit ds) { - return null; + if(ds==null){ + return -1; + } + if(ds.getId()==null){ + return -1; + } + ds.setStatus(-1); + return dsMapper.updateById(ds); + } /** @@ -52,7 +75,14 @@ public class DataSubmitServiceImpl implements DataSubmitService { **/ @Override public Integer acceptSubmit(DataSubmit ds) { - return null; + if(ds==null){ + return -1; + } + if(ds.getId()==null){ + return -1; + } + ds.setStatus(2); + return dsMapper.updateById(ds); } /** @@ -63,7 +93,11 @@ public class DataSubmitServiceImpl implements DataSubmitService { **/ @Override public List selectMySubmit(DataSubmit dataSubmit) { - return null; + if(dataSubmit==null){ + return null; + } + dataSubmit.setApprover(null); + return dsMapper.selectMine(dataSubmit); } /** @@ -74,7 +108,24 @@ public class DataSubmitServiceImpl implements DataSubmitService { **/ @Override public List selectMyApprove(DataSubmit dataSubmit) { - return null; + if(dataSubmit==null){ + return null; + } + dataSubmit.setSumbitor(null); + return dsMapper.selectMine(dataSubmit); + } + + /** + * 根据ID 更新提交的信息 + * @param dataSubmit 更新的数据集合,通常dataSubmit一次查询只包含submitor或者approver中的一个。 + * @return 反馈查询到的数据个数 + * */ + public Integer countMine(DataSubmit dataSubmit){ + if(dataSubmit==null){ + return null; + } + dataSubmit.setSumbitor(null); + return dsMapper.countMine(dataSubmit); } /** diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml index 03f07606df064aaa8f194dd344dd448b4416589c..d6c3f494dd9c1d3dbf66309cd1788d9c4b89d3bc 100644 --- a/src/main/resources/mapper/DataSubmitMapper.xml +++ b/src/main/resources/mapper/DataSubmitMapper.xml @@ -120,4 +120,17 @@ + + + \ No newline at end of file