机构画像

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

@@ -30,18 +30,24 @@ public class CmPortrait extends DataEntity<CmPortrait> {
 
     // 订单总量
     private Integer orderTotal;
+    // 当前订单范围总量
+    private Integer orderScopeNum;
     // 订单总金额
     private BigDecimal orderTotalAmount;
     // 订单类型值value  订单类型name
     private ArrayList<OrderPortrait> orderPortrait;
     // 搜索关键词总数
     private Integer totalkeywords;
+    // 当前关键词范围总量
+    private Integer keyWordsScopeNum;
     // 搜索关键词数量
     private ArrayList<Integer> behaviorValue;
     // 搜索关键词
     private ArrayList<String> behaviorType;
     // 咨询记录总数
     private Integer remarksTotal;
+    // 当前咨询记录范围总量
+    private Integer remarksScopeNum;
     // 咨询记录数
     private ArrayList<Integer> remarksValue;
     // 咨询记录关键词
@@ -115,6 +121,14 @@ public class CmPortrait extends DataEntity<CmPortrait> {
         this.orderTotal = orderTotal;
     }
 
+    public Integer getOrderScopeNum() {
+        return orderScopeNum;
+    }
+
+    public void setOrderScopeNum(Integer orderScopeNum) {
+        this.orderScopeNum = orderScopeNum;
+    }
+
     public BigDecimal getOrderTotalAmount() {
         return orderTotalAmount;
     }
@@ -139,6 +153,14 @@ public class CmPortrait extends DataEntity<CmPortrait> {
         this.totalkeywords = totalkeywords;
     }
 
+    public Integer getKeyWordsScopeNum() {
+        return keyWordsScopeNum;
+    }
+
+    public void setKeyWordsScopeNum(Integer keyWordsScopeNum) {
+        this.keyWordsScopeNum = keyWordsScopeNum;
+    }
+
     public ArrayList<Integer> getBehaviorValue() {
         return behaviorValue;
     }
@@ -163,6 +185,14 @@ public class CmPortrait extends DataEntity<CmPortrait> {
         this.remarksTotal = remarksTotal;
     }
 
+    public Integer getRemarksScopeNum() {
+        return remarksScopeNum;
+    }
+
+    public void setRemarksScopeNum(Integer remarksScopeNum) {
+        this.remarksScopeNum = remarksScopeNum;
+    }
+
     public ArrayList<Integer> getRemarksValue() {
         return remarksValue;
     }

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

@@ -113,7 +113,7 @@ public class ClubPortraitService {
             if (cmPortrait.getEndTime().equals(endTime)) {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
-            int ordinary = 0, secondHand = 0, rebate = 0, partialRefund = 0, fullRefund = 0, closed = 0;
+            int ordinary = 0, secondHand = 0, rebate = 0, partialRefund = 0, fullRefund = 0, closed = 0,total = 0;
 
             ArrayList<OrderPortrait> orderPortraits = new ArrayList<>();
             OrderPortrait orderPortrait = new OrderPortrait();
@@ -207,6 +207,9 @@ public class ClubPortraitService {
 
                 cmPortrait.setOrderPortrait(orderPortraits);
             }
+            // 总量
+            total = ordinary + secondHand + rebate + partialRefund + fullRefund + closed;
+            cmPortrait.setOrderScopeNum(total);
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);
             time = calendar.getTime();
@@ -216,10 +219,12 @@ public class ClubPortraitService {
         // 搜索关键词
         if (1 == cmPortrait.getType() || 4 == cmPortrait.getType()) {
             List<CmBehaviorRecord> behaviorRecordList = cmPortraitDao.selBehaviorList(cmPortrait);
+            int keywordsTotal = 0;
             ArrayList<Integer> integers = new ArrayList<>();
             ArrayList<String> strings = new ArrayList<>();
             if (behaviorRecordList.size() != 0) {
                 for (CmBehaviorRecord record : behaviorRecordList) {
+                    keywordsTotal += record.getNumber();
                     integers.add(record.getNumber());
                     if (!ObjectUtils.isEmpty(record.getPageLabel())) {
                         strings.add(record.getPageLabel());
@@ -229,8 +234,10 @@ public class ClubPortraitService {
                     cmPortrait.setTotalkeywords(behaviorRecordList.get(0).getNumbers());
                     cmPortrait.setBehaviorValue(integers);
                     cmPortrait.setBehaviorType(strings);
+
                 }
             }
+            cmPortrait.setKeyWordsScopeNum(keywordsTotal);
         }
         // 咨询记录
         if (2 == cmPortrait.getType() || 4 == cmPortrait.getType()) {
@@ -241,6 +248,7 @@ public class ClubPortraitService {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
             List<CmClubRemarks> remarksList = cmPortraitDao.selRemarksList(cmPortrait);
+            int remarksTotal = 0;
             ArrayList<Integer> integers = new ArrayList<>();
             ArrayList<String> strings = new ArrayList<>();
             ArrayList<String> strRemark = new ArrayList<>();
@@ -263,6 +271,7 @@ public class ClubPortraitService {
                         }
                     }
                     integers.add(number);
+                    remarksTotal += number;
                     if (!ObjectUtils.isEmpty(str)) {
                         strings.add(str);
                     } else {
@@ -290,6 +299,7 @@ public class ClubPortraitService {
                 cmPortrait.setRemarksValue(integers);
                 cmPortrait.setRemarksType(strings);
             }
+            cmPortrait.setRemarksScopeNum(remarksTotal);
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);
             time = calendar.getTime();

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -1142,6 +1142,8 @@ public class AgencyController extends BaseController {
             /**审核处理*/
             //审核通过
             if (StringUtils.equals("1", auditStatus)) {
+                // 审核通过机构为新分配机构
+                newCmClub.setNewDeal(1);
                     sysLog.setActioncontent("审核通过");
                 String Contact = sysLogService.auditlinkMan(Integer.parseInt(id));
                 String ionName = sysLogService.auditName(Integer.parseInt(id));

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

@@ -393,6 +393,9 @@
         <if test="medicalPracticeLicenseImg != null and medicalPracticeLicenseImg != ''">
             medicalPracticeLicenseImg=#{medicalPracticeLicenseImg},
         </if>
+        <if test="newDeal != null and newDeal != ''">
+            newDeal = #{newDeal},
+        </if>
         userID = #{userID}
         WHERE clubID = #{clubID}
     </update>
@@ -706,8 +709,8 @@
     </delete>
 
     <insert id="addRecordLinkage">
-        INSERT INTO `record_link`(`describe`,`link`,clubId)
-        VALUES (#{describe},#{link},#{clubId})
+        INSERT INTO `record_link`(`describe`,`link`,clubId, `addTime`)
+        VALUES (#{describe},#{link},#{clubId},now())
     </insert>
 
 <select id="recordLinkage" resultType="string">

src/main/webapp/WEB-INF/views/modules/userNew/ReportList.jsp

@@ -293,14 +293,14 @@
             <form:input path="endAddTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
-        <div class="item">
+        <%--<div class="item">
             <label>新分配机构：</label>
             <form:select path="newDeal" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="1">是</form:option>
                 <form:option value="2">否</form:option>
             </form:select>
-        </div>
+        </div>--%>
         <div class="item">
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>
@@ -350,7 +350,7 @@
 
             <td>
                 <c:if test="${not empty list.clubName}">
-                    ${list.clubName}<c:if test="${list.newDeal eq 1}"><span style="color: red">(新分配)</span></c:if>
+                    ${list.clubName}<%--<c:if test="${list.newDeal eq 1}"><span style="color: red">(新分配)</span></c:if>--%>
                 </c:if>
                 <c:if test="${empty list.clubName}">
                     -----

src/main/webapp/WEB-INF/views/modules/userNew/cmClubPortrait.jsp

@@ -48,8 +48,12 @@
         <div class="flex-content">
             <div class="flex-box">
                 <div class="box-title">
-                    <span>订单总量:<a class="line" href="${ctx}/order/orderList?buyer=${cmPortrait.clubName}"><c:if test="${!empty portrait.orderTotal}">${portrait.orderTotal}</c:if><c:if test="${empty portrait.orderTotal}">0</c:if> 个</a></span>
-                    <span>购买总额:<a href="javascript: void(0);">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if><c:if test="${empty portrait.orderTotalAmount}">0</c:if></a></span>
+                    <H4 class="H_tag">订单</H4>
+                </div>
+                <div class="box-title">
+                    <span>所有:<a class="line" href="${ctx}/order/orderList?buyer=${cmPortrait.clubName}">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if> <c:if test="${empty portrait.orderTotalAmount}">0</c:if>&nbsp;&nbsp;(<c:if test="${!empty portrait.orderTotal}">${portrait.orderTotal}</c:if><c:if test="${empty portrait.orderTotal}">0</c:if>个)</a></span>
+<%--                    <span>购买总额:<a href="javascript: void(0);">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if><c:if test="${empty portrait.orderTotalAmount}">0</c:if></a></span>--%>
+                    <span class="right_span">当前范围:<a id="orderScopeNum" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="orderTabs">
@@ -71,7 +75,6 @@
                 <div class="box-eachts">
                     <div class="eachts-total">订单数：<span id="orderTotalNum"></span></div>
                     <div class="eachts-data" id="orderEacths" style="">
-                        <!-- orderEacths表 -->
                     </div>
                     <div class="eachts-none" id="orderEacthsNone">
                         <p>暂无数据</p>
@@ -80,7 +83,11 @@
             </div>
             <div class="flex-box">
                 <div class="box-title">
-                    <span>搜索关键词总数:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
+                    <H4 class="H_tag">搜索关键词</H4>
+                </div>
+                <div class="box-title">
+                    <span>所有:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
+                    <span class="right_span">当前范围:<a id="keyWordsScopeNum" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="keyWordTabs">
@@ -112,7 +119,11 @@
         <div class="flex-content">
             <div class="flex-box">
                 <div class="box-title">
-                    <span>咨询记录总数:<a class="line" href="${ctx}/new/user/agency/regist?clubId=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
+                    <H4 class="H_tag">咨询记录</H4>
+                </div>
+                <div class="box-title">
+                    <span>所有:<a class="line" href="${ctx}/new/user/agency/regist?clubId=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
+                    <span class="right_span">当前范围:<a id="remarksScopeNum" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="serviceTabs">
@@ -142,7 +153,7 @@
             </div>
             <div class="flex-box">
                 <div class="box-title">
-                    <span>访问记录</span>
+                    <H4 class="H_tag">访问记录</H4>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="visitTabs">

src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -136,14 +136,14 @@
                         value="${cmClubRemarks.endAddTime}" cssStyle="width: 130px"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
-        <div class="item">
+        <%--<div class="item">
             <label>新分配机构：</label>
             <form:select path="newDeal" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="1">是</form:option>
                 <form:option value="2">否</form:option>
             </form:select>
-        </div>
+        </div>--%>
         <div class="item">
             &nbsp;&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>
@@ -175,7 +175,7 @@
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             机构名称：
                         </div>
-                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.clubName}<c:if test="${clubRemarks.newDeal eq 1}"><span style="color: red">（新分配）</span></c:if></div>
+                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.clubName}<%--<c:if test="${clubRemarks.newDeal eq 1}"><span style="color: red">（新分配）</span></c:if>--%></div>
                         <c:if test="${not empty clubRemarks.clubType}">
                             <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                                 机构类型：

src/main/webapp/static/modules/cmClubPortrait/cmClubEacths.js

@@ -156,6 +156,7 @@ const  getClubEacthsData = function (type,dateType) {
                             $('.eachts-total').hide();
                             $('#orderTimeEnd').val(data.portrait.endTime);
                             $('#orderTimeStart').val(data.portrait.startTime);
+                            $('#orderScopeNum').text('0(个)');
                         }else{
                             setOrderData(type,data)
                         }
@@ -166,6 +167,7 @@ const  getClubEacthsData = function (type,dateType) {
                             $('#keyWordsEacths').hide();
                             $('#keyWordsTimeEnd').val(data.portrait.endTime);
                             $('#keyWordsTimeStart').val(data.portrait.startTime);
+                            $('#keyWordsScopeNum').text(`0(个)`);
                         }else{
                             setOtherData(type,data)
                         }
@@ -176,6 +178,7 @@ const  getClubEacthsData = function (type,dateType) {
                             $('#serviceEacths').hide();
                             $('#serviceTimeEnd').val(data.portrait.endTime);
                             $('#serviceTimeStart').val(data.portrait.startTime);
+                            $('#remarksScopeNum').text(`0(个)`);
                         }else{
                             setOtherData(type,data)
                         }
@@ -210,6 +213,7 @@ const  setOrderData = function (type,data) {
                 $('#orderTimeEnd').val(data.order.endTime);
                 $('#orderTimeStart').val(data.order.startTime);
                 $('#orderTotalNum').text(`${data.order.orderTotalNum}个`);
+                $('#orderScopeNum').text(`${data.portrait.orderScopeNum}(个)`);
             },
             id:'orderEacths',
             series:{
@@ -275,6 +279,7 @@ const setOtherData = function (type,data) {
                 $('#keyWordsEacthsNone').hide();
                 $('#keyWordsTimeEnd').val(data.behavior.endTime);
                 $('#keyWordsTimeStart').val(data.behavior.startTime);
+                $('#keyWordsScopeNum').text(`${data.portrait.keyWordsScopeNum}(个)`);
             },
             id:'keyWordsEacths',
             series:{
@@ -299,6 +304,7 @@ const setOtherData = function (type,data) {
                 $('#serviceEacthsNone').hide();
                 $('#serviceTimeEnd').val(data.remarks.endTime);
                 $('#serviceTimeStart').val(data.remarks.startTime);
+                $('#remarksScopeNum').text(`${data.portrait.remarksScopeNum}(个)`);
             },
             id:'serviceEacths',
             series:{

src/main/webapp/static/modules/cmClubPortrait/cmClubPortrait.css

@@ -164,6 +164,13 @@
     display: inline-block;
     float: left;
 }
+.H_tag {
+    color: #FFFFFF;
+}
+.right_span {
+    width: 300px;
+    float: right;
+}
 .flex-box .box-eachts{
     width: 100%;
     height: 316px;