Головна сторінка Огляд Довідка
Увійти
caimei365
/
caimei365-manager
3
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

协销更换记录

huangzhiguo 2 роки тому
батько
10064caf87
коміт
b9ea441525
5 змінених файлів з 36 додано та 10 видалено
Об'єднаний вигляд Показати статистику Diff
  1. 2 0
      src/main/java/com/caimei/modules/user/dao/OperationsDao.java
  2. 4 0
      src/main/java/com/caimei/modules/user/service/SysLogService.java
  3. 2 2
      src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java
  4. 3 0
      src/main/resources/mappings/modules/user/OperationalLogsMapper.xml
  5. 25 8
      src/main/webapp/WEB-INF/views/modules/userNew/cmSpProviderLogs.jsp

+ 2 - 0
src/main/java/com/caimei/modules/user/dao/OperationsDao.java
Переглянути файл 

@@ -35,5 +35,7 @@ public interface OperationsDao extends CrudDao<OperationalLogs> {
 
    List<OperationalLogs> selOperationals(Integer clubID);
 
    List<OperationalLogs> selOperationals(Integer clubID);
 
 
 
    void inProvider(@Param("spId") Integer spId, @Param("clubId") Integer clubId, @Param("operator") String operator);
 
    void inProvider(@Param("spId") Integer spId, @Param("clubId") Integer clubId, @Param("operator") String operator);
 
+
 
+   NewCmClub clubData(Integer clubID);
 
 }
 
 }

+ 4 - 0
src/main/java/com/caimei/modules/user/service/SysLogService.java
Переглянути файл 

@@ -91,6 +91,10 @@ public class SysLogService extends CrudService<OperationsDao, OperationalLogs> {
 
         return operationDao.insert(operationalLogs);
 
         return operationDao.insert(operationalLogs);
 
     }
 
     }
 
 
 
+    public NewCmClub clubData(Integer clubID) {
 
+        return operationDao.clubData(clubID);
 
+    }
 
+
 
     public Page<OperationalLogs> spListLog(Page<OperationalLogs> page, Integer clubID) {
 
     public Page<OperationalLogs> spListLog(Page<OperationalLogs> page, Integer clubID) {
 
         List<OperationalLogs> logsList = operationDao.selOperationals(clubID);
 
         List<OperationalLogs> logsList = operationDao.selOperationals(clubID);

+ 2 - 2
src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java
Переглянути файл 

@@ -1853,10 +1853,10 @@ public class AgencyController extends BaseController {
 
 
 
     @RequestMapping("/spLogs")
 
     @RequestMapping("/spLogs")
 
     public String spListLog(NewCmClub cmClub, Model model, HttpServletRequest request, HttpServletResponse response) {
 
     public String spListLog(NewCmClub cmClub, Model model, HttpServletRequest request, HttpServletResponse response) {
 
-
 
+        NewCmClub club = sysLogService.clubData(cmClub.getClubID());
 
         Page<OperationalLogs> listLog = sysLogService.spListLog(new Page<OperationalLogs>(request, response), cmClub.getClubID());
 
         Page<OperationalLogs> listLog = sysLogService.spListLog(new Page<OperationalLogs>(request, response), cmClub.getClubID());
 
         model.addAttribute("page", listLog);
 
         model.addAttribute("page", listLog);
 
-        model.addAttribute("cmClub", cmClub);
 
+        model.addAttribute("cmClub", club);
 
         return "modules/userNew/cmSpProviderLogs";
 
         return "modules/userNew/cmSpProviderLogs";
 
     }
 
     }
 
 }
 
 }

+ 3 - 0
src/main/resources/mappings/modules/user/OperationalLogsMapper.xml
Переглянути файл 

@@ -123,4 +123,7 @@
 
         insert into cm_provider_record (spId, clubId, operator, createTime)
 
         insert into cm_provider_record (spId, clubId, operator, createTime)
 
         values (#{spId}, #{clubId}, #{operator}, now())
 
         values (#{spId}, #{clubId}, #{operator}, now())
 
     </insert>
 
     </insert>
 
+    <select id="clubData" resultType="com.caimei.modules.user.entity.NewCmClub">
 
+        select clubID, name, linkMan, contractMobile, addTime from club where clubID = #{clubID}
 
+    </select>
 
 </mapper>
 
 </mapper>

+ 25 - 8
src/main/webapp/WEB-INF/views/modules/userNew/cmSpProviderLogs.jsp
Переглянути файл 

@@ -4,23 +4,39 @@
 
 <head>
 
 <head>
 
     <title>协销更换记录</title>
 
     <title>协销更换记录</title>
 
     <meta name="decorator" content="default"/>
 
     <meta name="decorator" content="default"/>
 
-    <style></style>
 
+    <style>
 
+        .handel_data {
 
+            line-height: 50px;
 
+            font-size: 15px;
 
+            margin-left: 10%;
 
+        }
 
+        .table_deli{
 
+            margin-top: 5px;
 
+            border: #0d0d0d 1px solid;
 
+        }
 
+    </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <ul class="nav nav-tabs">
 
 <ul class="nav nav-tabs">
 
     <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
 
     <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
 
     <li class="active"><a href="${ctx}/new/user/agency/spLogs?clubID=${cmClub.clubID}">协销更换记录</a></li>
 
     <li class="active"><a href="${ctx}/new/user/agency/spLogs?clubID=${cmClub.clubID}">协销更换记录</a></li>
 
 </ul>
 
 </ul>
 
-
 
+<div style="height: 50px; background: #f5f5f5;">
 
+    <span class="handel_data">机构名称:${cmClub.name}</span>
 
+    <span class="handel_data">联系人:${cmClub.linkMan}</span>
 
+    <span class="handel_data">手机号:${cmClub.contractMobile}</span>
 
+    <span class="handel_data">注册时间:${cmClub.addTime}</span>
 
+</div>
 
 <sys:message content="${message}"/>
 
 <sys:message content="${message}"/>
 
-<table id="contentTable" class="table table-striped table-bordered table-condensed">
 
-    <thead>
 
+<div class="table_deli">
 
+    <table id="contentTable" class="table table-striped table-bordered table-condensed">
 
+        <thead>
 
         <tr>
 
         <tr>
 
             <th>日期</th>
 
             <th>日期</th>
 
             <th>更换记录</th>
 
             <th>更换记录</th>
 
         </tr>
 
         </tr>
 
-    </thead>
 
-    <tbody>
 
+        </thead>
 
+        <tbody>
 
         <c:forEach items="${page.list}" var="logs">
 
         <c:forEach items="${page.list}" var="logs">
 
             <c:if test="${!empty logs.actioncontents}">
 
             <c:if test="${!empty logs.actioncontents}">
 
                 <tr>
 
                 <tr>
 
@@ -33,8 +49,9 @@
 
                 </tr>
 
                 </tr>
 
             </c:if>
 
             </c:if>
 
         </c:forEach>
 
         </c:forEach>
 
-    </tbody>
 
-</table>
 
+        </tbody>
 
+    </table>
 
+</div>
 
 
 
 </body>
 
 </body>
 
 </html>
 
 </html>