Antiloveg 8 years ago
parent
commit
344c52c755

+ 9 - 8
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1009,7 +1009,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
-						DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -1132,6 +1132,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(orgTechProductService.listTechProduct(pNo, pSize, uid));
 		return res;
 	}
+	
 
 	/**
 	 * 上年度高新技术产品(服务)情况(新增+修改)
@@ -1313,14 +1314,14 @@ public class AdminApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
-				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
 
 		if (StringUtils.isBlank(endDateFormattedDate)) {
 			try {
-				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -1473,7 +1474,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (StringUtils.isBlank(signDateFormattedDate)) {
 			try {
-				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -2104,7 +2105,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			try {
-				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -2367,14 +2368,14 @@ public class AdminApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
 		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -2382,7 +2383,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}

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

@@ -1903,14 +1903,14 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
 		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -1918,7 +1918,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -206,7 +206,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 				organizationIdentityMapper.updateByPrimaryKeySelective(o);
 			}
 
-			if (OrgCognizanceStatus.getStatus(cog.getState()) != OrgCognizanceStatus.CIRCULATION) {
+			if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.CIRCULATION) {
 				cog.setState(OrgCognizanceStatus.DELIVERD.getCode());
 			}
 

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

@@ -291,6 +291,7 @@
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
     </if>
+    order by start_date
     <if test="page_sql != null">
     	${page_sql}
     </if>

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

@@ -325,6 +325,7 @@
     <if test="endDate != null">
     	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
     </if>
+    order by start_date 
     <if test="page_sql != null">
     	${page_sql}
     </if>

+ 2 - 2
src/main/java/com/goafanti/common/model/OrgActivity.java

@@ -300,7 +300,7 @@ public class OrgActivity {
 		if (this.startDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -312,7 +312,7 @@ public class OrgActivity {
 		if (this.endDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/common/model/OrgHonorDatum.java

@@ -100,7 +100,7 @@ public class OrgHonorDatum {
 		if (this.issuingTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getIssuingTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getIssuingTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java

@@ -183,7 +183,7 @@ public class OrgIntellectualProperty {
 		if (this.authorizationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizationDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getAuthorizationDate(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 3 - 3
src/main/java/com/goafanti/common/model/OrgTechCenterDetail.java

@@ -127,7 +127,7 @@ public class OrgTechCenterDetail {
 		if (this.projectTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getProjectTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getProjectTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -139,7 +139,7 @@ public class OrgTechCenterDetail {
 		if (this.termStartTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getTermStartTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getTermStartTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	
@@ -152,7 +152,7 @@ public class OrgTechCenterDetail {
 		if (this.termEndTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getTermEndTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getTermEndTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 	

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.15
+static.host=//afts.hnzhiming.com/1.0.16
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.15
+static.host=//afts.hnzhiming.com/1.0.16
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.15
+static.host=//afts.hnzhiming.com/1.0.16

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.15
+static.host=//aftts.hnzhiming.com/1.0.16
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload