订单未及时评审提醒优化

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductionOrderDao.java

@@ -32,7 +32,7 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
 
     @Select("select o.ID,o.ORDERNO,o.CREATEUSERID,o.CREATEUSERNAME,u.EMAIL as MODIFYUSERNAME from aps_production_order o\n" +
             "left join sys_user u on o.CREATEUSERID=u.ID and u.DELETED='0'\n" +
-            "where o.DELETED='0' and (o.AUDITSTATUS='待计划评审' or o.AUDITSTATUS='待技术评审')\n" +
+            "where o.DELETED='0' and IFNULL(o.ORDERNO,'')!='' and (o.AUDITSTATUS='待计划评审' or o.AUDITSTATUS='待技术评审')\n" +
             "\tand ((IFNULL(o.CHANGEDATE,'')='' and TIMESTAMPDIFF(HOUR,o.ORDERDATE,NOW())>48) or (IFNULL(o.CHANGEDATE,'')!='' and TIMESTAMPDIFF(HOUR,o.CHANGEDATE,NOW())>48))")
     List<ApsProductionOrderDo> getOrderOuttimeAudit();
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -23,6 +23,7 @@ import com.rongwei.bsentity.vo.ProductDetailIdAndPlanOutPutRollCountAllVo;
 import com.rongwei.bsentity.vo.ProductTypeIdAndPidVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.MailDo;
 import com.rongwei.safecommon.fegin.CXCommonFeginClient;
 import com.rongwei.safecommon.utils.CXCommonUtils;
@@ -304,13 +305,15 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             CXCommonUtils.sendNotify(ORDEROUTTIMEAUDIT_TITLE, String.format(ORDEROUTTIME_AUDIT_CONTENT, apsProductionOrderDo.getOrderno()), null, Arrays.asList(apsProductionOrderDo.getCreateuserid().split(",")), apsProductionOrderDo.getId(), ORDEROUTTIME_AUDIT, false);
 
             //邮件提醒
-            MailDo mailDo = new MailDo();
-            mailDo.setReceiveEmail(apsProductionOrderDo.getModifyusername().split(","));
-            mailDo.setNeedTransReceive(false);
-            mailDo.setCcEmail(new String[]{});
-            mailDo.setSubject(ORDEROUTTIMEAUDIT_TITLE);
-            mailDo.setContent(String.format(ORDEROUTTIME_AUDIT_CONTENT, apsProductionOrderDo.getOrderno()));
-            autoCommonFeginClient.sendHtmlMail(mailDo);
+            if(StringUtils.isNotEmpty(apsProductionOrderDo.getModifyusername())){
+                MailDo mailDo = new MailDo();
+                mailDo.setReceiveEmail(apsProductionOrderDo.getModifyusername().split(","));
+                mailDo.setNeedTransReceive(false);
+                mailDo.setCcEmail(new String[]{});
+                mailDo.setSubject(ORDEROUTTIMEAUDIT_TITLE);
+                mailDo.setContent(String.format(ORDEROUTTIME_AUDIT_CONTENT, apsProductionOrderDo.getOrderno()));
+                autoCommonFeginClient.sendHtmlMail(mailDo);
+            }
         }
     }