albertshaw преди 9 години
родител
ревизия
9fbf4cfa40

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -124,7 +124,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		if (ids == null || ids.length < 1) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
 		} else {
-			copyrightInfoService.batchDeleteByPrimaryKey(Arrays.asList(ids));
+			res.setData(copyrightInfoService.batchDeleteByPrimaryKey(Arrays.asList(ids)));
 		}
 		return res;
 	}
@@ -165,7 +165,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 			return res;
 		}
 		if (StringUtils.isBlank(id)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "公司"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "软著申请id"));
 		} else {
 			res.setData(copyrightInfoService.findLogsByPrimaryKey(id));
 		}

+ 16 - 17
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -32,23 +32,6 @@
     from copyright_info
     where id = #{id,jdbcType=VARCHAR}
   </select>
-  <select id="findByPrimaryKey" parameterType="java.lang.String" resultType="com.goafanti.copyright.bo.CopyrightInfoDetail">
-    select ci.id,ci.uid,ci.serial_number as serialNumber, ci.create_time as createTime, 
-	ci.accept_time as acceptTime, ci.contact, ci.copyright_name as copyrightName, 
-	ci.status, ci.comment, ci.outsource, ci.in_urgent as inUrgent, ci.authorized_date as authorizedDate, 
-	ci.work_issue as workIssue,ci.application_url as applicationUrl,ci.certificate_url as certificateUrl,
-	oi.location_province as province, oi.location_city as city,oi.location_area as area, oi.postcode,
-	oi.unit_name as unitName, 
-	concat(oi.first_contacts,'  ', oi.first_mobile) as firstContact,
-	concat(oi.second_contacts,'  ', oi.second_mobile) as secondContact,
-	concat(oi.third_contacts,'  ', oi.third_mobile) as thirdContact,
-	a.name as principal
-	from copyright_info ci 
-	left join organization_identity oi on ci.uid = oi.uid
-	left join admin a on ci.principal = a.id
-    where ci.id = #{id,jdbcType=VARCHAR}
-  </select>
-  
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from copyright_info
     where id = #{id,jdbcType=VARCHAR}
@@ -357,4 +340,20 @@
 		#{item}
 	</foreach>
   </update>
+  <select id="findByPrimaryKey" parameterType="java.lang.String" resultType="com.goafanti.copyright.bo.CopyrightInfoDetail">
+    select ci.id,ci.uid,ci.serial_number as serialNumber, ci.create_time as createTime, 
+	ci.accept_time as acceptTime, ci.contact, ci.copyright_name as copyrightName, 
+	ci.status, ci.comment, ci.outsource, ci.in_urgent as inUrgent, ci.authorized_date as authorizedDate, 
+	ci.work_issue as workIssue,ci.application_url as applicationUrl,ci.certificate_url as certificateUrl,
+	oi.location_province as province, oi.location_city as city,oi.location_area as area, oi.postcode,
+	oi.unit_name as unitName, oi.org_code as orgCode,
+	concat(oi.first_contacts,'  ', oi.first_mobile) as firstContact,
+	concat(oi.second_contacts,'  ', oi.second_mobile) as secondContact,
+	concat(oi.third_contacts,'  ', oi.third_mobile) as thirdContact,
+	a.name as principal
+	from copyright_info ci 
+	left join organization_identity oi on ci.uid = oi.uid
+	left join admin a on ci.principal = a.id
+    where ci.id = #{id,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/copyright/bo/CopyrightInfoDetail.java

@@ -9,6 +9,7 @@ public class CopyrightInfoDetail extends CopyrightInfoSummary {
 	private String	city;
 	private String	area;
 	private String	postcode;
+	private String	orgCode;
 
 	/**
 	 * 证书附件地址
@@ -86,4 +87,12 @@ public class CopyrightInfoDetail extends CopyrightInfoSummary {
 
 	}
 
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
 }