协销小组/生成链接bug

src/main/java/com/caimei/modules/serviceteam/dao/CmServiceteamRoleDao.java

@@ -29,4 +29,6 @@ public interface CmServiceteamRoleDao extends CrudDao<CmServiceteamRole> {
     void saveGroup(@Param("teamId")String teamId,@Param("i") String i);
 
     CmServiceteamRole findLeader(String teamId);
+
+    void updateLeadr(CmServiceteamRole cmServiceteamRole);
 }

src/main/java/com/caimei/modules/serviceteam/service/CmServiceteamRoleService.java

@@ -78,10 +78,12 @@ public class CmServiceteamRoleService extends CrudService<CmServiceteamRoleDao,
     @Transactional(readOnly = false)
     public void saveGroup(List<String> ids, CmServiceteamRole cmServiceteamRole) {
         if (null != cmServiceteamRole.getTeamId()) {
-            //如果小组存在，先删原小组，再保存
-            delete(cmServiceteamRole);
+            //如果小组存在，先修改原小组组长，删除组员，再保存现小组组员
+            //修改组长id，不修改小组创建时间影响排序
+            dao.updateLeadr(cmServiceteamRole);
+            //删组员
+            dao.deleteAll(cmServiceteamRole.getTeamId());
         }
-        dao.save(cmServiceteamRole);
-        ids.forEach(i->dao.saveGroup(cmServiceteamRole.getId(),i));
+        ids.forEach(i->dao.saveGroup(cmServiceteamRole.getTeamId(),i));
     }
 }

src/main/java/com/caimei/modules/user/dao/CmSpDao.java

@@ -34,4 +34,5 @@ public interface CmSpDao extends CrudDao<NewCmSp> {
 
     void deleteManager();
 
+    NewCmSp findManagerInfo();
 }

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

@@ -70,4 +70,7 @@ public class CmSpService extends CrudService<CmSpDao, NewCmSp> {
 		cmSpDao.choseManager(serviceProviderID);
 	}
 
+	public NewCmSp findSpManagerInfo() {
+		return cmSpDao.findManagerInfo();
+	}
 }

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

