咨询记录优化

src/main/java/com/caimei/modules/user/entity/OperationalLogs.java

@@ -18,6 +18,7 @@ public class OperationalLogs extends DataEntity<OperationalLogs> {
   private String endTime;        //添加时间结束  查询条件
   private String spName;        //协销名称
   private String createTime;    //创建时间
+  private Integer isOneself;    //是否是自主注册 0 自主注册 1 协销拉机构上线 2 数据初始 3 分配协销
 
   private String year;
   private ArrayList actioncontents; //跟换协销记录
@@ -120,4 +121,12 @@ public class OperationalLogs extends DataEntity<OperationalLogs> {
   public void setActioncontents(ArrayList actioncontents) {
     this.actioncontents = actioncontents;
   }
+
+  public Integer getIsOneself() {
+    return isOneself;
+  }
+
+  public void setIsOneself(Integer isOneself) {
+    this.isOneself = isOneself;
+  }
 }

src/main/java/com/caimei/modules/user/service/SysLogService.java

@@ -117,10 +117,14 @@ public class SysLogService extends CrudService<OperationsDao, OperationalLogs> {
                             String[] splitStent = logsList.get(i).getCreateTime().split(" ");
                             String newYear = splitStent[0].trim();
                             if (newYear.equals(year)) {
-                                if ( i == 0) {
-                                    count = "目前协销为【" + logsList.get(i).getSpName() + "】";
-                                } else if (logsList.size() == 1 || i == logsList.size() - 1) {
-                                    count = "系统自动分配协销为【" + logsList.get(i).getSpName() + "】";
+                                if (i == logsList.size() - 1) {
+                                    if ( 0 == logsList.get(i).getIsOneself()) {
+                                        count = "机构自主注册，协销为【" + logsList.get(i).getSpName() + "】" + ",操作人为【" + logsList.get(i).getOperator() + "】，变更时间点【" + time + "】";
+                                    } else if (1 == logsList.get(i).getIsOneself()) {
+                                        count = "协销拉机构上线，协销为【" + logsList.get(i).getSpName() + "】" + ",操作人为【" + logsList.get(i).getOperator() + "】，变更时间点【" + time + "】";
+                                    } else {
+                                        count = "目前协销为【" + logsList.get(i).getSpName() + "】";
+                                    }
                                 } else {
                                     count = "协销变更为【" + logsList.get(i).getSpName() + "】" + ",操作人为【" + logsList.get(i).getOperator() + "】，变更时间点【" + time + "】";
                                 }

src/main/resources/mappings/modules/user/OperationalLogsMapper.xml

@@ -112,6 +112,7 @@
             cpr.id as providerId,
             cpr.clubId,
             cpr.operator,
+            cpr.isOneself,
             cpr.createTime,
             CASE sp.status WHEN 91 THEN '采美默认协销经理(官方账号)' ELSE sp.linkMan END AS "spName"
         FROM cm_provider_record cpr
@@ -120,8 +121,8 @@
         order by createTime desc
     </select>
     <insert id="inProvider">
-        insert into cm_provider_record (spId, clubId, operator, createTime)
-        values (#{spId}, #{clubId}, #{operator}, now())
+        insert into cm_provider_record (spId, clubId, operator, isOneself, createTime)
+        values (#{spId}, #{clubId}, #{operator}, 3, now())
     </insert>
     <select id="clubData" resultType="com.caimei.modules.user.entity.NewCmClub">
         select clubID, name, linkMan, contractMobile, addTime from club where clubID = #{clubID}