Home Explore Help
Sign In
caimei365
/
caimei365-manager
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

协销关联服务商

zhijiezhao 4 months ago
parent
b641b39a33
commit
a32a846163
6 changed files with 46 additions and 3 deletions
Split View Show Diff Stats
  1. 2 0
      src/main/java/com/caimei/modules/user/dao/CmSpDao.java
  2. 9 0
      src/main/java/com/caimei/modules/user/entity/CmProvider.java
  3. 1 0
      src/main/java/com/caimei/modules/user/entity/NewCmSp.java
  4. 2 0
      src/main/java/com/caimei/modules/user/web/newUser/SpController.java
  5. 10 1
      src/main/resources/mappings/modules/user/CmSpMapper.xml
  6. 22 2
      src/main/webapp/WEB-INF/views/modules/userNew/cmSpEdit.jsp

+ 2 - 0
src/main/java/com/caimei/modules/user/dao/CmSpDao.java
View File 

@@ -1,5 +1,6 @@
 
 package com.caimei.modules.user.dao;
 
 
+import com.caimei.modules.user.entity.CmProvider;
 
 import com.caimei.modules.user.entity.CmSaleMan;
 
 import com.caimei.modules.user.entity.NewCmSp;
 
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 
@@ -17,6 +18,7 @@ import java.util.Map;
 
 @MyBatisDao
 
 public interface CmSpDao extends CrudDao<NewCmSp> {
 
 
+    List<CmProvider> findProviders();
 
     List<NewCmSp> findSpManager();
 
 
     int updateSpManager(@Param("spManagerID") Integer spManagerID);

+ 9 - 0
src/main/java/com/caimei/modules/user/entity/CmProvider.java
View File 

@@ -0,0 +1,9 @@
 
+package com.caimei.modules.user.entity;
 
+
 
+import com.thinkgem.jeesite.common.persistence.DataEntity;
 
+import lombok.Data;
 
+
 
+@Data
 
+public class CmProvider extends DataEntity<CmProvider> {
 
+    private String name;
 
+}

+ 1 - 0
src/main/java/com/caimei/modules/user/entity/NewCmSp.java
View File 

@@ -10,6 +10,7 @@ public class NewCmSp extends DataEntity<NewCmSp> {
 
 
 	private static final long serialVersionUID = 1L;
 
 
+	private Integer providerId;//服务商Id
 
 	private Integer insiderFlag;//内外部协销标记 0内部协销,1外部协销
 
 	private Integer serviceProviderID;
 
 	private Integer userID;		// 对应的userId

+ 2 - 0
src/main/java/com/caimei/modules/user/web/newUser/SpController.java
View File 

@@ -581,6 +581,8 @@ public class SpController extends BaseController {
 
                 newCmSp.setPosition("2");
 
             }
 
         }
 
+        List<CmProvider> providers = cmSpDao.findProviders();
 
+        model.addAttribute("providers", providers);
 
         model.addAttribute("newCmSp", newCmSp);
 
         return "modules/userNew/cmSpEdit";
 
     }

+ 10 - 1
src/main/resources/mappings/modules/user/CmSpMapper.xml
View File 

@@ -18,7 +18,8 @@
 
 		a.status AS "status",
 
 		a.addTime AS "addTime",
 
 		a.insiderFlag as "insiderFlag",
 
-		a.mainServiceProviderID AS "mainServiceProviderID"
 
+		a.mainServiceProviderID AS "mainServiceProviderID",
 
+		a.providerId as "providerId"
 
 	</sql>
 
 
 	<select id="get" resultType="NewCmSp">
 
@@ -95,6 +96,7 @@
 
 	<insert id="insert" parameterType="NewCmSp"  keyProperty="serviceProviderID" useGeneratedKeys="true">
 
 		INSERT INTO serviceprovider(
 
 		userID,
 
+		providerId,
 
 		name,
 
 		contractPhone,
 
 		contractMobile,
 
@@ -111,6 +113,7 @@
 
 		mainServiceProviderID
 
 		) VALUES (
 
 		#{userID},
 
+	    #{providerId},
 
 		#{name},
 
 		#{contractPhone},
 
 		#{contractMobile},
 
@@ -131,6 +134,7 @@
 
 	<update id="update">
 
 		UPDATE serviceprovider SET
 
 		userID = #{userID},
 
+        providerId = if(#{insiderFlag} = 1,#{providerId},null),
 
 		organizeID = 0,
 
 		name = #{name},
 
 		contractPhone = #{contractPhone},
 
@@ -281,5 +285,10 @@
 
 		WHERE coas.stage = 0  and s.status = 90  and s.serviceProviderID = #{serviceProviderID}
 
 		GROUP BY coas.activeStatus
 
 	</select>
 
+    <select id="findProviders" resultType="com.caimei.modules.user.entity.CmProvider">
 
+		select id,name
 
+		from cm_providers
 
+		where status = 90
 
+	</select>
 
 
 </mapper>

+ 22 - 2
src/main/webapp/WEB-INF/views/modules/userNew/cmSpEdit.jsp
View File 

@@ -13,6 +13,9 @@
 
 	<meta name="decorator" content="default"/>
 
 	<script type="text/javascript">
 
 		$(document).ready(function() {
 
+			if(${newCmSp.position eq 0}){
 
+				$('#positionShow').hide();
 
+			}
 
 			//$("#name").focus();
 
 			$("#inputForm").validate({
 
 				submitHandler: function(form){
 
@@ -30,12 +33,19 @@
 
 				}
 
 			});
 
 		});
 
+		function checkPosition(pos){
 
+			if(0 == pos){
 
+				$('#positionShow').hide();
 
+			}else{
 
+				$('#positionShow').show();
 
+			}
 
+		}
 
 	</script>
 
 </head>
 
 <body>
 
 	<ul class="nav nav-tabs">
 
 		<li><a href="${ctx}/user/cmSp/">协销人员管理列表</a></li>
 
-        <li class="active"><a href="${ctx}/new/user/cmSp/cmSpForm?id=${cmSp.id}">协销人员管理</a></li>
 
+        <li class="active"><a href="${ctx}/new/user/cmSp/cmSpEdit?id=${newCmSp.id}">协销人员管理</a></li>
 
 	</ul><br/>
 
 	<form:form id="inputForm" modelAttribute="newCmSp" action="${ctx}/new/user/cmSp/cmSpSave" method="post" class="form-horizontal">
 
 		<form:hidden path="id"/>
 
@@ -55,12 +65,22 @@
 
 		<div class="control-group">
 
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>身份：</label>
 
 			<div class="controls">
 
-				<form:select path="position" itemLabel="key" itemValue="value" htmlEscape="false">
 
+				<form:select path="position" itemLabel="key" itemValue="value" htmlEscape="false" onchange="checkPosition(this.value)">
 
 				  	    <form:option value="0" label="内部协销"/>
 
 				  	    <form:option value="2" label="外部协销"/>
 
                 </form:select>
 
             </div>
 
 		</div>
 
+		<div class="control-group" id="positionShow">
 
+			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>服务商</label>
 
+			<div class="controls">
 
+				<form:select path="providerId" class="input-medium required">
 
+					<form:option value="" label="请选择"/>
 
+					<form:options items="${providers}" itemLabel="name" itemValue="id"
 
+								  htmlEscape="false"/>
 
+				</form:select>
 
+			</div>
 
+		</div>
 
 		<div class="form-actions">
 
 			<shiro:hasPermission name="user:newCmClub:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
 
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>