Explorar el Código

Merge branch 'test' of jishutao/kede-server into prod

anderx hace 10 meses
padre
commit
3aee67b5c6

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

@@ -175,7 +175,7 @@
     <select id="selectByOrderNo"  resultMap="BaseResultMap">
       select a.order_no ,b.id ,b.tid ,b.service_life ,b.service_year ,b.year_sum ,b.create_time ,b.contract_term ,b.status
       from t_order_task a inner join t_task_member b on a.id=b.tid
-      where order_no = #{orderNo}
+      where a.split_status =2 and order_no = #{orderNo}
     </select>
 
     <update id="updateServiceYearBySplitSuper">

+ 2 - 4
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -88,12 +88,10 @@ public class AsyncUtils {
 			for (EmailBo emailBo : list) {
 					SendEmailUtil.getInstance().patentSend(emailBo);
 			}
-		} catch (MessagingException e) {
-			e.printStackTrace();
-		} catch (UnsupportedEncodingException e) {
+		} catch (MessagingException | UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
-	}
+    }
 
 	public void sendList(List<EmailBo> list) {
 		try {

+ 10 - 4
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -589,10 +589,16 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 					userName=patentNew.getHolders();
 				}
 				BigDecimal amout = patentNew.getPatentAmount().multiply(new BigDecimal(10000));
-				EmailBo emailBo = new EmailBo("专利提醒", patentNew.getEmail().trim(), userName, "科德集团", a.getName(),
-						patentNew.getName(), patentNew.getPatentNo(), amout.stripTrailingZeros().toPlainString(),
-						patentNew.getEndDate());
-				list.add(emailBo);
+				String emailList = patentNew.getEmail();
+				if (StringUtils.isNotEmpty(emailList)){
+					String[] split = emailList.split(",");
+					for (String email : split) {
+						EmailBo emailBo = new EmailBo("专利提醒", email, userName, "科德集团", a.getName(),
+								patentNew.getName(), patentNew.getPatentNo(), amout.stripTrailingZeros().toPlainString(),
+								patentNew.getEndDate());
+						list.add(emailBo);
+					}
+				}
 			}
 				asyncUtils.patentSend(list);
 		}