Antiloveg 8 년 전
부모
커밋
b5dc31089b

+ 6 - 5
src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java

@@ -28,7 +28,7 @@ public class CognizanceOrgInfoBo {
 
 	private Integer		largeOrder;
 
-	private Integer		accient;
+	private Integer		accident;
 
 	private Integer		year;
 
@@ -118,12 +118,13 @@ public class CognizanceOrgInfoBo {
 		this.basicResearchCost = basicResearchCost;
 	}
 
-	public Integer getAccient() {
-		return accient;
+
+	public Integer getAccident() {
+		return accident;
 	}
 
-	public void setAccient(Integer accient) {
-		this.accient = accient;
+	public void setAccident(Integer accident) {
+		this.accident = accident;
 	}
 
 	public Integer getLargeOrder() {

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

@@ -135,7 +135,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			cog.setTechnicalField3(null == orgInfo.getTechnicalField3() ? 0 : orgInfo.getTechnicalField3());
 			cog.setBasicResearchCost(
 					null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
-			cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
+			cog.setAccident(null == orgInfo.getAccident() ? 0 : orgInfo.getAccident());
 			cog.setLargeOrder(null == orgInfo.getLargeOrder() ? 0 : orgInfo.getLargeOrder());
 			cog.setYear(orgInfo.getYear());
 			cog.setCertificateNumber(orgInfo.getCertificateNumber());

+ 15 - 3
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -388,9 +388,21 @@
 	
 	
   <select id="selectCognizanceOrgInfoBoByUidAndCid"  resultType="com.goafanti.cognizance.bo.CognizanceOrgInfoBo">
-		select u.id as uid, c.id as cid, o.unit_name as unitName, o.org_code as orgCode, o.postal_address as postalAddress, 
-			c.contacts, c.technical_field1 as technicalField1, c.technical_field2 as technicalField2, c.technical_field3 as technicalField3,
-			c.basic_research_cost as basicResearchCost, c.accident, c.large_order as largeOrder, c.year, c.certificate_number as certificateNumber
+		select 
+			u.id as uid, 
+			c.id as cid, 
+			o.unit_name as unitName, 
+			o.org_code as orgCode, 
+			o.postal_address as postalAddress, 
+			c.contacts, 
+			c.technical_field1 as technicalField1, 
+			c.technical_field2 as technicalField2, 
+			c.technical_field3 as technicalField3,
+			c.basic_research_cost as basicResearchCost, 
+			c.accident, 
+			c.large_order as largeOrder, 
+			c.year, 
+			c.certificate_number as certificateNumber
     	from  (select id from user where id = #{0}) u
 			LEFT JOIN organization_identity o on u.id = o.uid 
 			INNER JOIN org_cognizance c on c.uid = u.id  and c.deleted_sign = 0 and c.id = #{1}