修改商机、线索、拜访计划

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/VisitPlanController.java

@@ -44,7 +44,7 @@ public class VisitPlanController {
             @RequestParam("visitTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")Date visitTime,
             @RequestParam("remark") String remark,
             @RequestParam("remindType") Integer remindType,
-            @RequestParam(value = "remindTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date remindTime,
+            @RequestParam(value = "remindTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")Date remindTime,
             HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         VisitPlan visitPlan = new VisitPlan();

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/time/VisitPlanTask.java

@@ -11,7 +11,6 @@ import com.management.platform.service.impl.WxCorpInfoServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -36,7 +35,7 @@ public class VisitPlanTask {
     @Resource
     private UserMapper userMapper ;
 
-    @Scheduled(cron = "0 0/1 * * * *")
+//    @Scheduled(cron = "0 0/1 * * * *")
     public void checkRemindMessage() {
         Date now = new Date();
         System.out.println("===开始检查该分钟需提醒的访客计划==="+now);

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessOpportunityMapper.xml

@@ -318,7 +318,7 @@
         (select custom_name from custom where id = customer_id) customerName,
         (select `name` from contacts where id = contacts_id) contactsName,
         (select `name` from `user` where id = incharger_id) inchargerName,
-        (select `name` from `user` where id = creator_id) creatorName
+        (select `name` from `user` where id = creator_id) creatorName,need_pin,pin_time
         from business_opportunity
         where company_id = #{companyId}
         and is_delete = #{isDelete}
@@ -357,7 +357,7 @@
         (select custom_name from custom where id = customer_id) customerName,
         (select `name` from contacts where id = contacts_id) contactsName,
         (select `name` from `user` where id = incharger_id) inchargerName,
-        (select `name` from `user` where id = creator_id) creatorName
+        (select `name` from `user` where id = creator_id) creatorName,need_pin,pin_time
         from business_opportunity
         where company_id = #{bo.companyId}
         and is_delete = #{bo.isDelete}
@@ -398,7 +398,7 @@
         (select custom_name from custom where id = customer_id) customerName,
         (select `name` from contacts where id = contacts_id) contactsName,
         (select `name` from `user` where id = incharger_id) inchargerName,
-        (select `name` from `user` where id = creator_id) creatorName
+        (select `name` from `user` where id = creator_id) creatorName,need_pin,pin_time
         from business_opportunity
         where company_id = #{bo.companyId}
         and is_delete = #{bo.isDelete}

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/ClueMapper.xml

@@ -407,7 +407,7 @@
         c.plate4,
         c.plate5,
         c.create_time,
-        c.create_id,
+        c.create_id,c.need_pin,c.pin_time,
         (select company_name from company where c.company_id = id) companyName,
         (select name from `user` where id = c.incharger_id) inchargerName,
         (select name from `user` where id = c.create_id) createName,
@@ -479,7 +479,7 @@
         c.plate4,
         c.plate5,
         c.create_time,
-        c.create_id,
+        c.create_id,c.need_pin,c.pin_time,
         (select name from `user` where id = c.incharger_id) inchargerName,
         (select name from `user` where id = c.create_id) createName,
         (select name from sys_dict where c.clue_source_id = id and code = 'ClueSources') clueSourceValue,
@@ -553,7 +553,7 @@
         c.plate4,
         c.plate5,
         c.create_time,
-        c.create_id,
+        c.create_id,c.need_pin,c.pin_time,
         (select name from `user` where id = c.incharger_id) inchargerName,
         (select name from `user` where id = c.create_id) createName,
         (select name from sys_dict where c.clue_source_id = id and code = 'ClueSources') clueSourceValue,

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/CustomMapper.xml

@@ -406,7 +406,7 @@
         (select `name` from `user` where id = incharger_id) inchargerName,
         c.creator_id,
         c.create_time,
-        (select `name` from `user` where id = creator_id) creatorName
+        (select `name` from `user` where id = creator_id) creatorName,c.need_pin,c.pin_time
         from custom c
         left join sys_dict sd on c.customer_level_id = sd.id
         where c.company_id = #{companyId}
@@ -474,7 +474,7 @@
         (select `name` from `user` where id = incharger_id) inchargerName,
         c.creator_id,
         c.create_time,
-        (select `name` from `user` where id = creator_id) creatorName
+        (select `name` from `user` where id = creator_id) creatorName,c.need_pin,c.pin_time
         from custom c
         left join sys_dict sd on c.customer_level_id = sd.id
         where
@@ -547,7 +547,7 @@
         incharger_id,
         (select `name` from `user` where id = incharger_id) inchargerName,
         creator_id,
-        (select `name` from `user` where id = creator_id) creatorName
+        (select `name` from `user` where id = creator_id) creatorName,c.need_pin,c.pin_time
         from custom
         where company_id = #{companyId}
         and is_delete =#{isDelete}
@@ -577,7 +577,7 @@
         <if test="customerIndustryId != null ">
             and customer_industry_id = #{customerIndustryId}
         </if>
-        ORDER BY need_pin desc,pin_time desc.id desc
+        ORDER BY need_pin desc,pin_time desc,id desc
         <if test="pageFrom != null ">
             Limit #{pageIndex},#{pageFrom}
         </if>