Antiloveg пре 8 година
родитељ
комит
37e5618118

+ 20 - 6
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -526,6 +526,10 @@ public class AdminApiController extends BaseApiController {
 		if (null == orgTechProduct.getId()) {
 			orgTechProduct.setId(UUID.randomUUID().toString());
 			orgTechProduct.setDeletedSign(0);
+			Calendar now = Calendar.getInstance();
+			now.set(Calendar.MILLISECOND, 0);
+			orgTechProduct.setCreateTime(now.getTime());
+			orgTechProduct.setYear(Calendar.getInstance().get(Calendar.YEAR)-1);
 			orgTechProductService.insert(orgTechProduct);
 		} else {
 			orgTechProductService.updateByPrimaryKeySelective(orgTechProduct);
@@ -564,9 +568,14 @@ public class AdminApiController extends BaseApiController {
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
 		if (null == orgRatepay.getId()) {
-			orgRatepay.setId(UUID.randomUUID().toString());
-			orgRatepay.setDeletedSign(0);
-			orgRatepayService.insert(orgRatepay);
+			if (null == orgRatepayService.selectRatepayByUidAndYear(orgRatepay.getUid(), orgRatepay.getYear())){
+				orgRatepay.setId(UUID.randomUUID().toString());
+				orgRatepay.setDeletedSign(0);
+				orgRatepayService.insert(orgRatepay);
+			} else {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
+				return res;
+			}
 		} else {
 			orgRatepayService.updateByPrimaryKeySelective(orgRatepay);
 		}
@@ -606,9 +615,14 @@ public class AdminApiController extends BaseApiController {
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
 		if (null == orgFinance.getId()) {
-			orgFinance.setId(UUID.randomUUID().toString());
-			orgFinance.setDeletedSign(0);
-			orgFinanceService.insert(orgFinance);
+			if (null == orgFinanceService.selectFinanceByUidAndYear(orgFinance.getUid(), orgFinance.getYear())){
+				orgFinance.setId(UUID.randomUUID().toString());
+				orgFinance.setDeletedSign(0);
+				orgFinanceService.insert(orgFinance);
+			} else {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
+				return res;
+			}
 		} else {
 			orgFinanceService.updateByPrimaryKeySelective(orgFinance);
 		}

+ 2 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -56,5 +56,7 @@ public class ErrorConstants {
 	
 	public static final String NON_CERTIFIED = "NON_CERTIFIED";
 	
+	public static final String DUPLICATE_DATA_ERROR = "DUPLICATE_DATA_ERROR";
+	
 
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgFinanceMapper.java

@@ -20,4 +20,6 @@ public interface OrgFinanceMapper {
 	OrgFinance selectOrgFinanceByUid(String uid);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	OrgFinance selectFinanceByUidAndYear(String uid, Integer year);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgRatepayMapper.java

@@ -20,4 +20,6 @@ public interface OrgRatepayMapper {
 	OrgRatepay selectOrgRatepayByUid(String uid);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	OrgRatepay selectRatepayByUidAndYear(String uid, Integer year);
 }

+ 8 - 0
src/main/java/com/goafanti/common/mapper/OrgFinanceMapper.xml

@@ -258,4 +258,12 @@
 		#{item}
 	</foreach>
   </update>
+  
+  
+  <select id="selectFinanceByUidAndYear" resultMap="BaseResultMap"  >
+    select 
+    <include refid="Base_Column_List" />
+    from org_finance
+    where uid = #{0} and year = #{1}
+  </select>
 </mapper>

+ 7 - 0
src/main/java/com/goafanti/common/mapper/OrgRatepayMapper.xml

@@ -233,4 +233,11 @@
 		#{item}
 	</foreach>
   </update>
+  
+  <select id="selectRatepayByUidAndYear" resultMap="BaseResultMap"  >
+    select 
+    <include refid="Base_Column_List" />
+    from org_ratepay
+    where uid = #{0} and year = #{1}
+  </select>
 </mapper>

+ 18 - 8
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -489,10 +489,15 @@ public class CognizanceApiController extends BaseApiController {
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
 		if (null == orgRatepay.getId()) {
-			orgRatepay.setId(UUID.randomUUID().toString());
-			orgRatepay.setUid(TokenManager.getUserId());
-			orgRatepay.setDeletedSign(0);
-			orgRatepayService.insert(orgRatepay);
+			if (null == orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), orgRatepay.getYear())){
+				orgRatepay.setId(UUID.randomUUID().toString());
+				orgRatepay.setUid(TokenManager.getUserId());
+				orgRatepay.setDeletedSign(0);
+				orgRatepayService.insert(orgRatepay);
+			} else {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度纳税申报表已录入!"));
+				return res;
+			}
 		} else {
 			orgRatepayService.updateByPrimaryKeySelective(orgRatepay);
 		}
@@ -549,10 +554,15 @@ public class CognizanceApiController extends BaseApiController {
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
 		if (null == orgFinance.getId()) {
-			orgFinance.setId(UUID.randomUUID().toString());
-			orgFinance.setUid(TokenManager.getUserId());
-			orgFinance.setDeletedSign(0);
-			orgFinanceService.insert(orgFinance);
+			if (null == orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), orgFinance.getYear())){
+				orgFinance.setId(UUID.randomUUID().toString());
+				orgFinance.setUid(TokenManager.getUserId());
+				orgFinance.setDeletedSign(0);
+				orgFinanceService.insert(orgFinance);
+			} else {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度财务报表已录入!"));
+				return res;
+			}
 		} else {
 			orgFinanceService.updateByPrimaryKeySelective(orgFinance);
 		}

+ 2 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgFinanceService.java

@@ -16,4 +16,6 @@ public interface OrgFinanceService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
+	OrgFinance selectFinanceByUidAndYear(String uid, Integer year);
+
 }

+ 2 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgRatepayService.java

@@ -16,4 +16,6 @@ public interface OrgRatepayService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
+	OrgRatepay selectRatepayByUidAndYear(String userId, Integer year);
+
 }

+ 5 - 0
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgFinanceServiceImpl.java

@@ -58,5 +58,10 @@ public class OrgFinanceServiceImpl  extends BaseMybatisDao<OrgFinanceMapper> imp
 	public int batchDeleteByPrimaryKey(List<String> id) {
 		return orgFinanceMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public OrgFinance selectFinanceByUidAndYear(String uid, Integer year) {
+		return orgFinanceMapper.selectFinanceByUidAndYear(uid, year);
+	}
 	
 }

+ 5 - 0
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgRatepayServiceImpl.java

@@ -59,4 +59,9 @@ public class OrgRatepayServiceImpl extends BaseMybatisDao<OrgRatepayMapper> impl
 		return orgRatepayMapper.batchDeleteByPrimaryKey(id);
 	}
 
+	@Override
+	public OrgRatepay selectRatepayByUidAndYear(String uid, Integer year) {
+		return orgRatepayMapper.selectRatepayByUidAndYear(uid, year);
+	}
+
 }