Antiloveg 8 years ago
parent
commit
79119083bf
34 changed files with 112 additions and 104 deletions
  1. 12 12
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 9 9
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  3. 2 2
      src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java
  4. 1 1
      src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java
  5. 1 1
      src/main/java/com/goafanti/cognizance/bo/InputOrgCognizance.java
  6. 9 9
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  7. 2 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  8. 12 9
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  9. 2 2
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  10. 1 1
      src/main/java/com/goafanti/common/model/Admin.java
  11. 2 2
      src/main/java/com/goafanti/common/model/OrgActivity.java
  12. 3 3
      src/main/java/com/goafanti/common/model/OrgActivityCost.java
  13. 2 2
      src/main/java/com/goafanti/common/model/OrgAnnualReport.java
  14. 1 1
      src/main/java/com/goafanti/common/model/OrgCognizanceLog.java
  15. 1 1
      src/main/java/com/goafanti/common/model/OrgHonorDatum.java
  16. 1 1
      src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java
  17. 1 1
      src/main/java/com/goafanti/common/model/OrgStandard.java
  18. 1 1
      src/main/java/com/goafanti/common/model/OrgTechCenter.java
  19. 3 3
      src/main/java/com/goafanti/common/model/OrgTechCenterDetail.java
  20. 3 3
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  21. 1 1
      src/main/java/com/goafanti/common/model/UserIdentity.java
  22. 6 6
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  23. 1 1
      src/main/java/com/goafanti/patent/bo/InputPatentInfo.java
  24. 1 1
      src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java
  25. 3 3
      src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java
  26. 3 3
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  27. 1 1
      src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java
  28. 1 1
      src/main/java/com/goafanti/patent/bo/PatentPendingBo.java
  29. 6 6
      src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java
  30. 1 4
      src/main/java/com/goafanti/patent/controller/PatentApiController.java
  31. 5 1
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  32. 1 1
      src/main/java/com/goafanti/techproject/bo/InputTechProject.java
  33. 12 8
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  34. 1 1
      src/main/java/com/goafanti/user/controller/UserApiController.java

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

@@ -574,7 +574,7 @@ public class AdminApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
-				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
+				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -664,7 +664,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
-				orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1009,7 +1009,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
-						DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1313,14 +1313,14 @@ public class AdminApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
-				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
 
 		if (StringUtils.isBlank(endDateFormattedDate)) {
 			try {
-				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1473,7 +1473,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (StringUtils.isBlank(signDateFormattedDate)) {
 			try {
-				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -2104,7 +2104,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			try {
-				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDD));
+				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -2242,7 +2242,7 @@ public class AdminApiController extends CertifyApiController {
 		}
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			try {
-				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDD));
+				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -2367,14 +2367,14 @@ public class AdminApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDD));
+						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
 		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
+						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -2382,7 +2382,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
+						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -2696,7 +2696,7 @@ public class AdminApiController extends CertifyApiController {
 		Date recordTime = null;
 		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
 			try {
-				recordTime = DateUtils.parseDate(recordTimeFormattedDate, AFTConstants.YYYYMMDD);
+				recordTime = DateUtils.parseDate(recordTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS);
 			} catch (ParseException e) {
 			}
 		}

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

@@ -574,9 +574,9 @@ public class AdminPatentApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null == patentState || patentState != PatentInfoStatus.REVIEWNOTICE.getCode()
-				|| patentState != PatentInfoStatus.CORRECTIONNOTICE.getCode()) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利状态", "专利状态"));
+		if (null == patentState || (patentState != PatentInfoStatus.REVIEWNOTICE.getCode()
+				&& patentState != PatentInfoStatus.CORRECTIONNOTICE.getCode())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "专利状态"));
 			return res;
 		}
 
