Explorar o código

update BaseController & patentContractList

Antiloveg %!s(int64=8) %!d(string=hai) anos
pai
achega
4dc4c27b03

+ 20 - 3
src/main/java/com/goafanti/admin/controller/AdminContractApiController.java

@@ -30,6 +30,7 @@ import com.goafanti.contract.bo.InputContract;
 import com.goafanti.contract.bo.InputSaveContract;
 import com.goafanti.contract.service.ContractLogService;
 import com.goafanti.contract.service.ContractService;
+import com.goafanti.patent.service.PatentInfoService;
 import com.goafanti.user.service.UserService;
 
 @RestController
@@ -45,7 +46,23 @@ public class AdminContractApiController extends CertifyApiController {
 	private OrgCognizanceService	orgCognizanceService;
 	@Resource
 	private AdminService			adminService;
-	
+	@Resource
+	private PatentInfoService		patentInfoService;
+
+	/**
+	 * 合同详情-专利列表
+	 */
+	@RequestMapping(value = "/patent", method = RequestMethod.GET)
+	public Result listPatent(String contractId) {
+		Result res = new Result();
+		if (StringUtils.isBlank(contractId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
+			return res;
+		}
+		res.setData(patentInfoService.listContractPatentByContractId(contractId));
+		return res;
+	}
+
 	/**
 	 * 合同分发流转人员下拉
 	 */
@@ -161,12 +178,12 @@ public class AdminContractApiController extends CertifyApiController {
 		res.setData(contractService.selectContractDetail(id));
 		return res;
 	}
-	
+
 	/**
 	 * 合同流转日志
 	 */
 	@RequestMapping(value = "/log", method = RequestMethod.GET)
-	public Result log(String cid){
+	public Result log(String cid) {
 		Result res = new Result();
 		if (StringUtils.isBlank(cid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));

+ 0 - 2
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -96,8 +96,6 @@ public class BaseController {
 		model.addAttribute("staticHost", staticHost);
 		model.addAttribute("avatarHost", avatarHost);
 		model.addAttribute("basePath", request.getContextPath());
-		model.addAttribute("uploadPath",uploadPath);
-		model.addAttribute("uploadPrivatePath",uploadPrivatePath);
 		if (SecurityUtils.getSubject().getPrincipal()  instanceof User){
 			model.addAttribute("userData", TokenManager.getToken() );
 		}

+ 3 - 0
src/main/java/com/goafanti/common/dao/PatentInfoMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.model.PatentInfo;
+import com.goafanti.patent.bo.PatentContractListBo;
 import com.goafanti.patent.bo.PatentExpireBO;
 import com.goafanti.patent.bo.PatentInfoDetailBo;
 import com.goafanti.patent.bo.PatentRecieveSendBo;
@@ -40,5 +41,7 @@ public interface PatentInfoMapper {
 	Integer countPatentUndone(String uid);
 
 	List<PatentExpireBO> selectExpireRecord();
+
+	List<PatentContractListBo> listContractPatentByContractId(String contractId);
 	
 }

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

@@ -992,5 +992,15 @@
 	where p.deleted_sign = 0 and p.patent_state in (12, 13)
 	and pc.annual_fee_state = 0
   </select>
+  
+  <select id="listContractPatentByContractId" parameterType="java.lang.String" resultType="com.goafanti.patent.bo.PatentContractListBo">
+  	select 
+  		pi.id, pi.uid, pi.contract_id as contractId, 
+  		pi.patent_name as patentName, patent_number as patentNumber, a.name as principal, 
+  		pi.patent_state as patentState, pi.patent_catagory as patentCatagory
+  	from patent_info pi
+  	left join admin a on a.id = pi.principal
+  	where contract_id = #{contractId,jdbcType=VARCHAR}
+  </select>
 
 </mapper>

+ 93 - 0
src/main/java/com/goafanti/patent/bo/PatentContractListBo.java

@@ -0,0 +1,93 @@
+package com.goafanti.patent.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
+public class PatentContractListBo {
+	private String id;
+	
+	private String uid;
+	
+	private String contractId;
+	
+	private String patentName;
+	
+	private String patentNumber;
+	
+	private Integer patentState;
+	
+	private Integer patentCatagory;
+	
+	private String principal;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	public String getPatentName() {
+		return patentName;
+	}
+
+	public void setPatentName(String patentName) {
+		this.patentName = patentName;
+	}
+
+	public String getPatentNumber() {
+		return patentNumber;
+	}
+
+	public void setPatentNumber(String patentNumber) {
+		this.patentNumber = patentNumber;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getPatentState() {
+		return patentState;
+	}
+
+	public void setPatentState(Integer patentState) {
+		this.patentState = patentState;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getPatentCatagory() {
+		return patentCatagory;
+	}
+
+	public void setPatentCatagory(Integer patentCatagory) {
+		this.patentCatagory = patentCatagory;
+	}
+
+	public String getPrincipal() {
+		return principal;
+	}
+
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+	
+	
+	
+	
+	
+}

+ 3 - 0
src/main/java/com/goafanti/patent/service/PatentInfoService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.patent.bo.PatentContractListBo;
 import com.goafanti.patent.bo.PatentExpireBO;
 import com.goafanti.patent.bo.PatentInfoDetailBo;
 import com.goafanti.patent.bo.PatentManageListBo;
@@ -49,4 +50,6 @@ public interface PatentInfoService {
 
 	PatentInfo insertPatentInfo(PatentInfo pi, String aid);
 
+	List<PatentContractListBo> listContractPatentByContractId(String contractId);
+
 }

+ 6 - 0
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -42,6 +42,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.patent.bo.PatentContractListBo;
 import com.goafanti.patent.bo.PatentExpireBO;
 import com.goafanti.patent.bo.PatentInfoDetailBo;
 import com.goafanti.patent.bo.PatentManageListBo;
@@ -558,4 +559,9 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public List<PatentContractListBo> listContractPatentByContractId(String contractId) {
+		return patentInfoMapper.listContractPatentByContractId(contractId);
+	}
+
 }