anderx 3 years ago
parent
commit
ed965eefa9

+ 2 - 2
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -67,8 +67,8 @@ public enum NoticeStatus {
 	ITEM_CHECK_END(58,"完成专利核对"),
 	MENBER_DUN(59,"会员催款信息"),
 	MENBER_START(60,"会员项目发起"),
-	MENBER_YES(60,"会员项目通过"),
-	MENBER_NO(60,"会员项目拒绝"),
+	MENBER_YES(61,"会员项目通过"),
+	MENBER_NO(62,"会员项目拒绝"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 3 - 1
src/main/java/com/goafanti/common/enums/NoticeTypes.java

@@ -40,7 +40,9 @@ public enum NoticeTypes {
 				|| i == NoticeStatus.ORDER_YES.getCode() || i == NoticeStatus.ORDER_NO.getCode()
 				|| i == NoticeStatus.ORDER_TASK_TO.getCode() || i == NoticeStatus.PROJECT_OUTSOURCE_START.getCode()
 				|| i == NoticeStatus.PROJECT_OUTSOURCE_YES.getCode() || i == NoticeStatus.PROJECT_OUTSOURCE_NO.getCode()
-				|| i == NoticeStatus.ITEM_CHECK_START.getCode() || i == NoticeStatus.ITEM_CHECK_END.getCode()) {
+				|| i == NoticeStatus.ITEM_CHECK_START.getCode() || i == NoticeStatus.ITEM_CHECK_END.getCode()
+				|| i == NoticeStatus.MENBER_START.getCode() || i == NoticeStatus.MENBER_YES.getCode()
+				|| i == NoticeStatus.MENBER_NO.getCode() ) {
 			return 2;
 		} else if (i == NoticeStatus.CUSTOMER_LOSE30.getCode() || i == NoticeStatus.CUSTOMER_LOSE270.getCode()
 				|| i == NoticeStatus.CUSTOMER_CHENNEL_LOSE.getCode()

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1792,9 +1792,10 @@
     <if test="approval != null and approval ==4">
       and b.approval in (1,2)
     </if>
-    <if test="status != null">
+    <if test="status != null and status !=5">
       and a.process_status = #{status}
     </if>
+    order by a.process_status
     <if test="page_sql!=null">
       ${page_sql}
     </if>
@@ -1856,7 +1857,7 @@
       <if test="approval != null and approval ==4">
         and b.approval in (1,2)
       </if>
-      <if test="status != null">
+      <if test="status != null and status !=5">
         and a.process_status = #{status}
       </if>
   </select>

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

@@ -1231,7 +1231,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 			aid=b.getSalesmanId();
 		}
-		if (admins.size()>0){
+		if (admins!=null&&admins.size()>0){
 			for (Admin admin : admins) {
 				addNotic(type,admin.getId(),sb.toString());
 			}

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

@@ -1114,7 +1114,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				log.setProcess(20);
 				addLog(log,1);
 			}
-				orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType());
+			orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType());
 		}else if (in.getResult()==0){
 			if (in.getType()==0){
 				log.setProcess(21);