Antiloveg 8 lat temu
rodzic
commit
9b61a079a5

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

@@ -313,8 +313,8 @@
   <if test="serialNumber !=null">
     and c.serialNumber = #{serialNumber,jdbcType=INTEGER}
   </if>
-  <if test="id !=null">
-    and c.id = #{id,jdbcType=VARCAHR}
+  <if test="contractId !=null">
+    and c.id = #{contractId,jdbcType=VARCAHR}
   </if>
   <if test="type !=null">
     and c.type = #{type,jdbcType=INTEGER}
@@ -359,8 +359,8 @@
   <if test="principal != null">
 	and cl.principal = #{principal,jdbcType=VARCHAR}
   </if>
-  <if test="id != null">
-	and cl.id = #{id,jdbcType=VARCHAR}
+ <if test="contractId !=null">
+    and c.id = #{contractId,jdbcType=VARCAHR}
   </if>
   <if test="serialNumber !=null">
     and c.serialNumber = #{serialNumber,jdbcType=INTEGER}

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

@@ -608,12 +608,13 @@
 		p.patent_application_date as
 		patentApplicationDate, p.authorized_date as authorizedDate,
 		a.name as
-		author, ad.name as founder, p.contract_id as contractId
+		author, ad.name as founder, c.serial_number as contractNumber
 		from patent_info p
 		LEFT JOIN organization_identity o on p.uid =
 		o.uid
 		LEFT JOIN admin a on a.id = p.author
 		LEFT JOIN admin ad on ad.id = p.founder
+		LEFT JOIN contract c on c.id = p.contract_id
 		<if test="principal != null">
 			left join contract_log l on p.contract_id=l.cid
 		</if>

+ 3 - 3
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -58,7 +58,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<ContractManageListBo> getManageList(String id, Integer serialNumber, Integer type, Integer status,
+	public Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type, Integer status,
 			String startDateFormattedDate, String endDateFormattedDate, String province, String unitName, String uid,
 			Integer pNo, Integer pSize) {
 		Date cStart = null;
@@ -86,8 +86,8 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 			params.put("uid", uid);
 		}
 
-		if (!StringUtils.isBlank(id)) {
-			params.put("id", id);
+		if (!StringUtils.isBlank(contractId)) {
+			params.put("id", contractId);
 		}
 
 		if (!StringUtils.isBlank(startDateFormattedDate)) {

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

@@ -39,15 +39,14 @@ public class PatentManageListBo {
 
 	private Integer	patentCatagory;
 
-	private String	contractId;
+	private Integer	contractNumber;
 	
-
-	public String getContractId() {
-		return contractId;
+	public Integer getContractNumber() {
+		return contractNumber;
 	}
 
-	public void setContractId(String contractId) {
-		this.contractId = contractId;
+	public void setContractNumber(Integer contractNumber) {
+		this.contractNumber = contractNumber;
 	}
 
 	@JsonFormat(shape = Shape.STRING)