|
|
@@ -36,10 +36,10 @@ import com.goafanti.organization.service.ThirdPartyCompanyService;
|
|
|
@RestController
|
|
|
@RequestMapping("/api/admin/company")
|
|
|
public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
-
|
|
|
+
|
|
|
@Resource
|
|
|
private ThirdPartyCompanyService thirdPartyCompanyService;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增第三方机构
|
|
|
* @param t
|
|
|
@@ -65,7 +65,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
}
|
|
|
if (calculation==1) {
|
|
|
thirdPartyCompanyService.calculationUnitPrice(t);
|
|
|
-
|
|
|
+
|
|
|
}else if (calculation==2) {
|
|
|
thirdPartyCompanyService.calculationPatentUnitPrice(t);
|
|
|
}
|
|
|
@@ -83,8 +83,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.addCompany(t,calculation,type));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 修改第三方机构
|
|
|
* @param t
|
|
|
@@ -119,7 +119,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.updateCompany(t,calculation));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除第三方机构
|
|
|
* @param t
|
|
|
@@ -150,8 +150,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectCompany(tid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 模糊查询机构列表
|
|
|
* @param type 类型 0软著 1其他 2专利
|
|
|
@@ -163,7 +163,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectVague(name,type));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增付款节点
|
|
|
* @param t
|
|
|
@@ -191,7 +191,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.addPaymentNode(p));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除付款节点
|
|
|
* @param t
|
|
|
@@ -216,7 +216,6 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
public Result updatePaymentNode(@Valid InputPaymentNode p,BindingResult bindingResult) {
|
|
|
Result res =new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
- System.out.println(ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField()));
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
@@ -239,7 +238,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.updatePaymentNode(p));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 付款节点列表
|
|
|
* @param t
|
|
|
@@ -255,7 +254,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectPaymentNode(tid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增付款
|
|
|
* @param t
|
|
|
@@ -315,7 +314,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.updateOrderPayment(p));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 付款详情
|
|
|
* @param t
|
|
|
@@ -331,7 +330,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.OrderPaymentDetails(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 付款列表
|
|
|
* @param t
|
|
|
@@ -347,7 +346,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectOrderPayment(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 付款日志
|
|
|
* @param t
|
|
|
@@ -387,7 +386,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.addfinancialPayment(f));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除财务付款
|
|
|
* @param t
|
|
|
@@ -418,7 +417,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectfinancialPayment(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 付款列表
|
|
|
* @param t
|
|
|
@@ -430,7 +429,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectPaymentList(i));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 节点应收款列表
|
|
|
* @param t
|
|
|
@@ -442,7 +441,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.selectPaymentList(i));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增软著价格表
|
|
|
* @param t
|
|
|
@@ -463,7 +462,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.insertSoftWritingPrice(s));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 修改软著价格表
|
|
|
@@ -517,7 +516,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.deleteSoftWritingPrice(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 批量确认付款
|
|
|
* @param t
|
|
|
@@ -533,7 +532,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.updateGroupPayment(ids));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增官费信息
|
|
|
* @param t
|
|
|
@@ -553,7 +552,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.addOfficialFeePrice(o));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 修改官费信息
|
|
|
@@ -591,12 +590,12 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
res.data(thirdPartyCompanyService.deleteOfficialFeePrice(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 官费列表
|
|
|
* @param t
|
|
|
@@ -608,9 +607,9 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.listOfficialFeePrice(type,patentType, pageSize, pageNo));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 新增专利信息
|
|
|
* @param t
|
|
|
@@ -627,7 +626,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.addpatentPrice(p));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 修改专利信息
|
|
|
@@ -646,7 +645,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
return res;
|
|
|
}
|
|
|
if(p.getCompanyName()!=null)p.setCid(thirdPartyCompanyService.pushSelectByCid(p.getCompanyName(),2));
|
|
|
-
|
|
|
+
|
|
|
res.data(thirdPartyCompanyService.updatepatentPrice(p));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -662,12 +661,12 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
res.data(thirdPartyCompanyService.deletepatentPrice(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 专利列表
|
|
|
* @param t
|
|
|
@@ -679,22 +678,22 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.listpatentPrice(name));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 导出付款审核表
|
|
|
* @throws IOException
|
|
|
- * type 0财务 1专利管理员
|
|
|
+ * type 0财务 1专利管理员
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportPaymentList", method = RequestMethod.GET)
|
|
|
public Result exportPaymentList2(HttpServletResponse response,InputPaymentList ip,Integer type){
|
|
|
return thirdPartyCompanyService.exportPaymentList(response,ip,type);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 审核
|
|
|
- *
|
|
|
+ *
|
|
|
*/
|
|
|
@RequestMapping(value = "/paymentExamine", method = RequestMethod.POST)
|
|
|
public Result paymentExamine(PaymentLog in,String pids){
|
|
|
@@ -704,9 +703,9 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
}
|
|
|
res.data(thirdPartyCompanyService.pushPaymentExamine(in,pids));
|
|
|
return res;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 查询第三方是否发起
|
|
|
@@ -721,7 +720,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.checkThirdParty(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询第三方是否发起
|
|
|
* type 0检查 1删除
|
|
|
@@ -736,7 +735,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.updateCheck(id,type));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询第三方是否发起
|
|
|
*/
|
|
|
@@ -750,5 +749,5 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
|
|
|
res.data(thirdPartyCompanyService.checkNode(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|