@@ -956,31 +956,31 @@ public class AdminPatentApiController extends CertifyApiController {
 		try {
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
 				patentRegistration.setAcceptanceIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
 				patentRegistration.setAcceptanceReceiveTime(
-						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
 			patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
 				patentRegistration.setAuthorizationIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
 				patentRegistration.setAuthorizationReceiveTime(
-						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
 			patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
 				patentRegistration.setCertificateIssueTime(
-						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
 				patentRegistration.setCertificateRecieveTime(
-						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 		} catch (ParseException e) {
 		}

+ 2 - 2
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -176,7 +176,7 @@ public class CognizanceBo {
 			if (this.createTime == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 		
@@ -189,7 +189,7 @@ public class CognizanceBo {
 			if (this.issuingDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 		

+ 1 - 1
src/main/java/com/goafanti/cognizance/bo/CultivationListBo.java

@@ -116,7 +116,7 @@ public class CultivationListBo {
 		if (this.issuingDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDD);
+			 return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDDHHMMSS);
 		   }
 	}
 		

+ 1 - 1
src/main/java/com/goafanti/cognizance/bo/InputOrgCognizance.java

@@ -46,7 +46,7 @@ public class InputOrgCognizance {
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	certificateUrl;
 
-	@Max(value = 12, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 13, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	state;
 

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

@@ -1130,14 +1130,14 @@ public class CognizanceApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			try {
-				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
 
 		if (StringUtils.isBlank(endDateFormattedDate)) {
 			try {
-				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1212,7 +1212,7 @@ public class CognizanceApiController extends CertifyApiController {
 		}
 
 		if (!StringUtils.isBlank(signDateFormattedDate)) {
-			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
+			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 		}
 
 		OrgActivityCost oac = new OrgActivityCost();
@@ -1336,7 +1336,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			try {
 				orgIntellectualProperty.setAuthorizationDate(
-						DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDD));
+						DateUtils.parseDate(authorizationDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1755,7 +1755,7 @@ public class CognizanceApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			try {
-				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDD));
+				honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1822,7 +1822,7 @@ public class CognizanceApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			try {
-				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDD));
+				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1903,14 +1903,14 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDD));
+						.setProjectTime(DateUtils.parseDate(projectTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
 		if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
+						.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}
@@ -1918,7 +1918,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
 			try {
 				orgTechCenterDetail
-						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
+						.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			} catch (ParseException e) {
 			}
 		}

+ 2 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -122,7 +122,7 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setLocationArea(m.getLocationArea());
 			report.setListed(m.getListed().toString());
 			if (null != m.getListedDate()) {
-				report.setListedDate(DateFormatUtils.format(m.getListedDate(), AFTConstants.YYYYMMDD));
+				report.setListedDate(DateFormatUtils.format(m.getListedDate(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			report.setListedType(m.getListedType().toString());
 			report.setStockCode(m.getStockCode());
@@ -135,7 +135,7 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setNetAsset(null == m.getNetAsset() ? new BigDecimal(0) : m.getNetAsset());
 			report.setCertificateNumber(m.getCertificateNumber());
 			if (null != m.getIssuingDate()) {
-				report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), AFTConstants.YYYYMMDD));
+				report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), AFTConstants.YYYYMMDDHHMMSS));
 			}
 			report.setContacts(m.getContacts());
 			report.setResearchCost(null == m.getResearchCost() ? new BigDecimal(0) : m.getResearchCost());

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

@@ -46,7 +46,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	@Autowired
 	private OrganizationIdentityMapper	organizationIdentityMapper;
 	@Autowired
-	private NoticeMapper noticeMapper;
+	private NoticeMapper				noticeMapper;
 
 	@Override
 	public OrgCognizance insert(OrgCognizance c) {
@@ -59,7 +59,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	public Pagination<CognizanceBo> listCognizance(String uid, String unitName, String locationProvince, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		
+
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
@@ -214,9 +214,9 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			log.setCid(cog.getId());
 			log.setOperator(aid);
 			orgCognizanceLogMapper.insert(log);
-			
+
 			createNotice(cog, log);
-			
+
 		}
 		orgCognizanceMapper.updateByPrimaryKeySelective(cog);
 	}
@@ -237,7 +237,11 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 		log.setRecordTime(c.getCreateTime());
 		log.setState(c.getState());
-		log.setPrincipal(aid);
+		if (TokenManager.getToken() instanceof Admin) {
+			log.setPrincipal(TokenManager.getAdminId());
+		} else {
+			log.setPrincipal(aid);
+		}
 		if (TokenManager.getToken() instanceof Admin) {
 			log.setOperator(TokenManager.getAdminId());
 		}
@@ -273,11 +277,10 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		return (Pagination<CultivationListBo>) findPage("findCultivationListByPage", "findCultivationCount", params,
 				pageNo, pageSize);
 	}
-	
-	
-	private void createNotice(OrgCognizance cog, OrgCognizanceLog l){
+
+	private void createNotice(OrgCognizance cog, OrgCognizanceLog l) {
 		OrgCognizance info = orgCognizanceMapper.selectByPrimaryKey(cog.getId());
-		
+
 		Notice n = new Notice();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -731,8 +731,8 @@
 		patentState,
 		c.annual_fee_state as annualFeeState, p.authorized_date as authorizedDate
 		from patent_info p
-		INNER JOIN patent_cost c on p.id = c.pid
-		LEFT JOIN organization_identity o on p.uid = o.id
+		LEFT JOIN patent_cost c on p.id = c.pid
+		LEFT JOIN organization_identity o on p.uid = o.uid
 		<if test="principal != null">
 			left join patent_log l on p.id=l.pid
 		</if>

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

@@ -117,7 +117,7 @@ public class Admin extends BaseModel implements AftUser {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 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.YYYYMMDD);
+			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -312,7 +312,7 @@ public class OrgActivity {
 		if (this.endDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

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

@@ -264,7 +264,7 @@ public class OrgActivityCost {
     	if (this.signDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
     }
     
@@ -276,7 +276,7 @@ public class OrgActivityCost {
 		if (this.startDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getStartDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -288,7 +288,7 @@ public class OrgActivityCost {
 		if (this.endDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getEndDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

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

@@ -154,7 +154,7 @@ public class OrgAnnualReport {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -166,7 +166,7 @@ public class OrgAnnualReport {
 		if (this.lastUpdateTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getLastUpdateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getLastUpdateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

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

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

+ 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.YYYYMMDD);
+			return DateFormatUtils.format(this.getIssuingTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

+ 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.YYYYMMDD);
+			return DateFormatUtils.format(this.getAuthorizationDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

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

@@ -112,7 +112,7 @@ public class OrgStandard {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 		

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

@@ -127,7 +127,7 @@ public class OrgTechCenter {
 		if (this.foundingTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getFoundingTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getFoundingTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

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

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

@@ -644,7 +644,7 @@ public class OrganizationIdentity {
 		if (this.paymentDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDD);
+			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDDHHMMSS);
 		   }
 	}
 		
@@ -657,7 +657,7 @@ public class OrganizationIdentity {
 		if (this.listedDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getListedDate(), AFTConstants.YYYYMMDD);
+			 return DateFormatUtils.format(this.getListedDate(), AFTConstants.YYYYMMDDHHMMSS);
 		   }
 	}
 		
@@ -670,7 +670,7 @@ public class OrganizationIdentity {
 		if (this.issuingDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDD);
+			 return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDDHHMMSS);
 		   }
 	}
 		

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

@@ -296,7 +296,7 @@ public class UserIdentity {
 		if (this.paymentDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDD);
+			 return DateFormatUtils.format(this.getPaymentDate(), AFTConstants.YYYYMMDDHHMMSS);
 		   }
 	}
 		

+ 6 - 6
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -142,11 +142,11 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		if (createTime != null) {
 			try {
 				if (createTime.length > 0 && StringUtils.isNotBlank(createTime[0])) {
-					params.put("createStartTime", DateUtils.parseDate(createTime[0], AFTConstants.YYYYMMDD));
+					params.put("createStartTime", DateUtils.parseDate(createTime[0], AFTConstants.YYYYMMDDHHMMSS));
 				}
 				if (createTime.length > 1 && StringUtils.isNotBlank(createTime[1])) {
 					params.put("createEndTime",
-							DateUtils.addDays(DateUtils.parseDate(createTime[1], AFTConstants.YYYYMMDD), 1));
+							DateUtils.addDays(DateUtils.parseDate(createTime[1], AFTConstants.YYYYMMDDHHMMSS), 1));
 				}
 			} catch (ParseException e) {
 			}
@@ -154,11 +154,11 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		if (acceptTime != null) {
 			try {
 				if (acceptTime.length > 0 && StringUtils.isNotBlank(acceptTime[0])) {
-					params.put("acceptStartTime", DateUtils.parseDate(acceptTime[0], AFTConstants.YYYYMMDD));
+					params.put("acceptStartTime", DateUtils.parseDate(acceptTime[0], AFTConstants.YYYYMMDDHHMMSS));
 				}
 				if (acceptTime.length > 1 && StringUtils.isNotBlank(acceptTime[1])) {
 					params.put("acceptEndTime",
-							DateUtils.addDays(DateUtils.parseDate(acceptTime[1], AFTConstants.YYYYMMDD), 1));
+							DateUtils.addDays(DateUtils.parseDate(acceptTime[1], AFTConstants.YYYYMMDDHHMMSS), 1));
 				}
 			} catch (ParseException e) {
 			}
@@ -166,11 +166,11 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		if (authTime != null) {
 			try {
 				if (authTime.length > 0 && StringUtils.isNotBlank(authTime[0])) {
-					params.put("authStartTime", DateUtils.parseDate(authTime[0], AFTConstants.YYYYMMDD));
+					params.put("authStartTime", DateUtils.parseDate(authTime[0], AFTConstants.YYYYMMDDHHMMSS));
 				}
 				if (authTime.length > 1 && StringUtils.isNotBlank(authTime[1])) {
 					params.put("authEndTime",
-							DateUtils.addDays(DateUtils.parseDate(authTime[1], AFTConstants.YYYYMMDD), 1));
+							DateUtils.addDays(DateUtils.parseDate(authTime[1], AFTConstants.YYYYMMDDHHMMSS), 1));
 				}
 			} catch (ParseException e) {
 			}

+ 1 - 1
src/main/java/com/goafanti/patent/bo/InputPatentInfo.java

@@ -79,7 +79,7 @@ public class InputPatentInfo {
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String patentCertificateUrl;
 	
-	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 14, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		state;
 

+ 1 - 1
src/main/java/com/goafanti/patent/bo/PatentApplicationFeeBo.java

@@ -180,7 +180,7 @@ public class PatentApplicationFeeBo {
 		if (this.patentApplicationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

+ 3 - 3
src/main/java/com/goafanti/patent/bo/PatentCompositeBo.java

@@ -355,7 +355,7 @@ public class PatentCompositeBo {
 			if (this.authorizedDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
+				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 
@@ -368,7 +368,7 @@ public class PatentCompositeBo {
 			if (this.patentApplicationDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
+				return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 		
@@ -381,7 +381,7 @@ public class PatentCompositeBo {
 			if (this.createTime == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 		

+ 3 - 3
src/main/java/com/goafanti/patent/bo/PatentManageListBo.java

@@ -142,7 +142,7 @@ public class PatentManageListBo {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -155,7 +155,7 @@ public class PatentManageListBo {
 		if (this.patentApplicationDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getPatentApplicationDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -168,7 +168,7 @@ public class PatentManageListBo {
 		if (this.createTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 1 - 1
src/main/java/com/goafanti/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -145,7 +145,7 @@ public class PatentNoticeOfCorrectionBo {
 			if (this.authorizedDate == null) {
 				return null;
 			} else {
-				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
+				return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDDHHMMSS);
 			}
 		}
 		

+ 1 - 1
src/main/java/com/goafanti/patent/bo/PatentPendingBo.java

@@ -147,7 +147,7 @@ public class PatentPendingBo {
 		if (this.authorizedDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getAuthorizedDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 			

+ 6 - 6
src/main/java/com/goafanti/patent/bo/PatentRecieveSendBo.java

@@ -236,7 +236,7 @@ public class PatentRecieveSendBo {
 		if (this.acceptanceReceiveTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getAcceptanceReceiveTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -249,7 +249,7 @@ public class PatentRecieveSendBo {
 		if (this.acceptanceIssueTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAcceptanceIssueTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getAcceptanceIssueTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -262,7 +262,7 @@ public class PatentRecieveSendBo {
 		if (this.authorizationReceiveTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getAuthorizationReceiveTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -275,7 +275,7 @@ public class PatentRecieveSendBo {
 		if (this.authorizationIssueTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getAuthorizationIssueTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getAuthorizationIssueTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -288,7 +288,7 @@ public class PatentRecieveSendBo {
 		if (this.certificateRecieveTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCertificateRecieveTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCertificateRecieveTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	
@@ -301,7 +301,7 @@ public class PatentRecieveSendBo {
 		if (this.certificateIssueTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCertificateIssueTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getCertificateIssueTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 	

+ 1 - 4
src/main/java/com/goafanti/patent/controller/PatentApiController.java

@@ -79,9 +79,6 @@ public class PatentApiController extends CertifyApiController {
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
 	public Result upload(HttpServletRequest req, String sign) {
 		Result res = new Result();
-		if (!checkUserLogin(res)) {
-			return res;
-		}
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -264,7 +261,7 @@ public class PatentApiController extends CertifyApiController {
 		if (null != pi.getUid() && pi.getUid().equals(TokenManager.getUserId())) {
 			List<PatentLog> list = patentLogService.selectProcessByPid(pid);
 			for (PatentLog log : list) {
-				if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SIGN 
+				if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SIGN
 						|| PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.CIRCULATION
 						|| PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SETTLEMENT) {
 					list.remove(log);

+ 5 - 1
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -329,7 +329,11 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		log.setPid(patentInfo.getId());
 		log.setRecordTime(patentInfo.getRecordTime());
 		log.setState(PatentInfoStatus.CREATE.getCode());
-		log.setPrincipal(StringUtils.isBlank(aid) && TokenManager.getToken() instanceof Admin ? TokenManager.getAdminId() : "");
+		if (TokenManager.getToken() instanceof Admin) {
+			log.setPrincipal(TokenManager.getAdminId());
+		} else {
+			log.setPrincipal(aid);
+		}
 		if (TokenManager.getToken() instanceof Admin) {
 			log.setOperator(TokenManager.getAdminId());
 		}

+ 1 - 1
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -55,7 +55,7 @@ public class InputTechProject {
 	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String approvalUrl;
 	
-	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Max(value = 10, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		state;
 

+ 12 - 8
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -36,7 +36,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	@Autowired
 	private TechProjectLogMapper	techProjectLogMapper;
 	@Autowired
-	private NoticeMapper noticeMapper;
+	private NoticeMapper			noticeMapper;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -97,13 +97,17 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		log.setId(UUID.randomUUID().toString());
 		log.setPid(techProject.getId());
 		log.setRecordTime(techProject.getRecordTime());
-		log.setPrincipal(StringUtils.isBlank(aid) && TokenManager.getToken() instanceof Admin ? TokenManager.getAdminId() : "");
+		if (TokenManager.getToken() instanceof Admin) {
+			log.setPrincipal(TokenManager.getAdminId());
+		} else {
+			log.setPrincipal(aid);
+		}
 		log.setState(TechProjectStatus.CREATE.getCode());
 		if (TokenManager.getToken() instanceof Admin) {
 			log.setOperator(TokenManager.getAdminId());
 		}
 		techProjectLogMapper.insert(log);
-		
+
 		createNotice(techProject, log);
 	}
 
@@ -112,11 +116,11 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	public Pagination<TechProjectManageListBo> listManageTechProject(String province, String unitName, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		
+
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-		
+
 		if (!StringUtils.isBlank(province)) {
 			params.put("province", province);
 		}
@@ -148,10 +152,10 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	public TechProject selectByPrimaryKey(String id) {
 		return techProjectMapper.selectByPrimaryKey(id);
 	}
-	
-	private void createNotice(TechProject t, TechProjectLog l){
+
+	private void createNotice(TechProject t, TechProjectLog l) {
 		TechProject info = techProjectMapper.selectByPrimaryKey(t.getId());
-		
+
 		Notice n = new Notice();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -811,7 +811,7 @@ public class UserApiController extends BaseApiController {
 				return res;
 			}
 			if (!StringUtils.isBlank(listedDateFormattedDate)) {
-				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDD));
+				orgIdentity.setListedDate(DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 		}
 		if (3 == orgIdentity.getProcess()) {