소스 검색

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 년 전
부모
커밋
74edc5c9d5

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

@@ -636,7 +636,7 @@
 	</if>
   </select>
   <select id="selectByTid"  parameterType="java.lang.Integer" resultType="com.goafanti.organization.bo.outProjectBo">
-     select a.id,a.patent_type patentType,c.`type` projectType
+     select a.id,a.start_type startType,a.patent_type patentType,c.`type` projectType
     from  t_order_task b left join  t_order_outsource a on a.tid=b.id
     left join business_project c on b.commodity_id=c.id
     where b.id = #{tid}

+ 10 - 0
src/main/java/com/goafanti/organization/bo/outProjectBo.java

@@ -7,6 +7,8 @@ public class outProjectBo {
 	private Integer patentType;
 	
 	private Integer projectType;
+	
+	private Integer startType;
 
 	public Integer getId() {
 		return id;
@@ -32,6 +34,14 @@ public class outProjectBo {
 		this.projectType = projectType;
 	}
 
+	public Integer getStartType() {
+		return startType;
+	}
+
+	public void setStartType(Integer startType) {
+		this.startType = startType;
+	}
+
 
 	
 	

+ 8 - 7
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -42,6 +42,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * @param t
 	 * @param calculation 0 其他 1软著 2专利
 	 * @param patentType 专利名称 0实用新型 1发明专利 2外观专利 3 其他
+	 * 			startType  0外包 1供应商  外包全为输入,供应商才分软著和专利从后台选取
 	 * @return
 	 */
 	@RequestMapping(value = "/addCompany" , method = RequestMethod.POST)
@@ -62,12 +63,12 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 //			return res;
 //		}
 		//0 系统 1软著 2专利
-		if (calculation==1) {
-			thirdPartyCompanyService.calculationUnitPrice(t);
-			
-		}else if (calculation==2) {
-			thirdPartyCompanyService.calculationPatentUnitPrice(t,patentType);
-		}
+			if (calculation==1) {
+				thirdPartyCompanyService.calculationUnitPrice(t);
+				
+			}else if (calculation==2) {
+				thirdPartyCompanyService.calculationPatentUnitPrice(t,patentType);
+			}
 		if(calculation!=0&&(t.getUnitPrice()==null||t.getUnitPrice().compareTo(new BigDecimal(0))<1)) {
 			res.getError().add(buildError("后台无此项数据记录,请联系管理员","后台无此项数据记录,请联系管理员"));
 			return res;
@@ -159,7 +160,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	
 	/**
 	 * 模糊查询机构列表
-	 * @param t
+	 * @param type 类型 0软著 1其他 2专利
 	 * @return
 	 */
 	@RequestMapping(value = "/selectVague" , method = RequestMethod.GET)

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

@@ -205,7 +205,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			outProjectBo op =null;
 			if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(tid);
 			//外包type
-			if (op!=null) {
+			if (op!=null && op.getStartType()!=null&&op.getStartType()==1) {
 				for (OutThirdPartyCompany oc : list) {
 					if(op.getProjectType()==null)op.setProjectType(0);
 					if((op.getProjectType()==1&&oc.getType()==1)||(op.getProjectType()==2)) {
@@ -305,7 +305,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		}
 	if (!TokenManager.hasRole(AFTConstants.FINANCE)&&!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
 		outProjectBo ob=tOrderOutsourceMapper.selectByTid(tp.getTid());
-		if (ob!=null) {
+		if (ob!=null &&ob.getStartType()!=null&& ob.getStartType()==1) {
 			if((ob.getProjectType()==1&&ob.getPatentType()==0)||(ob.getProjectType()==2)) {
 				op.setInitialUnitPrice("***");
 				op.setInitialTotalAmount("***");
@@ -407,7 +407,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if (!TokenManager.hasRole(AFTConstants.FINANCE)&&!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
 			outProjectBo op =null;
 			if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(id);
-			if (op!=null) {
+			if (op!=null &&op.getStartType()!=null&&op.getStartType()==1) {
 				if((op.getProjectType()==1&&op.getPatentType()==0)||(op.getProjectType()==2)) {
 					for (outOrderPayment oc : list) {
 						if (oc.getChooseType()!=2) {