Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

yee 8 years ago
parent
commit
fd4a11d3c0

+ 10 - 9
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -6,6 +6,7 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -1441,12 +1442,12 @@ public class CognizanceApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
-			
+
 			res = disposeActivityYear(res, ac, oac);
 			if (!res.getError().isEmpty()) {
 				return res;
 			}
-			
+
 			oac.setStartDate(ac.getStartDate());
 			oac.setEndDate(ac.getEndDate());
 			oac.setId(UUID.randomUUID().toString());
@@ -2394,11 +2395,12 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 		List<OrgCognizanceLog> list = orgCognizanceLogService.selectOrgCognizanceLogByCid(cid);
-		for (OrgCognizanceLog log : list) {
-			if (OrgCognizanceStatus.getStatus(log.getState()) == OrgCognizanceStatus.SIGN
-					|| OrgCognizanceStatus.getStatus(log.getState()) == OrgCognizanceStatus.CIRCULATION
-					|| OrgCognizanceStatus.getStatus(log.getState()) == OrgCognizanceStatus.SETTLEMENT) {
-				list.remove(log);
+		for (Iterator<OrgCognizanceLog> log = list.iterator(); log.hasNext();) {
+			Integer state = log.next().getState();
+			if (OrgCognizanceStatus.getStatus(state) == OrgCognizanceStatus.SIGN
+					|| OrgCognizanceStatus.getStatus(state) == OrgCognizanceStatus.CIRCULATION
+					|| OrgCognizanceStatus.getStatus(state) == OrgCognizanceStatus.SETTLEMENT) {
+				log.remove();
 			}
 		}
 
@@ -2591,7 +2593,6 @@ public class CognizanceApiController extends CertifyApiController {
 		return fileName;
 	}
 
-
 	// 高企认定
 	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid, Integer year) {
 		return orgCognizanceService.selectCognizanceDetailBo(uid, cid, year);
@@ -2601,7 +2602,7 @@ public class CognizanceApiController extends CertifyApiController {
 	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
 		return orgAnnualReportService.selectAnnualReportBo(uid, year);
 	}
-	
+
 	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
 		Calendar c = Calendar.getInstance();
 		c.setTime(ac.getStartDate());

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -522,7 +522,7 @@
     <include refid="Base_Column_List" />
     from contract
     where uid = #{uid,jdbcType=VARCHAR}
-    and year = #{year,jdbcType=INTEGER}
+    and cognizance_year = #{year,jdbcType=INTEGER}
     and deleted_sign = 0
   </select>
 </mapper>