anderx 5 years ago
parent
commit
d65e51863d

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

@@ -749,7 +749,7 @@
     <include refid="Base_Column_List" />
     from business_project
     where delete_sign=0 and status=0
-    where bname = #{bname,jdbcType=VARCHAR}
+    and bname = #{bname,jdbcType=VARCHAR}
   </select>
   <select id="getBusinessProject" resultType="com.goafanti.app.bo.ProjectBo">
   	select id,bname as name,min_logo as minLogoUrl,introduce,project_url as projectUrl

+ 5 - 1
src/main/java/com/goafanti/order/enums/NewOrderDunType.java

@@ -32,7 +32,11 @@ public enum NewOrderDunType {
 	ZSCQ_SQ(81,"知识产权-首期"),
 	ZSCQ_GS_SL_XZ(82,"知识产权-公示/专利受理/软著下证"),
 	ZSCQ_XZ(83,"知识产权-专利下证"),
-	INVALID(99,"未知");
+	GX_ZDY(90,"高新-"),
+	GX_SQ(91,"高新-首期"),
+	GX_YGS(92,"高新-已拟公示"),
+	GX_YXZ(93,"高新-已下证"),
+	INVALID(0,"未知");
 	
 	private NewOrderDunType(Integer code, String desc) {
 		this.code = code;

+ 1 - 0
src/main/java/com/goafanti/order/enums/OrderDunProjectType.java

@@ -12,6 +12,7 @@ public enum OrderDunProjectType {
 	HY(6,"会员"),
 	RJKF(7,"软件开发"),
 	ZSCQ(8,"知识产权"),
+	GX(9,"高新"),
 	INVALID(99,"未知");
 	
 	private OrderDunProjectType(Integer code, String desc) {

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1212,7 +1212,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			Admin admin = adminMapper.selectAllByid(string);
 			if(admin!=null&&SendEmailUtil.isEmail(admin.getEmail().trim()))adminIds+=admin.getEmail()+",";
 		}
-		noticeMapper.insertBatch(nlist);
+		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
 		if (!nlist.isEmpty()&&StringUtils.isNotBlank(adminIds)) {
 			adminIds=adminIds.substring(0, adminIds.length()-1);
 			EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"

+ 15 - 8
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -507,21 +507,21 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				boolean flag=false;
 				if((ob.getProjectType()==OrderDunProjectType.CGZH.getCode()&&ob.getDunType()==2&&//成果转化 验收
 						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==2&&//通用 公示
+				else if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==2&&//通用 公示
 						projectStatus==NewProjectStatus.YTJ.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==3&&//通用 下证
+				else if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==3&&//通用 下证
 						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==2&&//科技项目 立项或者公示
+				else if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==2&&//科技项目 立项或者公示
 						projectStatus==NewProjectStatus.YLX.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==3&&//科技项目 拨款
+				else if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==3&&//科技项目 拨款
 						projectStatus==NewProjectStatus.LXYBK.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.KJJR.getCode()&&ob.getDunType()==2&&//科技金融 拨款
+				else if((ob.getProjectType()==OrderDunProjectType.KJJR.getCode()&&ob.getDunType()==2&&//科技金融 拨款
 						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==2&&//软件开发 立项
+				else if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==2&&//软件开发 立项
 						projectStatus==NewProjectStatus.YTJ.getCode()))flag=true;
-				if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==3&&//软件开发 验收
+				else if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==3&&//软件开发 验收
 						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
-				if(ob.getProjectType()==OrderDunProjectType.ZSCQ.getCode()){//知识产权 公示 专利受理、转让(项目已提交),软著下证
+				else if(ob.getProjectType()==OrderDunProjectType.ZSCQ.getCode()){//知识产权 公示 专利受理、转让(项目已提交),软著下证
 					if(ob.getDunType()==3&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 						flag=true;
 					}else if (ob.getDunType()==2) {
@@ -537,6 +537,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						}
 						
 					}
+				}else if(ob.getProjectType()==OrderDunProjectType.GX.getCode()) {
+					if (ob.getDunType()==2&&projectStatus>=NewProjectStatus.YNGS.getCode()
+							&&projectStatus<=NewProjectStatus.YXZ.getCode()) {
+						flag=true;
+					} else if (ob.getDunType()==3&&projectStatus==NewProjectStatus.YXZ.getCode()){
+						flag=true;
+					}
 				} 
 					if(flag) {
 					//如果启动催款,则新增欠款与应收款

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

@@ -50,6 +50,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderOutsourceDtails;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.enums.NewOrderDunType;
+import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.organization.bo.InputNodeList;
 import com.goafanti.organization.bo.InputPaymentList;
 import com.goafanti.organization.bo.InputPaymentNode;
@@ -526,38 +527,48 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if (pn.getDunType()==0&&pn.getPartyTime().getTime()<new Date().getTime()) {//如果自定义则看触发时间
 				return false;
 		}else if (NewOrderDunType.CGZH_WC.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
 			return false;
 		}else if (NewOrderDunType.COMMON_NGS.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()>=NewProjectStatus.YTJ.getCode()&&tt.getProjectStatus()<=NewProjectStatus.YWCXZ.getCode()
+						||tt.getProjectStatus()>=NewProjectStatus.YBH.getCode())) {
 			return false;
 		}else if (NewOrderDunType.COMMON_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
 			return false;
 		} else if (NewOrderDunType.KJXM_LX.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>2&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()>=NewProjectStatus.YLX.getCode()&&tt.getProjectStatus()<=NewProjectStatus.LXYBK.getCode())) {
 			return false;
 		} else if (NewOrderDunType.KJXM_BK.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>8&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()<=NewProjectStatus.LXYBK.getCode())) {
 			return false;
 		} else if (NewOrderDunType.KJJR_BK.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>8&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
 			return false;
 		} else if (NewOrderDunType.RJKF_LX.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>2&&tt.getProjectStatus()<10)) {
+				&&((tt.getProjectStatus()>=NewProjectStatus.YTJ.getCode()&&tt.getProjectStatus()<=NewProjectStatus.YWCXZ.getCode())
+						||tt.getProjectStatus()>=NewProjectStatus.YBH.getCode())) {
 			return false;
 		} else if (NewOrderDunType.RJKF_WZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
 			return false;
 		}  else if (NewOrderDunType.ZSCQ_GS_SL_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())) {
 			// 0 正常 1专利 2软著 3审计 4双软 5高新 6商标
-			if (tt.getBpType()==1&&(tt.getProjectStatus()>7&&tt.getProjectStatus()<10)) {
+			if (tt.getBpType()==1
+					&&(tt.getProjectStatus()==NewProjectStatus.YTJ.getCode()&&tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode()
+						||tt.getProjectStatus()==NewProjectStatus.YBH.getCode())) {
 				return false;
-			}else if (tt.getBpType()!=1&&(tt.getProjectStatus()>3&&tt.getProjectStatus()<10)){
+			}else if (tt.getBpType()!=1&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())){
 				return false;
 			}
 		}  else if (NewOrderDunType.ZSCQ_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
-				&&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
+				&&(tt.getProjectStatus()==NewProjectStatus.YWCXZ.getCode())) {
+			return false;
+		} else if (NewOrderDunType.GX_YGS.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
+				&&(tt.getProjectStatus()>=NewProjectStatus.YNGS.getCode()&&tt.getProjectStatus()<=NewProjectStatus.YXZ.getCode())) {
+			return false;
+		} else if (NewOrderDunType.GX_YXZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
+				&&(tt.getProjectStatus()==NewProjectStatus.YXZ.getCode())) {
 			return false;
 		}