@@ -494,7 +494,9 @@ public class SpController extends BaseController {
     @RequestMapping(value = "leader")
     public String leader(NewCmSp newCmSp, Model model, RedirectAttributes redirectAttributes) {
         newCmSp.setTeams(cmSpService.findTeam());
+        NewCmSp manager=cmSpService.findSpManagerInfo();
         model.addAttribute("newCmSp", newCmSp);
+        model.addAttribute("manager",manager);
         return "modules/userNew/cmSpTeamList";
     }
 

src/main/resources/mappings/modules/serviceteam/CmServiceteamRoleMapper.xml

@@ -78,6 +78,7 @@
 		select s.serviceProviderID,IFNULL(s.name,s.linkman) as name
 		from serviceprovider s
 		WHERE s.serviceProviderID NOT IN (SELECT serviceId FROM cm_serviceteam_group)
+		and s.status = 90
 	</select>
 	<select id="findLeader" resultType="com.caimei.modules.serviceteam.entity.CmServiceteamRole">
 		select csr.id as teamId,csr.leaderId,s.name as leaderName
@@ -125,7 +126,12 @@
 			delflag = #{delflag}
 		WHERE id = #{id}
 	</update>
-	
+	<update id="updateLeadr">
+		update cm_serviceteam_role
+		set leaderId = #{leaderId}
+		where id = #{teamId}
+	</update>
+
 	<delete id="delete">
 		DELETE FROM cm_serviceteam_role
 		WHERE id = #{id}

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

@@ -217,6 +217,11 @@
 		left join serviceprovider s on csr.leaderId = s.serviceProviderID
 		where csr.delflag = 0
 	</select>
+	<select id="findManagerInfo" resultType="com.caimei.modules.user.entity.NewCmSp">
+		select csm.serviceProviderId as serviceProviderID,s.name
+		from cm_serviceteam_manager csm
+		left join serviceprovider s on csm.serviceProviderId=s.serviceProviderID
+	</select>
 
 
 </mapper>

src/main/webapp/WEB-INF/views/modules/serviceteam/cmServiceteamRoleForm.jsp

@@ -9,10 +9,23 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function (form) {
+                    var ids=document.getElementsByName("ids");
+                    var checks;
+                    for (let i = 0; i < ids.length; i++) {
+                        if(ids[i].checked){
+                            checks=ids[i];
+                            break;
+                        }
+                    }
+                    if(null==checks){
+                        alertx("请选择组员！");
+                        return false;
+                    }
                     var cc=$("#findgroup").val();
-                    // console.log(cc);
+                    // console.log("选中的values---------------------------"+cc);
+                    debugger;
                     if (null == cc || cc < 1) {
-                        alertx("请选择组员！");
+                        alertx("请选择小组管理员！");
                         return false;
                     }
                     loading('正在提交，请稍等...');
@@ -33,7 +46,7 @@
 
         function getMember() {
             var m = document.getElementsByName("ids");
-            var opts = "";
+            var opts = "<option value=''>" +"请选择组长" + "</option>";
             var count = 0;
             for (let i = 0; i < m.length; i++) {
                 if (count >= 10) {
@@ -96,7 +109,7 @@
                 <br/>
             </c:if>
         </div>
-        <label class="control-label">组员：</label>
+        <label class="control-label"><font color="red">*</font>组员：</label>
         <div class="controls">
             <c:forEach items="${cmServiceteamRole.group}" var="group" varStatus="status">
                 <c:if test="${not empty group.teamFlag}">
@@ -126,7 +139,7 @@
         </div>
         <br/>
         <br/>
-        <label class="control-label">小组管理员：</label>
+        <label class="control-label"><font color="red">*</font>小组管理员：</label>
         <div class="controls">
             <c:if test="${not empty cmServiceteamRole.teamId}">
                 <form:select path="leaderId" class="input-medium" id="findgroup">

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

@@ -2,53 +2,59 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-  <title>编辑协销总管理员</title>
-  <meta name="decorator" content="default"/>
-  <script>
-    $(document).ready(function () {
-      $("#inputForm").validate({
-        submitHandler: function(form){
-          var cc = $("#serviceProviderID").val();
-          if (null == cc || cc < 1) {
-            alertx("请选择总管理员！");
-            return false;
-          }
-          loading('正在提交，请稍等...');
-          form.submit();
-        }
-      });
-    });
-  </script>
+    <title>编辑协销总管理员</title>
+    <meta name="decorator" content="default"/>
+    <script>
+        $(document).ready(function () {
+            $("#inputForm").validate({
+                submitHandler: function (form) {
+                    var cc = $("#serviceProviderID").val();
+                    if (null == cc || cc < 1) {
+                        alertx("请选择总管理员！");
+                        return false;
+                    }
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                }
+            });
+        });
+    </script>
 </head>
 <body>
 <ul class="nav nav-tabs">
-  <li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
-  <shiro:hasPermission name="user:newCmClub:edit"><li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li></shiro:hasPermission>
-  <li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
-  <li class="active"><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
+    <li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
+    <shiro:hasPermission name="user:newCmClub:edit">
+        <li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li>
+    </shiro:hasPermission>
+    <li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
+    <li class="active"><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
 </ul>
 <br/>
 <form:form id="inputForm" modelAttribute="newCmSp" action="${ctx}/new/user/cmSp/leader/save" method="post"
            class="form-horizontal">
-  <sys:message content="${message}"/>
+    <sys:message content="${message}"/>
 
-  <div class="control-group">
-    <div class="controls" style="color: red;margin-left:4%">请在协销人员中选择某人作为协销总管理员，总管理员拥有管理全部协销小组的权限(未选择小组管理员前无可选项)</div>
-    <br/>
-    <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>协销总管理员：</label>
-    <div class="controls">
-      <form:select path="serviceProviderID" class="input-medium">
-        <form:option value="" label="请选择"/>
-        <c:forEach items="${newCmSp.teams}" var="team">
-          <form:option value="${team.leaderId}">${team.leaderName}</form:option>
-        </c:forEach>
-      </form:select>
+    <div class="control-group">
+        <div class="controls" style="color: red;margin-left:4%">请在协销人员中选择某人作为协销总管理员，总管理员拥有管理全部协销小组的权限(未选择小组管理员前无可选项)
+        </div>
+        <br/>
+        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>协销总管理员：</label>
+        <div class="controls">
+            <form:select path="serviceProviderID" class="input-medium">
+<%--                <form:option value="" label="请选择"/>--%>
+                <form:option value="${manager.serviceProviderID}" label="${manager.name}"/>
+                <c:forEach items="${newCmSp.teams}" var="team">
+                    <c:if test="${team.leaderId ne manager.serviceProviderID}">
+                        <form:option value="${team.leaderId}">${team.leaderName}</form:option>
+                    </c:if>
+                </c:forEach>
+            </form:select>
+        </div>
     </div>
-  </div>
 
-  <div class="form-actions">
-    <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-  </div>
+    <div class="form-actions">
+        <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+    </div>
 </form:form>
 </body>
 

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

@@ -129,7 +129,8 @@
 	<input type="hidden" id='clubId' name='clubId' value="${clubId}">
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>描述：</label>
-            <textarea id='describe'  <c:if test="${not empty describe}">placeholder="${describe}"</c:if> <c:if test="${empty describe}">placeholder="请输入该用户的行为信息，例如查看了什么商品或者文章，以及任何需要销售人员注意的信息"</c:if> name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"></textarea>
+            <textarea id='describe' <c:if test="${empty describe}">placeholder="请输入该用户的行为信息，例如查看了什么商品或者文章，以及任何需要销售人员注意的信息"</c:if>
+					  name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"><c:if test="${not empty describe}">${describe}</c:if></textarea>
 		</div>
 	<div class="control-label">链接：</div><span id='link' name='link'>${link}</span>
 		<div class="form-actions">