供应商管理/机构管理增加审核人列

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

@@ -23,7 +23,7 @@ public interface CmUserDao extends CrudDao<CmUser> {
 
     void updateShopStatus(@Param("status") String status, @Param("userID") Integer userID);
 
-    void updateShopAudit(@Param("auditStatus") String auditStatus, @Param("auditNote") String auditNote, @Param("auditTime") String auditTime, @Param("manufacturerStatus") String manufacturerStatus, @Param("shopId") Integer shopId);
+    void updateShopAudit(@Param("auditStatus") String auditStatus, @Param("auditNote") String auditNote, @Param("auditTime") String auditTime, @Param("name") String name, @Param("manufacturerStatus") String manufacturerStatus, @Param("shopId") Integer shopId);
 
     /**
      * @param companyUserID

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

@@ -17,6 +17,7 @@ import java.util.Date;
 public class NewCmClub extends DataEntity<NewCmClub> {
 
     private static final long serialVersionUID = 1L;
+    private String checkMan;        //审核人
     private Integer clubID;        // 会所ID
     private Integer userID;        // 用户ID
     private Integer userOrganizeID;//用户组织ID
@@ -89,6 +90,14 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String userIdentity;  //用户身份
     private Integer svipUserFlag;   //超级会员用户标识，1是，2不是
 
+    public String getCheckMan() {
+        return checkMan;
+    }
+
+    public void setCheckMan(String checkMan) {
+        this.checkMan = checkMan;
+    }
+
     public String getUserIdentity() {
         return userIdentity;
     }

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

@@ -16,6 +16,7 @@ import java.util.Date;
 public class NewCmShop extends DataEntity<NewCmShop> {
 
     private static final long serialVersionUID = 1L;
+    private String checkMan;        //审核人
     private Integer shopID;        // shopID
     private Integer userID;        // 对应的userId
     private String name;        // 名称
@@ -100,6 +101,14 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         super(id);
     }
 
+    public String getCheckMan() {
+        return checkMan;
+    }
+
+    public void setCheckMan(String checkMan) {
+        this.checkMan = checkMan;
+    }
+
     @Length(min = 0, max = 50, message = "联系人1邮箱长度必须介于 0 和 50 之间")
     public String getContractEmail() {
         return contractEmail;

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

@@ -59,8 +59,8 @@ public class NewCmShopService extends CrudService<NewCmShopDao, NewCmShop> {
 	}
 
 @Transactional(readOnly = false)
-	public void updateShopAudit(String auditStatus, String auditNote, String auditTime, String manufacturerStatus, Integer shopId){
-		cmUserDao.updateShopAudit(auditStatus,auditNote,auditTime,manufacturerStatus,shopId);
+	public void updateShopAudit(String auditStatus, String auditNote, String auditTime,String name, String manufacturerStatus, Integer shopId){
+		cmUserDao.updateShopAudit(auditStatus,auditNote,auditTime,name,manufacturerStatus,shopId);
 	}
 
 	public NewCmShop getShopcert(NewCmShop newCmShop){

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -22,6 +22,7 @@ import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -129,7 +130,9 @@ public class NewCmShopController extends BaseController {
             // 更新用户信息
             newCmShopService.updateUserAudit(auditStatus, auditNote, format, manufacturerStatus, userId, "1");
             // 更新供应商信息
-            newCmShopService.updateShopAudit(auditStatus, auditNote, format, manufacturerStatus, shopId);
+            //存审核人姓名
+            String name = UserUtils.getUser().getName();
+            newCmShopService.updateShopAudit(auditStatus, auditNote, format, name, manufacturerStatus, shopId);
             map.put("success", true);
             map.put("msg", "审核成功");
             if (StringUtils.isNotEmpty(mobile)) {

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

@@ -20,6 +20,7 @@ import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.Encodes;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -534,6 +535,7 @@ public class AgencyController extends BaseController {
             newCmClub.setStatus(Integer.parseInt(status));
             newCmClub.setAuditTime(currTime);
             newCmClub.setAuditNote(auditNote);
+            newCmClub.setCheckMan(UserUtils.getUser().getName());
             //企业用户表修改
             companyUser.setValidFlag(AppKeys.FLAG_YES);//正常
             companyUser.setClubStatus(status);

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

@@ -487,6 +487,9 @@
 			<if test="auditTime != null and auditTime != ''">
 				auditTime = #{auditTime},
 			</if>
+            <if test="name != null and name != ''">
+				checkMan = #{name},
+			</if>
         </set>
         WHERE shopID = #{shopId}
     </update>

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.caimei.modules.user.dao.NewCmClubDao">
 
 	<sql id="newCmClubColumns">
+		a.checkMan as "checkMan",
 		a.clubID AS "clubID",
 		a.userID AS "userID",
 		u.name AS "name",
@@ -258,6 +259,9 @@
 
 	<update id="update">
 		UPDATE club SET
+		<if test="checkMan != null and checkMan != ''">
+			checkMan = #{checkMan},
+		</if>
 		<if test="name != null and name != ''">
 			name = #{name},
 			</if>

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

@@ -4,6 +4,7 @@
 
 	<sql id="newCmShopColumns">
 		a.shopID AS "shopID",
+		a.checkMan as "checkMan",
 		a.userID AS "userID",
 		u.name AS "name",
 		u.userName AS "sname",

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -549,7 +549,7 @@
         <tr>
             <th>商品说明：</th>
             <td colspan="3">
-                <form:textarea path="productDescribe" id="wipeRemarks" maxlength="200" placeholder="请输入备注文字，不能超过200字" class="input-xlarge required"  rows="4"></form:textarea>
+                <form:textarea path="productDescribe" id="wipeRemarks" maxlength="200" placeholder="请输入备注文字，不能超过200字" class="input-xlarge"  rows="4"></form:textarea>
                 <p style="width:500px;text-align:right;"><span id="remarkLen" style="color:red;">0</span>/200</p>
             </td>
         </tr>

src/main/webapp/WEB-INF/views/modules/user/newCmShopList.jsp

@@ -228,6 +228,7 @@
 				<th>邮箱</th>
 				<th>注册来源</th>
 				<th>供应商状态</th>
+				<th>审核人</th>
 				<th>注册时间</th>
 				<th>审核时间</th>
 				<shiro:hasPermission name="user:newCmShop:edit"><th>操作</th></shiro:hasPermission>
@@ -280,6 +281,9 @@
 							<a href="javascript:void(0);" onclick="online(${newCmShop.userID})">上线</a>
 						</c:if>
 				</td>
+				<td>
+						${newCmShop.checkMan}
+				</td>
 				<td>
 					<fmt:formatDate value="${newCmShop.registerTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>
 				</td>

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

@@ -114,6 +114,7 @@
         <th>邮箱</th>
         <th>协销人员</th>
         <th>状态</th>
+        <th>审核人</th>
         <th>机构类别</th>
         <th>注册IP</th>
         <th>注册时间</th>
@@ -193,6 +194,9 @@
                     </c:otherwise>
                 </c:choose>
             </td>
+            <td>
+                    ${newCmClubList.checkMan}
+            </td>
             <td>
                 <c:if test="${newCmClubList.userIdentity eq 4}">
                     个人机构