Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
7c21477b21

+ 12 - 2
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -38,6 +38,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	/**
 	 * 新增第三方机构
 	 * @param t
+	 * @param calculation 0 其他 1软著 2专利
+	 * @param patentType 专利名称 0实用新型 1发明专利 2外观专利 3 其他
 	 * @return
 	 */
 	@RequestMapping(value = "/addCompany" , method = RequestMethod.POST)
@@ -53,6 +55,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
 			return res;
 		}
+		//0 系统 1软著 2专利
 		if (calculation==1) {
 			thirdPartyCompanyService.calculationUnitPrice(t);
 		}else if (calculation==2) {
@@ -76,7 +79,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/updateCompany" , method = RequestMethod.POST)
-	public Result updateCompany(@Valid ThirdPartyCompany t,BindingResult bindingResult) {
+	public Result updateCompany(@Valid ThirdPartyCompany t,BindingResult bindingResult,
+			Integer calculation,Integer patentType) {
 		Result res =new Result();
 		if (bindingResult.hasErrors()) {
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -91,11 +95,17 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
 			return res;
 		}
+		//0 系统 1软著 2专利
+		if (calculation==1) {
+			thirdPartyCompanyService.calculationUnitPrice(t);
+		}else if (calculation==2) {
+			thirdPartyCompanyService.calculationPatentUnitPrice(t,patentType);
+		}
 		if (!res.getError().isEmpty()) {
             return res;
         }
 		
-		res.data(thirdPartyCompanyService.updateCompany(t));
+		res.data(thirdPartyCompanyService.updateCompany(t,calculation));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -28,7 +28,7 @@ public interface ThirdPartyCompanyService {
 
 	List<CompanyLibrary> selectVague(String name, Integer type);
 
-	int updateCompany(ThirdPartyCompany t);
+	int updateCompany(ThirdPartyCompany t, Integer calculation);
 
 	int addPaymentNode(InputPaymentNode p);
 

+ 15 - 10
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -97,7 +97,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public int addCompany(ThirdPartyCompany t,Integer calculation) {
-		if(calculation==null)calculation=0;
 		if (calculation==0) {//0其他 1计算
 			CompanyLibrary c=new CompanyLibrary();
 			String aid=TokenManager.getAdminId();
@@ -118,14 +117,21 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 
 	@Override
-	public int updateCompany(ThirdPartyCompany t) {
-		SoftWritingPrice s=new SoftWritingPrice();
-		s.setCid(t.getCid());
-		s.setMaterial(t.getMaterial());
-		s.setUrgent(t.getUrgent());
-		List<SoftWritingPrice> list=softWritingPriceMapper.checkSoftWritingPrice(s);
-		for (SoftWritingPrice sw : list) {
-			t.setUnitPrice(sw.getUnitPrice().multiply(new BigDecimal(t.getQuantity())));
+	public int updateCompany(ThirdPartyCompany t,Integer calculation) {
+		if (calculation==0) {//0其他 1计算
+			CompanyLibrary c=new CompanyLibrary();
+			String aid=TokenManager.getAdminId();
+			List<Integer> list=companyLibraryMapper.selectName(t.getCompanyName(),1,aid);
+			if (list.size()<1) {
+				c.setCompanyName(t.getCompanyName());
+				c.setAid(aid);
+				c.setType(1);//0系统 1录入
+				companyLibraryMapper.insertSelectiveGetId(c);
+				t.setCid(c.getId());
+			}else {
+				t.setCid(list.get(0));
+			}
+			t.setTotalAmount(t.getUnitPrice().multiply(new BigDecimal(t.getQuantity())));
 		}
 		return thirdPartyCompanyMapper.updateByPrimaryKeySelective(t);
 	}
@@ -639,7 +645,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public void calculationUnitPrice(ThirdPartyCompany t) {
 		SoftWritingPrice s=new SoftWritingPrice();
-		int i=0;
 		s.setCid(t.getCid());
 		s.setMaterial(t.getMaterial());
 		s.setUrgent(t.getUrgent());