修改查询语句,发送信息加上打印日志

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/PlanMapper.java

@@ -24,6 +24,6 @@ public interface PlanMapper extends BaseMapper<Plan> {
     void setToNormalState(Integer id);
 
     @Select("SELECT plan_id,prod_procedure_id FROM plan_procedure_total \n" +
-            "LEFT JOIN prod_procedure ON plan_procedure_total.`prod_procedure_id` = prod_procedure.`id` WHERE  prod_procedure.name like #{name}")
+            "LEFT JOIN prod_procedure ON plan_procedure_total.`prod_procedure_id` = prod_procedure.`id` WHERE  prod_procedure.name like CONCAT('%', #{name}, '%')")
     List<PlanProcedureTotal> findPlanByProcedureName(String name);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java

@@ -451,9 +451,10 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     if (plan.getEndDate()!=null){
                         dates+=plan.getEndDate().format(DateTimeFormatter.BASIC_ISO_DATE);
                     }
-                    StringBuilder builder = new StringBuilder(mobUrl)
-                            .append("/#/distribution");
-                    builder.append("?id=").append(plan.getId())
+                    //http://mobworkshop.njlew.com.cn:16080
+                    StringBuilder builder = new StringBuilder(mobUrl);
+                    builder.append("/#/distribution")
+                            .append("?id=").append(plan.getId())
                             .append("&departmentId=").append(plan.getStationId())
                             .append("&titleText=")
                             .append(URLEncoder.encode("今日计划", "UTF-8"))
@@ -466,10 +467,14 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         builder.append("&productName=").append(URLEncoder.encode(plan.getProductName(), "UTF-8"));
                     }
                     String urlStr =builder.toString();
-
-                    jumpUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+corpInfo.getCorpid()+"&redirect_uri="+ urlStr +"&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
+                    String encodedRedirectUri = URLEncoder.encode(urlStr, "UTF-8");
+                    log.info("urlStr==>"+urlStr);
+                    log.info("encodedRedirectUri==>"+encodedRedirectUri);
+                    jumpUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+corpInfo.getCorpid()+"&redirect_uri="+ encodedRedirectUri +"&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
+                    log.info("jumpUrl==>"+jumpUrl);
                 }
-            } else if ("plan/tomorrow".equals(pageRouter)) {
+            }
+            else if ("plan/tomorrow".equals(pageRouter)) {
                 //费用报销
                 title = "收到新的明日计划";
                 if (plan!=null){
@@ -496,7 +501,11 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         builder.append("&productName=").append(URLEncoder.encode(plan.getProductName(), "UTF-8"));
                     }
                     String urlStr =builder.toString();
-                    jumpUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+corpInfo.getCorpid()+"&redirect_uri="+ urlStr +"&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
+                    String encodedRedirectUri = URLEncoder.encode(urlStr, "UTF-8");
+                    log.info("urlStr==>"+urlStr);
+                    log.info("encodedRedirectUri==>"+encodedRedirectUri);
+                    jumpUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+corpInfo.getCorpid()+"&redirect_uri="+ encodedRedirectUri +"&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect";
+                    log.info("jumpUrl==>"+jumpUrl);
                 }
             }
             else if ("plan/orderInsert".equals(pageRouter)) {