|
@@ -30,6 +30,7 @@ import com.goafanti.contract.bo.InputContract;
|
|
|
import com.goafanti.contract.bo.InputSaveContract;
|
|
import com.goafanti.contract.bo.InputSaveContract;
|
|
|
import com.goafanti.contract.service.ContractLogService;
|
|
import com.goafanti.contract.service.ContractLogService;
|
|
|
import com.goafanti.contract.service.ContractService;
|
|
import com.goafanti.contract.service.ContractService;
|
|
|
|
|
+import com.goafanti.patent.service.PatentInfoService;
|
|
|
import com.goafanti.user.service.UserService;
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
@@ -45,7 +46,23 @@ public class AdminContractApiController extends CertifyApiController {
|
|
|
private OrgCognizanceService orgCognizanceService;
|
|
private OrgCognizanceService orgCognizanceService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private AdminService adminService;
|
|
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));
|
|
res.setData(contractService.selectContractDetail(id));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 合同流转日志
|
|
* 合同流转日志
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/log", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/log", method = RequestMethod.GET)
|
|
|
- public Result log(String cid){
|
|
|
|
|
|
|
+ public Result log(String cid) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (StringUtils.isBlank(cid)) {
|
|
if (StringUtils.isBlank(cid)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
|