From 43807665de5d2da652681fea5a37d78bb76e71a5 Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 16 Oct 2020 11:18:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DataSubmit=20service=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSubmitServiceImpl.java | 50 ++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) 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 8e297cf..fe0f0c9 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,11 @@ 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); } /** -- Gitee From a91e2323746d32b209dab0683633413b98088bdf Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 16 Oct 2020 11:33:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DataSubmit=20=E5=A2=9E=E5=8A=A0=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=AE=A1=E6=95=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cetc32/dh/mybatis/DataSubmitMapper.java | 7 +++++++ .../com/cetc32/dh/service/DataSubmitService.java | 7 +++++++ .../dh/service/impl/DataSubmitServiceImpl.java | 13 +++++++++++++ src/main/resources/mapper/DataSubmitMapper.xml | 13 +++++++++++++ 4 files changed, 40 insertions(+) diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java index a5c13da..ce87ca8 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 74b93bf..c1e5a5b 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 fe0f0c9..dd98892 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java @@ -115,6 +115,19 @@ public class DataSubmitServiceImpl implements DataSubmitService { 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); + } + /** * DataSubmitMapper注入方法，必须用@Autowired注解 * @param dsMapper 待注入的bean diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml index 03f0760..d6c3f49 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 -- Gitee