3月小版本合并

src/main/java/com/caimei/modules/newhome/web/AnnouncementController.java

@@ -75,42 +75,27 @@ public class AnnouncementController extends BaseController {
     @RequiresPermissions("newhome:announcementForm:view")
     @RequestMapping(value = "line")
     public String line(Announcementmanagement announcementmanagement, Model model, HttpServletRequest request, HttpServletResponse response) {
-        Object[] options = {"取消", "确认"};  //自定义按钮上的文字
-        int m = JOptionPane.showOptionDialog(null, "确定下线该公告吗？", "提示", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
-        if (m == 1) {
-
-
             Date date = new Date();
             announcementmanagement.setOfflinetime(date);
             announcementmanagement.setState("2");
-
             announcementService.line(announcementmanagement);
-        }
         return "redirect:" + Global.getAdminPath() + "/newhome/Announcement/";
     }
 
     @RequiresPermissions("newhome:announcementForm:view")
     @RequestMapping(value = "online")
     public String online(Announcementmanagement announcementmanagement, Model model) {
-        Object[] options = {"取消", "确认"};  //自定义按钮上的文字
-        int m = JOptionPane.showOptionDialog(null, "确定上线该公告吗？", "提示", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
-        if (m == 1) {
             Date date = new Date();
             announcementmanagement.setLivetime(date);
             announcementmanagement.setState("1");
             announcementService.online(announcementmanagement);
-        }
         return "redirect:" + Global.getAdminPath() + "/newhome/Announcement/";
     }
 
     @RequiresPermissions("newhome:announcementForm:view")
     @RequestMapping(value = "detele")
     public String detele(Announcementmanagement announcementmanagement, Model model) {
-        Object[] options = {"取消", "确认"};  //自定义按钮上的文字
-        int m = JOptionPane.showOptionDialog(null, "确定删除该公告吗？", "提示", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
-        if (m == 1) {
             announcementService.deteles(announcementmanagement);
-        }
         return "redirect:" + Global.getAdminPath() + "/newhome/Announcement/";
     }
 

src/main/java/com/caimei/modules/user/aop/OperationLogAnnotation.java

@@ -0,0 +1,19 @@
+package com.caimei.modules.user.aop;
+
+
+import com.caimei.modules.user.entity.CmClubinfo;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)//注解放置的目标位置即方法级别
+@Retention(RetentionPolicy.RUNTIME)//注解在哪个阶段执行
+@Documented
+public @interface OperationLogAnnotation {
+
+    String operModul() default ""; // 操作
+
+    String operType() default "";  // 操作类型
+
+    String oper() default "";  // 特殊标识
+
+}

src/main/java/com/caimei/modules/user/aop/OperationLogAspect.java

@@ -0,0 +1,429 @@
+package com.caimei.modules.user.aop;
+
+import com.caimei.modules.user.entity.*;
+import com.caimei.modules.user.service.*;
+import com.caimei.modules.user.utils.HttpContextUtils;
+import com.caimei.modules.user.web.ClubTemporaryController;
+import com.caimei.modules.user.web.newUser.AgencyController;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Aspect
+@Component
+public class OperationLogAspect {
+    @Autowired
+    private SysLogService sysLogService;
+
+    @Autowired
+    private ClubTemporaryService clubTemporaryService;
+
+    //定义切点 @Pointcut
+    //在注解的位置切入代码
+    @Pointcut("@annotation(com.caimei.modules.user.aop.OperationLogAnnotation)")
+    public void logPointCut() {
+
+    }
+
+    @AfterReturning("logPointCut()")
+    public void saveSysLog(JoinPoint joinPoint) throws IOException {
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        //保存日志
+        OperationalLogs sysLog = new OperationalLogs();
+
+        //从切面织入点处通过反射机制获取织入点处的方法
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        //获取切入点所在的方法
+        Method method = signature.getMethod();
+        sysLog.setActioncontent(null);
+        //获取操作类型
+        OperationLogAnnotation myLog = method.getAnnotation(OperationLogAnnotation.class);
+        if (myLog != null) {
+            String value = myLog.operType();
+            sysLog.setOperationtype(value);//保存获取的操作类型
+            System.out.println("Operationtype操作类型=" + value);
+        }
+
+        //获取请求的类名
+        String className = joinPoint.getTarget().getClass().getName();
+
+        //获取请求操作类型
+        String operType = myLog.operType();
+        sysLog.setOperationtype(operType);
+
+        //获取请求操作内容
+        AgencyController A = new AgencyController();
+        ClubTemporaryController B = new ClubTemporaryController();
+        String email = request.getParameter("contractEmail");//修改后邮箱
+        String bindm = request.getParameter("bindMobile");//修改后手机电话
+        String jgname = request.getParameter("name");//修改后机构名字
+        String sname = request.getParameter("sname");//修改后机构简称
+        String uname = request.getParameter("userName");//修改后的联系人
+        String Identity = request.getParameter("linkManIdentity");//联系人身份
+        String address = request.getParameter("address");//详细地址
+        String socialCreditCode = request.getParameter("socialCreditCode");//营业执照编号
+        String headpic = request.getParameter("headpic");//门头照
+        String businessLicenseImage = request.getParameter("businessLicenseImage");//营业执照
+        String ClubType = request.getParameter("firstClubType");//机构类型
+        String mainpro = request.getParameter("mainpro");//主营业务
+        String contractPhone = request.getParameter("contractPhone");//固定电话
+        String fax = request.getParameter("fax");//传真
+        String empnum = request.getParameter("empnum");//公司人数
+        String info = request.getParameter("info");//公司简介
+        String area = request.getParameter("area");//机构面积
+        String bedNums = request.getParameter("bedNums");//美容院床位
+        String beauticians = request.getParameter("beauticians");//美容师数
+        String monthAchievement = request.getParameter("monthAchievement");//月业绩
+        String promotionAchievement = request.getParameter("promotionAchievement");//促销业绩
+        String yearAchievement = request.getParameter("yearAchievement");//年业绩
+        String cateA = request.getParameter("cateA");//A类会员
+        String consumeA = request.getParameter("consumeA");//A类会员消费金额
+        String cateB = request.getParameter("empnum");//B类会员
+        String consumeB = request.getParameter("consumeB");//B类会员消费金额
+        String cateC = request.getParameter("cateC");//C类会员
+        String consumeC = request.getParameter("consumeC");//C类会员消费金额
+        String highestAchievement = request.getParameter("highestAchievement");//最高业绩
+        String reachPepole = request.getParameter("reachPepole");//到店人数
+        String clinchPepole = request.getParameter("clinchPepole");//成交人数
+        String methodName = myLog.operModul();
+        ArrayList<String> list = new ArrayList();
+
+        if (myLog.operType().equals("编辑")) {
+            if (A.cmClu.getHighestAchievement().equals("") || A.cmClu.getReachPepole() == null || A.cmClu.getClinchPepole() == null) {
+                if (!highestAchievement.equals("") || !reachPepole.equals("") || !clinchPepole.equals("")) {
+                    list.add("新增了活动业绩信息");
+                }
+
+            } else {
+                if (!highestAchievement.equals(A.cmClu.getHighestAchievement())) {
+                    list.add("修改了活动业绩的最高业绩信息");
+                }
+
+                if (Integer.parseInt(reachPepole) != A.cmClu.getReachPepole()) {
+                    list.add("修改了活动业绩的到店人数信息");
+                }
+                if (Integer.parseInt(clinchPepole) != A.cmClu.getClinchPepole()) {
+                    list.add("修改了活动业绩的成交人数信息");
+                }
+            }
+
+
+            if (A.cmClu.getConsumeA() == null || A.cmClu.getConsumeB() == null || A.cmClu.getConsumeC() == null) {
+                if (A.cmClu.getConsumeA() != null || A.cmClu.getConsumeB() != null || A.cmClu.getConsumeC() != null) {
+                    list.add("新增了会员消费金额信息");
+                }
+            } else {
+                BigDecimal cateAs = new BigDecimal(consumeA);
+                BigDecimal cateBs = new BigDecimal(consumeB);
+                BigDecimal cateCs = new BigDecimal(consumeC);
+                if (A.cmClu.getConsumeA() != cateAs) {
+                    list.add("修改了A类会员消费金额");
+                }
+                if (A.cmClu.getConsumeB() != cateBs) {
+                    list.add("修改了B类会员消费金额");
+                }
+                if (A.cmClu.getConsumeC() != cateCs) {
+                    list.add("修改了C类会员消费金额");
+                }
+            }
+
+
+            if (A.cmClu.getCateA() == null || A.cmClu.getCateB() == null || A.cmClu.getCateC() == null) {
+                if (!cateA.equals("") || !cateB.equals("") || !cateC.equals("")) {
+                    list.add("新增了会员信息");
+                }
+            } else {
+                if (A.cmClu.getCateA() != Integer.parseInt(cateA)) {
+                    list.add("修改了A会员信息");
+                }
+                if (A.cmClu.getCateB() != Integer.parseInt(cateB)) {
+                    list.add("修改了B会员信息");
+                }
+                if (A.cmClu.getCateC() != Integer.parseInt(cateC)) {
+                    list.add("修改了C会员信息");
+                }
+            }
+
+
+            if (A.cmClu.getMonthAchievement().equals("") || A.cmClu.getPromotionAchievement().equals("") || A.cmClu.getYearAchievement().equals("")) {
+                if (!monthAchievement.equals("") || !promotionAchievement.equals("") || !yearAchievement.equals("")) {
+                    list.add("新增了业绩信息");
+                }
+
+            } else {
+                if (!monthAchievement.equals(A.cmClu.getMonthAchievement())) {
+                    list.add("修改了月业绩信息");
+                }
+
+                if (promotionAchievement != A.cmClu.getPromotionAchievement()) {
+                    list.add("修改了促销业绩信息");
+                }
+                if (yearAchievement != A.cmClu.getYearAchievement()) {
+                    list.add("修改了年业绩信息");
+                }
+            }
+
+
+            if (A.cmClu.getArea() == null || A.cmClu.getBedNums() == null || A.cmClu.getBeauticians() == null) {
+                if (!area.equals("") || !bedNums.equals("") || !beauticians.equals("")) {
+                    list.add("更新了基本信息");
+                }
+            } else {
+                if (A.cmClu.getArea() != Integer.parseInt(area)) {
+                    list.add("修改了机构面积");
+                }
+                if (A.cmClu.getBedNums() != Integer.parseInt(bedNums)) {
+                    list.add("修改了美容床数");
+                }
+                if (A.cmClu.getBeauticians() != Integer.parseInt(beauticians)) {
+                    list.add("修改了美容师数");
+                }
+            }
+
+
+            if (A.newCm.getInfo() == null) {
+                if (!info.equals("")) {
+                    list.add("新增了公司简介");
+                }
+            } else if (!A.newCm.getInfo().equals(info)) {
+                list.add("修改了公司简介");
+            }
+
+            if (empnum.equals(A.cmClu.getEmpnum())) {
+                list.add("更新了公司人数");
+            }
+
+            if (A.newCm.getFax() == null) {
+                if (!fax.equals("")) {
+                    list.add("新增了传真");
+                }
+            } else if (!A.newCm.getFax().equals(fax)) {
+                list.add("修改了传真");
+            }
+
+
+            if (A.newCm.getContractPhone() == null) {
+                if (!contractPhone.equals("")) {
+                    list.add("新增了固定电话");
+                }
+            } else if (!A.newCm.getContractPhone().equals(contractPhone)) {
+                list.add("修改了固定电话");
+            }
+
+
+            if (!A.newCm.getAddress().equals(address)) {
+                list.add("修改了详细地址");
+            }
+            if (Identity != null) {
+                if (A.newCm.getLinkManIdentity() != Integer.parseInt(Identity)) {
+                    list.add("修改了联系人身份");
+                }
+            }
+            if (A.newCm.getUserName() == null) {
+                if (uname != null) {
+                    list.add("新增了联系人");
+                }
+            }
+            if (!A.newCm.getUserName().equals(uname)) {
+                list.add("修改了联系人");
+            }
+
+            if (!A.newCm.getMainpro().equals(mainpro)) {
+                list.add("更改了主营业务");
+            }
+
+            if (A.newCm.getFirstClubType() == null) {
+                if (ClubType != null) {
+                    list.add("新增了机构类型");
+                }
+            } else if (!A.newCm.getFirstClubType().equals(ClubType)) {
+                list.add("修改了机构类型");
+            }
+
+
+            if (A.newCm.getBusinessLicenseImage() == null) {
+                if (businessLicenseImage != null) {
+                    list.add("新增了营业执照");
+                }
+            } else {
+                if (!A.newCm.getBusinessLicenseImage().equals(businessLicenseImage)) {
+                    list.add("修改了营业执照");
+                }
+            }
+
+
+            if (A.newCm.getHeadpic() == null) {
+                if (headpic != null) {
+                    list.add("新增了门头照");
+                }
+                if (!A.newCm.getHeadpic().equals(headpic)) {
+                    list.add("修改了门头照");
+                }
+            }
+
+
+            if (A.newCm.getSocialCreditCode() == null) {
+                if (socialCreditCode != null) {
+                    list.add("新增了营业执照编号");
+                }
+                if (!A.newCm.getSocialCreditCode().equals(socialCreditCode)) {
+                    list.add("修改了营业执照编号");
+                }
+            }
+
+
+            if (A.newCm.getAddress() == null) {
+                if (address != null) {
+                    list.add("新增了详细地址");
+                }
+            }
+
+
+            if (A.newCm.getSname() == null) {
+                if (sname != null) {
+                    list.add("新增了机构简称");
+                }
+            }
+            if (!A.newCm.getSname().equals(sname)) {
+                list.add("修改了机构简称");
+            }
+
+            if (A.newCm.getName() == null) {
+                if (jgname != null) {
+                    list.add("新增了机构名称");
+                }
+            }
+            if (!A.newCm.getName().equals(jgname)) {
+                list.add("修改了机构名称");
+            }
+
+            if (A.newCm.getBindMobile() == null) {
+                if (bindm != null) {
+                    list.add("新增了手机号");
+                }
+            }
+            if (!A.newCm.getBindMobile().equals(bindm)) {
+                list.add("修改了手机号");
+            }
+
+            if (A.newCm.getContractEmail() == null) {
+                if (email != null) {
+                    list.add("新增了注册邮箱");
+                }
+            }
+            if (!A.newCm.getContractEmail().equals(email)) {
+                list.add("修改了邮箱");
+            }
+            sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
+        }
+        if (sysLog.getActioncontent() == null) {
+            sysLog.setActioncontent(methodName);
+        }
+        //获取操作时间
+        sysLog.setOperationtime(new Date());
+
+        //获取操作员
+        Principal principal = UserUtils.getPrincipal();
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+
+        //获取机构名称和联系人
+        String id = request.getParameter("id");
+        if (myLog.operType().equals("编辑")) {
+            sysLog.setInstitutionName(jgname);
+            sysLog.setContact(uname);
+        }
+        if (myLog.oper().equals("1")) {
+            if (B.clubT.getLinkMan() != "") {
+                sysLog.setContact(B.clubT.getLinkMan());
+            }
+        }
+
+
+        if (myLog.operType().equals("更换协销")) {
+            System.out.println("更换协销" + A.newCms.getLinkMan());
+            System.out.println("更换协销" + A.newCm.getLinkMan());
+            if (!A.newCms.getLinkMan().equals("")) {
+                sysLog.setActioncontent(A.newCm.getLinkMan() + "更换为" + A.newCms.getLinkMan());
+            }
+            sysLog.setContact(A.newCm.getUserName());
+            sysLog.setInstitutionName(A.newCm.getLinkMan());
+        }
+
+
+        if (myLog.operType().equals("设置机构类别")) {
+            System.out.println("机构类别" + A.types);
+            if (A.types.equals("1")) {
+                sysLog.setActioncontent("设置为资质机构");
+            } else {
+                sysLog.setActioncontent("设置为个人机构");
+            }
+            sysLog.setContact(A.cmUs.getUserName());
+            sysLog.setInstitutionName(A.cmUs.getName());
+        }
+
+
+        if (myLog.operType().equals("审核")) {
+            System.out.println("审核" + A.cmUs.getAuditStatus());
+            if (StringUtils.equals("1", A.cmUs.getAuditStatus())) {
+                sysLog.setActioncontent("审核通过");
+            } else {
+                sysLog.setActioncontent("审核不通过");
+            }
+            sysLog.setContact(A.cmUs.getUserName());
+            sysLog.setInstitutionName(A.cmUs.getName());
+        }
+
+
+        if (myLog.operType().equals("更改状态")) {
+            sysLog.setContact(A.cmUs.getUserName());
+            sysLog.setInstitutionName(A.cmUs.getName());
+        }
+
+
+        if (myLog.operType().equals("修改密码")) {
+            String Inst = A.cmUs.getName();
+            String Contact = A.cmUs.getUserName();
+            sysLog.setContact(Contact);
+            sysLog.setInstitutionName(Inst);
+        }
+
+        if (myLog.operType().equals("确认注册")) {
+            sysLog.setActioncontent(methodName);
+            ClubTemporary club = clubTemporaryService.get(id);
+            if (club != null) {
+                String Inst = club.getLinkMan();
+                String Contact = club.getName();
+                sysLog.setContact(Contact);
+                sysLog.setInstitutionName(Inst);
+                System.out.println("contact=" + sysLog.getContact());
+            }
+        }
+
+        //调用service保存SysLog实体类到数据库
+        if (!sysLog.getActioncontent().equals("")) {
+            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                int i = sysLogService.insert(sysLog);
+                list.removeAll(list);
+            }
+        }
+    }
+
+}

src/main/java/com/caimei/modules/user/aop/OperationLogCmShop.java

@@ -0,0 +1,314 @@
+package com.caimei.modules.user.aop;
+
+import com.caimei.modules.user.entity.CmOperationalLogs;
+import com.caimei.modules.user.entity.CmUser;
+import com.caimei.modules.user.service.CmOperationUserService;
+import com.caimei.modules.user.service.CmOperationalLogService;
+import com.caimei.modules.user.service.CmUserService;
+import com.caimei.modules.user.service.SysLogService;
+import com.caimei.modules.user.utils.HttpContextUtils;
+import com.caimei.modules.user.web.NewCmShopController;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Date;
+
+@Aspect
+@Component
+public class OperationLogCmShop {
+
+
+    @Autowired
+    private CmOperationalLogService sysLogService;
+
+    @Autowired
+    private CmUserService cmUserService;
+
+    @Pointcut("@annotation(com.caimei.modules.user.aop.OperationLogShop)")
+    public void logPointCut() {
+
+    }
+
+    @AfterReturning("logPointCut()")
+    public void saveSysLog(JoinPoint joinPoint) throws IOException {
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+
+        CmOperationalLogs sysLog = new CmOperationalLogs();
+
+        //从切面织入点处通过反射机制获取织入点处的方法
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        //获取切入点所在的方法
+        Method method = signature.getMethod();
+        //获取操作类型
+        OperationLogShop oper = method.getAnnotation(OperationLogShop.class);
+
+        NewCmShopController A = new NewCmShopController();
+
+        ArrayList<String> list = new ArrayList();
+
+        String maintenanceFee = request.getParameter("maintenanceFee");//线上分账商户号
+        String name = request.getParameter("name");//公司名称
+        String sname = request.getParameter("sname");//公司简称
+        String address = request.getParameter("address");//公司地址
+        String linkMan = request.getParameter("linkMan");//修改后的联系人
+        String contractMobile = request.getParameter("contractMobile");//手机号
+        String email = request.getParameter("email");//邮箱
+        String contractPhone = request.getParameter("contractPhone");//固定电话
+        String fax = request.getParameter("fax");//传真
+        String legalPerson = request.getParameter("legalPerson");//法人代表：
+        String registeredCapital = request.getParameter("registeredCapital");//注册资本
+        String nature = request.getParameter("nature");//公司性质
+        String turnover = request.getParameter("turnover");//年营业额
+        String firstShopType = request.getParameter("firstShopType");//公司类型
+        String secondShopType = request.getParameter("secondShopType");//医疗类型
+        String mainpro = request.getParameter("mainpro");//主营内容
+        String businessScope = request.getParameter("businessScope");//经营范围
+        String website = request.getParameter("website");//官网地址
+        String wxOfficialAccount = request.getParameter("wxOfficialAccount");//微信公众号
+        String wxApplets = request.getParameter("wxApplets");//微信小程序
+        String socialCreditCode = request.getParameter("socialCreditCode");//营业执照编号
+        String businessLicenseImage = request.getParameter("businessLicenseImage");//营业执照图片
+        String logo = request.getParameter("logo");//公司logo
+
+        if (oper.operType().equals("编辑")) {
+
+            if (A.newcm.getMaintenanceFee() == "0") {
+                if (!maintenanceFee.equals("0")) {
+                    list.add("新增了线上分账商户号");
+                }
+            } else if (!A.newcm.getMaintenanceFee().equals(maintenanceFee)) {
+                list.add("修改了线上分账商户号");
+            }
+
+            if (A.newcm.getName() == null) {
+                if (!name.equals("")) {
+                    list.add("新增了公司名称");
+                }
+            } else if (!A.newcm.getName().equals(name)) {
+                list.add("修改了公司名称");
+            }
+
+            if (A.newcm.getSname() == null) {
+                if (!sname.equals("")) {
+                    list.add("新增了公司简称");
+                }
+            } else if (!A.newcm.getSname().equals(sname)) {
+                list.add("修改了公司简称");
+            }
+
+            if (A.newcm.getAddress() == null) {
+                if (!address.equals("")) {
+                    list.add("新增了公司地址");
+                }
+            } else if (!A.newcm.getAddress().equals(address)) {
+                list.add("修改了公司地址");
+            }
+
+            if (A.newcm.getLinkMan() == null) {
+                if (!linkMan.equals("")) {
+                    list.add("新增了联系人");
+                }
+            } else if (!A.newcm.getLinkMan().equals(linkMan)) {
+                list.add("修改了联系人");
+            }
+
+            if (A.newcm.getContractMobile() == null) {
+                if (!contractMobile.equals("")) {
+                    list.add("新增了手机号");
+                }
+            } else if (!A.newcm.getContractMobile().equals(contractMobile)) {
+                list.add("修改了手机号");
+            }
+
+            if (A.newcm.getEmail() == null) {
+                if (!email.equals("")) {
+                    list.add("新增了邮箱");
+                }
+            } else if (!A.newcm.getEmail().equals(email)) {
+                list.add("修改了邮箱");
+            }
+
+            if (A.newcm.getContractPhone() == null) {
+                if (!contractPhone.equals("")) {
+                    list.add("新增了固定电话");
+                }
+            } else if (!A.newcm.getContractPhone().equals(contractPhone)) {
+                list.add("修改了固定电话");
+            }
+
+            if (A.newcm.getFax() == null) {
+                if (!fax.equals("")) {
+                    list.add("新增了传真");
+                }
+            } else if (!A.newcm.getFax().equals(fax)) {
+                list.add("修改了传真");
+            }
+
+            if (A.newcm.getLegalPerson() == null) {
+                if (!legalPerson.equals("")) {
+                    list.add("新增了法人代表");
+                }
+            } else if (!A.newcm.getLegalPerson().equals(legalPerson)) {
+                list.add("修改了法人代表");
+            }
+
+            if (A.newcm.getRegisteredCapital() == null) {
+                if (!registeredCapital.equals("")) {
+                    list.add("新增了注册资本");
+                }
+            }
+            if (registeredCapital != "") {
+                if (A.newcm.getRegisteredCapital() != Double.parseDouble(registeredCapital)) {
+                    list.add("修改了注册资本");
+                }
+            }
+            if (A.newcm.getNature() == null) {
+                if (!nature.equals("")) {
+                    list.add("新增了公司性质");
+                }
+            } else if (!A.newcm.getNature().equals(nature)) {
+                list.add("修改了公司性质");
+            }
+
+            if (A.newcm.getTurnover() == null) {
+                if (!turnover.equals("")) {
+                    list.add("新增了年营业额");
+                }
+            } else if (!A.newcm.getTurnover().equals(turnover)) {
+                list.add("修改了年营业额");
+            }
+
+            if (A.newcm.getFirstShopType() == null) {
+                if (!firstShopType.equals("")) {
+                    list.add("新增了公司类型");
+                }
+            } else if (!A.newcm.getFirstShopType().equals(firstShopType)) {
+                list.add("修改了公司类型");
+            }
+
+            if (A.newcm.getSecondShopType() == null) {
+                if (!secondShopType.equals("")) {
+                    list.add("新增了医疗类型");
+                }
+            } else if (!A.newcm.getSecondShopType().equals(secondShopType)) {
+                list.add("修改了医疗类型");
+            }
+
+            if (A.newcm.getMainpro() == null) {
+                if (!mainpro.equals("")) {
+                    list.add("新增了主营内容");
+                }
+            } else if (!A.newcm.getMainpro().equals(mainpro)) {
+                list.add("修改了主营内容");
+            }
+
+            if (A.newcm.getBusinessScope() == null) {
+                if (!businessScope.equals("")) {
+                    list.add("新增了医疗类型");
+                }
+            } else if (!A.newcm.getBusinessScope().equals(businessScope)) {
+                list.add("修改了医疗类型");
+            }
+
+            if (A.newcm.getWebsite() == null) {
+                if (!website.equals("")) {
+                    list.add("新增了官网地址");
+                }
+            } else if (!A.newcm.getWebsite().equals(website)) {
+                list.add("修改了官网地址");
+            }
+
+            if (A.newcm.getWxOfficialAccount() == null) {
+                if (!wxOfficialAccount.equals("")) {
+                    list.add("新增了微信公众号");
+                }
+            } else if (!A.newcm.getWxOfficialAccount().equals(wxOfficialAccount)) {
+                list.add("修改了微信公众号");
+            }
+
+            if (A.newcm.getWxApplets() == null) {
+                if (!wxApplets.equals("")) {
+                    list.add("新增了微信小程序");
+                }
+            } else if (!A.newcm.getWxApplets().equals(wxApplets)) {
+                list.add("修改了微信小程序");
+            }
+
+            if (A.newcm.getSocialCreditCode() == null) {
+                if (!socialCreditCode.equals("")) {
+                    list.add("新增了营业执照编号");
+                }
+            } else if (!A.newcm.getSocialCreditCode().equals(socialCreditCode)) {
+                list.add("修改了营业执照编号");
+            }
+
+            if (A.newcm.getBusinessLicenseImage() == null) {
+                if (!businessLicenseImage.equals("")) {
+                    list.add("新增了营业执照图片");
+                }
+            } else if (!A.newcm.getBusinessLicenseImage().equals(businessLicenseImage)) {
+                list.add("修改了营业执照图片");
+            }
+
+            if (A.newcm.getLogo() == null) {
+                if (!logo.equals("")) {
+                    list.add("新增了营业执照图片");
+                }
+            } else if (!A.newcm.getLogo().equals(logo)) {
+                list.add("修改了营业执照图片");
+            }
+            sysLog.setActioncontent(StringUtils.strip(list.toString(), "[]"));
+        }
+        sysLog.setInstitutionName(name);
+        sysLog.setContact(linkMan);
+
+
+        sysLog.setOperationtime(new Date());
+        sysLog.setOperationtype(oper.operType());
+
+        SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
+        System.out.println("操作员" + principal.getName());
+        String username = principal.getName();
+        sysLog.setOperator(username);
+
+        if (oper.operType().equals("更改状态")) {
+            CmUser cmUser = cmUserService.get(String.valueOf(A.id));
+            sysLog.setInstitutionName(cmUser.getName());
+            sysLog.setActioncontent(oper.operModul());
+            sysLog.setContact(cmUser.getUserName());
+        }
+
+        if (oper.operType().equals("修改密码")) {
+            sysLog.setInstitutionName(A.cmus.getName());
+            sysLog.setActioncontent(oper.operModul());
+            sysLog.setContact(A.cmus.getUserName());
+        }
+        if (oper.operType().equals("审核")) {
+            sysLog.setInstitutionName(A.cmus.getName());
+            if(StringUtils.equals("1", A.auditNo)){sysLog.setActioncontent("审核通过");}
+            if (StringUtils.equals("2", A.auditNo)){ sysLog.setActioncontent("审核不通过");}
+            sysLog.setContact(A.cmus.getUserName());
+        }
+
+
+        System.out.println(sysLog.getInstitutionName());
+        if (!sysLog.getActioncontent().equals("")) {
+            if (sysLog.getInstitutionName() != null && sysLog.getContact() != null) {
+                int i = sysLogService.insert(sysLog);
+                list.removeAll(list);
+            }
+        }
+    }
+}

src/main/java/com/caimei/modules/user/aop/OperationLogShop.java

@@ -0,0 +1,18 @@
+package com.caimei.modules.user.aop;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)//注解放置的目标位置即方法级别
+@Retention(RetentionPolicy.RUNTIME)//注解在哪个阶段执行
+@Documented
+public @interface OperationLogShop {
+
+
+    String operModul() default ""; // 操作
+
+    String operType() default "";  // 操作类型
+
+    String oper() default "";  // 特殊标识
+
+}
+

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

@@ -0,0 +1,11 @@
+package com.caimei.modules.user.dao;
+
+import com.caimei.modules.user.entity.CmOperationalLogs;
+
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+
+@MyBatisDao
+public interface CmOperationsDao extends CrudDao<CmOperationalLogs> {
+
+}

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

@@ -0,0 +1,11 @@
+package com.caimei.modules.user.dao;
+
+import com.caimei.modules.user.entity.NewCmShop;
+import com.caimei.modules.user.entity.OperationalLogs;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+
+@MyBatisDao
+public interface OperationsDao extends CrudDao<OperationalLogs> {
+
+}

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

@@ -0,0 +1,67 @@
+package com.caimei.modules.user.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+import java.util.Date;
+
+public class CmOperationalLogs extends DataEntity<CmOperationalLogs> {
+    private String institutionName;
+    private String Contact;
+    private String operationtype;
+    private String Actioncontent;
+    private String Operator;
+    private Date Operationtime;
+
+
+
+    public String getInstitutionName() {
+        return institutionName;
+    }
+
+    public void setInstitutionName(String institutionName) {
+        this.institutionName = institutionName;
+    }
+
+
+    public String getContact() {
+        return Contact;
+    }
+
+    public void setContact(String contact) {
+        this.Contact = contact;
+    }
+
+
+    public String getOperationtype() {
+        return operationtype;
+    }
+
+    public void setOperationtype(String operationtype) {
+        this.operationtype = operationtype;
+    }
+
+
+    public String getActioncontent() {
+        return Actioncontent;
+    }
+
+    public void setActioncontent(String actioncontent) {
+        Actioncontent = actioncontent;
+    }
+
+    public String getOperator() {
+        return Operator;
+    }
+
+    public void setOperator(String operator) {
+        Operator = operator;
+    }
+
+    public Date getOperationtime() {
+        return Operationtime;
+    }
+
+    public void setOperationtime(Date operationtime) {
+        Operationtime = operationtime;
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.caimei.modules.user.entity;
+
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+import java.util.Date;
+
+public class OperationalLogs extends DataEntity<OperationalLogs> {
+
+  private String institutionName;
+  private String Contact;
+  private String operationtype;
+  private String Actioncontent;
+  private String Operator;
+  private Date Operationtime;
+
+
+
+  public String getInstitutionName() {
+    return institutionName;
+  }
+
+  public void setInstitutionName(String institutionName) {
+    this.institutionName = institutionName;
+  }
+
+
+  public String getContact() {
+    return Contact;
+  }
+
+  public void setContact(String contact) {
+    this.Contact = contact;
+  }
+
+
+  public String getOperationtype() {
+    return operationtype;
+  }
+
+  public void setOperationtype(String operationtype) {
+    this.operationtype = operationtype;
+  }
+
+
+  public String getActioncontent() {
+    return Actioncontent;
+  }
+
+  public void setActioncontent(String actioncontent) {
+    Actioncontent = actioncontent;
+  }
+
+  public String getOperator() {
+    return Operator;
+  }
+
+  public void setOperator(String operator) {
+    Operator = operator;
+  }
+
+  public Date getOperationtime() {
+    return Operationtime;
+  }
+
+  public void setOperationtime(Date operationtime) {
+    Operationtime = operationtime;
+  }
+}

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

@@ -0,0 +1,37 @@
+package com.caimei.modules.user.service;
+
+import com.caimei.modules.user.dao.CmOperationsDao;
+import com.caimei.modules.user.dao.OperationsDao;
+import com.caimei.modules.user.entity.CmOperationalLogs;
+import com.caimei.modules.user.entity.OperationalLogs;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class CmOperationalLogService extends CrudService<CmOperationsDao, CmOperationalLogs> {
+    @Autowired
+    CmOperationsDao cmoperationDao;
+
+
+    @Transactional(readOnly = false)
+    public List<CmOperationalLogs> findList(CmOperationalLogs cmoperationalLogs) {
+        return cmoperationDao.findList(cmoperationalLogs);
+    }
+
+    @Transactional(readOnly = false)
+    public Page<CmOperationalLogs> findPage(Page<CmOperationalLogs> page, CmOperationalLogs cmoperationalLogs) {
+        return super.findPage(page, cmoperationalLogs);
+    }
+
+    @Transactional(readOnly = false)
+    public int insert(CmOperationalLogs cmoperationalLogs) {
+        return cmoperationDao.insert(cmoperationalLogs);
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package com.caimei.modules.user.service;
+
+import com.caimei.modules.user.dao.OperationsDao;
+import com.caimei.modules.user.entity.OperationalLogs;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.service.CrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+@Service
+@Transactional(readOnly = true)
+public class SysLogService extends CrudService<OperationsDao, OperationalLogs> {
+    @Autowired
+    OperationsDao operationDao;
+
+
+    @Transactional(readOnly = false)
+    public List<OperationalLogs> findList( OperationalLogs operationalLogs) {
+        return operationDao.findList(operationalLogs);
+    }
+
+    @Transactional(readOnly = false)
+    public Page<OperationalLogs> findPage(Page<OperationalLogs> page, OperationalLogs operationalLogs) {
+        return super.findPage(page, operationalLogs);
+    }
+
+    @Transactional(readOnly = false)
+    public int insert(OperationalLogs operationalLogs) {
+        return operationDao.insert(operationalLogs);
+    }
+
+}

src/main/java/com/caimei/modules/user/utils/HttpContextUtils.java

@@ -0,0 +1,37 @@
+package com.caimei.modules.user.utils;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class HttpContextUtils {
+
+    public static HttpServletRequest getHttpServletRequest() {
+        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+    }
+    public static String getIpAddr(HttpServletRequest request) {
+        String ip = request.getHeader("x-real-ip");
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("x-forwarded-for");
+            if (ip != null) {
+                ip = ip.split(",")[0].trim();
+            }
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+
+        return ip;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.caimei.modules.user.web;
 
+import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.entity.ClubConfirmRecord;
 import com.caimei.modules.user.entity.ClubTemporary;
 import com.caimei.modules.user.service.ClubTemporaryService;
@@ -33,6 +34,8 @@ public class ClubTemporaryController extends BaseController {
     @Autowired
     private ClubTemporaryService clubTemporaryService;
 
+    public static ClubTemporary clubT;
+
     @ModelAttribute
     public ClubTemporary get(@RequestParam(required = false) String id) {
         ClubTemporary entity = null;
@@ -63,11 +66,13 @@ public class ClubTemporaryController extends BaseController {
 
 
     @RequestMapping(value = "save")
+    @OperationLogAnnotation(operType = "编辑",operModul = "进行了未确认机构编辑",oper = "1")
     public String save(ClubTemporary clubTemporary, Model model, RedirectAttributes redirectAttributes) {
         if (!beanValidator(model, clubTemporary)) {
             return form(clubTemporary, model);
         }
         clubTemporaryService.save(clubTemporary);
+        clubT=clubTemporary;
         addMessage(redirectAttributes, "保存未确认机构成功");
         return "redirect:" + Global.getAdminPath() + "/user/clubTemporary/?repage";
     }
@@ -91,6 +96,7 @@ public class ClubTemporaryController extends BaseController {
     /**
      * 保存确认注册信息
      */
+    @OperationLogAnnotation(operType = "确认注册", operModul = "确认注册")
     @RequestMapping("registerSave")
     public String registerSave(ClubTemporary clubTemporary, RedirectAttributes redirectAttributes) {
         addMessage(redirectAttributes, "确认注册成功");
@@ -116,4 +122,4 @@ public class ClubTemporaryController extends BaseController {
         model.addAttribute("clubTemporary", clubTemporary);
         return "modules/user/clubConfirmRecordList";
     }
-}
+}

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

@@ -0,0 +1,34 @@
+package com.caimei.modules.user.web;
+
+import com.caimei.modules.user.entity.CmOperationalLogs;
+import com.caimei.modules.user.service.CmOperationalLogService;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.web.BaseController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping(value = "${adminPath}/user/cmOperationalLogsShop")
+public class CmOperationalLogsController extends BaseController {
+    @Autowired
+    private CmOperationalLogService cmOperationalLogService;
+
+
+    @RequiresPermissions("cm:cmOperationalLogsShop:view")
+    @RequestMapping(value = {""})
+    public String list(CmOperationalLogs cmoperationalLogs, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CmOperationalLogs> page= cmOperationalLogService.findPage(new Page<CmOperationalLogs>(request, response), cmoperationalLogs);
+        model.addAttribute("page", page);
+        model.addAttribute("cmoperationalLogs", cmoperationalLogs);
+//        System.out.println("输出"+operational);
+
+        return "/modules/user/cmOperationalLogsShop";
+//        return "/modules/user/cmOperationalLogsShop";
+    }
+}

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

@@ -4,8 +4,9 @@ import com.caimei.constants.ShopStatus;
 import com.caimei.modules.opensearch.CoreServiceUitls;
 import com.caimei.modules.sys.utils.CmMsgUtils;
 import com.caimei.modules.sys.utils.SMSUtils;
+import com.caimei.modules.user.aop.OperationLogAnnotation;
+import com.caimei.modules.user.aop.OperationLogShop;
 import com.caimei.modules.user.dao.CmUserDao;
-import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.CmMessage;
 import com.caimei.modules.user.entity.CmOperationUser;
 import com.caimei.modules.user.entity.CmUser;
@@ -63,8 +64,11 @@ public class NewCmShopController extends BaseController {
     private CmOperationUserService cmOperationUserService;
     @Autowired
     private CmUserDao cmUserDao;
-    @Autowired
-    private NewCmShopDao newCmShopDao;
+
+    public static NewCmShop newcm;
+    public static CmUser cmus;
+    public static int id;
+    public static String auditNo;
 
     @ModelAttribute
     public NewCmShop get(@RequestParam(required = false) String id) {
@@ -87,90 +91,18 @@ public class NewCmShopController extends BaseController {
         if (null != newCmShop.getEndTime() && !"".equals(newCmShop.getEndTime()) && !newCmShop.getEndTime().endsWith("23:59:59")) {
             newCmShop.setEndTime(newCmShop.getEndTime() + " 23:59:59");
         }
-        //屏蔽特殊供应商
-        newCmShop.setShopType(1);
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
+        newcm = newCmShop;
         model.addAttribute("page", page);
         return "modules/user/newCmShopList";
     }
 
-    @RequestMapping(value = "/special/new")
-    public String specialList(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        //新品供应商
-        newCmShop.setShopType(2);
-        Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
-        model.addAttribute("page", page);
-        model.addAttribute("newCmShop",newCmShop);
-        model.addAttribute("shopType",2);
-        return "modules/user/cmNewProductShopList";
-    }
-
-    @RequestMapping(value = "/special/new/edit")
-    public String specialEdit(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        if(null!=newCmShop.getShopID()){
-            newCmShop.setSplitCodes(newCmShopDao.findSplitCode(newCmShop.getShopID()));
-        }
-        model.addAttribute("newCmShop",newCmShop);
-        return "modules/user/cmNewProductShopEdit";
-    }
-
-    @RequestMapping(value = "/special/new/save")
-    public String specialSave(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        newCmShopService.saveSpecial(newCmShop);
-        if(2==newCmShop.getShopType()){
-            model.addAttribute("newCmShop",newCmShop);
-            model.addAttribute("shopType",2);
-            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
-        }else{
-            model.addAttribute("newCmShop",newCmShop);
-            model.addAttribute("shopType",3);
-            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
-        }
-    }
-
-    @RequestMapping(value = "/special/offline")
-    public String specialOffline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        //下线
-        newCmShopService.offline(newCmShop);
-        if(2==newCmShop.getShopType()){
-            model.addAttribute("shopType",2);
-            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
-        }else{
-            model.addAttribute("shopType",3);
-            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
-        }
-    }
-
-    @RequestMapping(value = "/special/online")
-    public String specialOnline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        //上线
-        newCmShopService.online(newCmShop);
-        if(2==newCmShop.getShopType()){
-            model.addAttribute("shopType",2);
-            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
-        }else{
-            model.addAttribute("shopType",3);
-            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
-        }
-    }
-
-    @RequestMapping(value = "/special/second")
-    public String secondList(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        //二手供应商
-        newCmShop.setShopType(3);
-        Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
-        model.addAttribute("page", page);
-        model.addAttribute("shopType",3);
-        model.addAttribute("newCmShop",newCmShop);
-        return "modules/user/cmNewProductShopList";
-    }
-
-
     @RequiresPermissions("user:newCmShop:view")
     @RequestMapping(value = "form")
     public String form(NewCmShop newCmShop, Model model) {
         //获取供应商证书信息
         newCmShop = newCmShopService.getShopcert(newCmShop);
+        newcm = newCmShop;
         model.addAttribute("newCmShop", newCmShop);
         return "modules/user/newCmShopForm";
     }
@@ -185,6 +117,7 @@ public class NewCmShopController extends BaseController {
      */
     @ResponseBody
     @RequiresPermissions("user:newCmShop:view")
+    @OperationLogShop(operType = "审核")
     @RequestMapping(value = "auditShopInfo")
     public Map<String, Object> auditShopInfo(String auditStatus, Integer shopId, Integer userId, String auditNote, Model model) {
         Map<String, Object> map = new HashedMap();
@@ -195,6 +128,7 @@ public class NewCmShopController extends BaseController {
             String manufacturerStatus = "";
             String smsMessage = "";
             CmUser companyUser = cmUserService.get(userId + "");
+            cmus = companyUser;
             String mobile = companyUser.getBindMobile();
             if (StringUtils.equals("1", auditStatus)) {
                 manufacturerStatus = "90";
@@ -204,6 +138,7 @@ public class NewCmShopController extends BaseController {
                 manufacturerStatus = "92";
                 smsMessage = "很遗憾，您的资料信息有误，未通过审核，请登录采美修改资料信息。";
             }
+            auditNo = auditStatus;
             // 更新用户信息
             newCmShopService.updateUserAudit(auditStatus, auditNote, format, manufacturerStatus, userId, "1");
             // 更新供应商信息
@@ -368,6 +303,7 @@ public class NewCmShopController extends BaseController {
      */
     @RequiresPermissions("user:newCmShop:edit")
     @ResponseBody
+    @OperationLogShop(operType = "修改密码", operModul = "修改密码")
     @RequestMapping(value = "updatePwd")
     public Map<String, Object> updatePwd(String password, String id, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> map = Maps.newLinkedHashMap();
@@ -375,6 +311,7 @@ public class NewCmShopController extends BaseController {
             CmUser cmUser = cmUserService.get(id);
             cmUser.setPassword(MD5Util.MD5(password));
             cmUserService.update(cmUser);
+            cmus = cmUser;
             map.put("success", true);
             map.put("msg", "修改成功");
         } catch (Exception e) {
@@ -444,11 +381,13 @@ public class NewCmShopController extends BaseController {
      * @return
      */
     @RequestMapping(value = "online")
+    @OperationLogShop(operType = "更改状态", operModul = "设置为上线")
     @RequiresPermissions("user:newCmShop:edit")
     public String onLine(NewCmShop newCmShop, Model model, RedirectAttributes redirectAttributes) {
         Integer userID = newCmShop.getUserID();
         cmUserService.updateUserStatus("90", userID, "1");
         newCmShopService.updateShopStatus("90", userID);
+        id = newCmShop.getUserID();
         addMessage(redirectAttributes, "供应商上线成功");
         return "redirect:" + Global.getAdminPath() + "/user/newCmShop/";
     }
@@ -462,17 +401,20 @@ public class NewCmShopController extends BaseController {
      * @return
      */
     @RequestMapping(value = "offline")
+    @OperationLogShop(operType = "更改状态", operModul = "设置为下线")
     @RequiresPermissions("user:newCmShop:edit")
     public String offLine(NewCmShop newCmShop, Model model, RedirectAttributes redirectAttributes) {
         Integer userID = newCmShop.getUserID();
         cmUserService.updateUserStatus("91", userID, "0");
         newCmShopService.updateShopStatus("91", userID);
+        id = newCmShop.getUserID();
         addMessage(redirectAttributes, "供应商下线成功");
         return "redirect:" + Global.getAdminPath() + "/user/newCmShop/";
     }
 
 
     @RequiresPermissions("user:newCmShop:edit")
+    @OperationLogShop(operType = "编辑")
     @RequestMapping(value = "save")
     public String save(NewCmShop newCmShop, Model model, RedirectAttributes redirectAttributes) {
         if (!beanValidator(model, newCmShop)) {

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

@@ -0,0 +1,36 @@
+package com.caimei.modules.user.web;
+
+import com.caimei.modules.user.entity.OperationalLogs;
+import com.caimei.modules.user.service.SysLogService;
+import com.thinkgem.jeesite.common.persistence.Page;
+import com.thinkgem.jeesite.common.web.BaseController;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Controller
+@RequestMapping(value = "${adminPath}/user/cmOperational")
+public class OperationalLogsController extends BaseController {
+
+    @Autowired
+    private SysLogService sysLogService;
+
+
+    @RequiresPermissions("cm:cmOperationalLogs:view")
+    @RequestMapping(value = {""})
+    public String list(OperationalLogs operationalLogs, HttpServletRequest request, HttpServletResponse response, Model model) {
+//        List<OperationalLogs> operational = sysLogService.findList(new OperationalLogs());
+        Page<OperationalLogs> page= sysLogService.findPage(new Page<OperationalLogs>(request, response), operationalLogs);
+        model.addAttribute("page", page);
+        model.addAttribute("operationalLogs", operationalLogs);
+//        System.out.println("输出"+operational);
+
+        return "/modules/user/cmOperationalLogs";
+//        return "modules/user/cmOperationalLogs";
+    }
+}

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

@@ -8,6 +8,7 @@ import com.caimei.modules.project.model.ServiceProviderModel;
 import com.caimei.modules.sys.utils.CmMsgUtils;
 import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.sys.utils.UploadImageUtils;
+import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.entity.*;
 import com.caimei.modules.user.service.*;
 import com.caimei.utils.AppKeys;
@@ -46,6 +47,7 @@ import java.util.*;
  * @author zcp
  * @version 2018-05-21
  */
+
 @Controller
 @RequestMapping(value = "${adminPath}/new/user/agency")
 public class AgencyController extends BaseController {
@@ -73,6 +75,12 @@ public class AgencyController extends BaseController {
     @Autowired
     private CmOperationUserService cmOperationUserService;
 
+    public static NewCmClub newCm;
+    public static CmClubinfo cmClu;
+    public static CmUser cmUs;
+    public static  String types;
+    public static NewCmSp newCms;
+
     @ModelAttribute
     public NewCmClub get(@RequestParam(required = false) String id) {
         NewCmClub entity = null;
@@ -134,6 +142,7 @@ public class AgencyController extends BaseController {
 
         Page<NewCmClub> page = newCmClubService.findPage(new Page<NewCmClub>(request, response, 20), newCmClub);
         model.addAttribute("newCmClub", newCmClub);
+        newCm = newCmClub;
         model.addAttribute("page", page);
         return "modules/userNew/cmAgencyList";
     }
@@ -188,6 +197,7 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "online")
+    @OperationLogAnnotation(operType = "更改状态",operModul = "设置为已上线")
     @RequiresPermissions("user:newCmClub:edit")
     public String onLine(NewCmClub newCmClub, Model model, RedirectAttributes redirectAttributes) {
         Integer companyUserID = newCmClub.getUserID();
@@ -196,6 +206,7 @@ public class AgencyController extends BaseController {
             cmUser.setClubStatus(ClubStatus.ONLINE.getCode() + "");
             cmUser.setValidFlag(AppKeys.FLAG_YES);//解除冻结
             cmUser.setUserPermission(2);
+            cmUs=cmUser;
             //更新所有企业员工状态
             cmUserService.updateEmployeeStatus(null, ClubStatus.ONLINE.getCode() + "", null, "1", companyUserID);
             //更新所有审核过的企业员工权限
@@ -229,6 +240,7 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "offline")
+    @OperationLogAnnotation(operType = "更改状态",operModul = "设置为已下线")
     @RequiresPermissions("user:newCmClub:edit")
     public String offLine(NewCmClub newCmClub, Model model, RedirectAttributes redirectAttributes) {
         Integer companyUserID = newCmClub.getUserID();
@@ -237,6 +249,7 @@ public class AgencyController extends BaseController {
             cmUser.setClubStatus(ClubStatus.FREEZE.getCode() + "");
             cmUser.setValidFlag(AppKeys.FLAG_NO);//冻结
             cmUser.setUserPermission(0);
+            cmUs=cmUser;
             //更新所有企业员工状态 设置未提示
             cmUserService.updateEmployeeStatus(1, ClubStatus.ONLINE.getCode() + "", null, "0", companyUserID);
             cmUserService.update(cmUser);
@@ -275,6 +288,7 @@ public class AgencyController extends BaseController {
         CmClubinfo cmClubinfo = new CmClubinfo();
         cmClubinfo.setClubID(Integer.parseInt(newCmClub.getId()));
         List<CmClubinfo> cmClubinfos = cmClubinfoService.findList(cmClubinfo);
+
         if (null != cmClubinfos && cmClubinfos.size() > 0) {
             cmClubinfo = cmClubinfos.get(0);
         }
@@ -298,6 +312,8 @@ public class AgencyController extends BaseController {
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());
         cmClubinfo.setContractEmail(newCmClub.getContractEmail());
         cmClubinfo.setLinkManIdentity(newCmClub.getLinkManIdentity());
+        newCm = newCmClub;
+        cmClu = cmClubinfo;
 
         model.addAttribute("cmClubinfo", cmClubinfo);
         model.addAttribute("newCmClub", newCmClub);
@@ -319,6 +335,7 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "save")
+    @OperationLogAnnotation(operType = "编辑")
     @RequiresPermissions("user:newCmClub:edit")
     public String save(NewCmClub newCmClub, CmClubinfo cmClubinfo, Model model, RedirectAttributes redirectAttributes) {
         String name = cmClubinfo.getName();
@@ -424,6 +441,7 @@ public class AgencyController extends BaseController {
      */
     @RequiresPermissions("user:newCmClub:edit")
     @ResponseBody
+    @OperationLogAnnotation(operType = "更换协销")
     @RequestMapping(value = "changeSp")
     public Map<String, Object> changeSp(String spID, String clubID, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> map = Maps.newLinkedHashMap();
@@ -442,6 +460,8 @@ public class AgencyController extends BaseController {
                 clubChangeSp.setApplyTime(new Date());
                 clubChangeSp.setCheckStatus("0");
                 clubChangeSpReviewService.save(clubChangeSp);
+                newCm=newCmClub;
+                newCms=newCmSp;
                 map.put("success", true);
                 map.put("msg", "操作成功");
             } else {
@@ -467,11 +487,13 @@ public class AgencyController extends BaseController {
      */
     @RequiresPermissions("user:newCmClub:edit")
     @ResponseBody
+    @OperationLogAnnotation(operType = "修改密码", operModul = "修改密码")
     @RequestMapping(value = "updatePwd")
     public Map<String, Object> updatePwd(String password, String id, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> map = Maps.newLinkedHashMap();
         try {
             CmUser cmUser = cmUserService.get(id);
+            cmUs = cmUser;
             cmUser.setPassword(MD5Util.MD5(password));
             cmUserService.update(cmUser);
             map.put("success", true);
@@ -496,6 +518,7 @@ public class AgencyController extends BaseController {
      */
     @RequiresPermissions("user:newCmClub:edit")
     @ResponseBody
+    @OperationLogAnnotation(operType = "审核")
     @RequestMapping(value = "auditClub")
     public Map<String, Object> auditClub(String auditStatus, String auditNote, String id, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> map = Maps.newLinkedHashMap();
@@ -547,6 +570,7 @@ public class AgencyController extends BaseController {
             companyUser.setAuditTime(currTime);
             newCmClubService.update(newCmClub);
             cmUserService.update(companyUser);
+            cmUs=companyUser;
             //直接注册成为企业机构 或 升级成为机构
             if (CollectionUtils.isNotEmpty(cmUsers)) {
                 //个人用户升级成为企业机构
@@ -638,6 +662,7 @@ public class AgencyController extends BaseController {
      * @return
      */
     @ResponseBody
+    @OperationLogAnnotation(operType = "设置机构类别")
     @RequestMapping("/upgradeClub")
     public Map<String, Object> upgradeClub(NewCmClub cmClub, String type, RedirectAttributes redirectAttributes) {
         Map<String, Object> map = new HashMap<>();
@@ -667,11 +692,14 @@ public class AgencyController extends BaseController {
                 cmUser.setClubStatus("90");
             }
             cmUserService.update(cmUser);
+            cmUs=cmUser;
+            types=type;
             if (cmClub.getStatus() != 90) {
                 cmClub.setStatus(90);
                 newCmClubService.update(cmClub);
             }
         }
+
         addMessage(redirectAttributes, "操作成功");
         map.put("success", true);
         map.put("msg", "操作成功");

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.user.dao.CmOperationsDao">
+
+
+    <select id="findList" resultType="com.caimei.modules.user.entity.CmOperationalLogs">
+        SELECT institutionName, Contact, operationtype, Actioncontent, Operator, Operationtime
+        FROM `cm_operational_logs`
+
+        <where>
+            <if test="institutionName != null and institutionName != ''">
+                AND institutionName = #{institutionName}
+            </if>
+            <if test="Contact != null and Contact != ''">
+                AND Contact = #{Contact}
+            </if>
+            <if test="operationtype != null and operationtype != ''">
+                AND operationtype = #{operationtype}
+            </if>
+            <if test="Operationtime != null and Operationtime != ''">
+                AND Operationtime = #{Operationtime}
+            </if>
+        </where>
+        order by Operationtime desc
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+        </choose>
+    </select>
+
+
+    <insert id="insert" parameterType="com.caimei.modules.user.entity.CmOperationalLogs" keyProperty="id"
+            useGeneratedKeys="true">
+        INSERT INTO cm_operational_logs
+        (institutionName,
+         Contact,
+         operationtype,
+         Actioncontent,
+         Operator,
+         Operationtime)
+        VALUES (#{institutionName},
+                #{Contact},
+                #{operationtype},
+                #{Actioncontent},
+                #{Operator},
+                #{Operationtime})
+    </insert>
+
+</mapper>

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.user.dao.OperationsDao">
+
+
+    <select id="findList" resultType="com.caimei.modules.user.entity.OperationalLogs">
+        SELECT institutionName, Contact, operationtype, Actioncontent, Operator, Operationtime
+        FROM `operational_logs`
+
+        <where>
+            <if test="institutionName != null and institutionName != ''">
+                AND institutionName = #{institutionName}
+            </if>
+            <if test="Contact != null and Contact != ''">
+                AND Contact = #{Contact}
+            </if>
+            <if test="operationtype != null and operationtype != ''">
+                AND operationtype = #{operationtype}
+            </if>
+            <if test="Operationtime != null and Operationtime != ''">
+                AND Operationtime = #{Operationtime}
+            </if>
+        </where>
+        order by Operationtime desc
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+        </choose>
+    </select>
+
+
+    <insert id="insert" parameterType="com.caimei.modules.user.entity.OperationalLogs" keyProperty="id"
+            useGeneratedKeys="true">
+        INSERT INTO operational_logs
+        (institutionName,
+         Contact,
+         operationtype,
+         Actioncontent,
+         Operator,
+         Operationtime)
+        VALUES (#{institutionName},
+                #{Contact},
+                #{operationtype},
+                #{Actioncontent},
+                #{Operator},
+                #{Operationtime})
+    </insert>
+
+</mapper>

src/main/webapp/WEB-INF/views/modules/newhome/announcementForm.jsp

@@ -219,15 +219,8 @@
         var bx3=document.getElementById("bx3");
         var bx4=document.getElementById("bx4");
         var bx5=document.getElementById("bx5");
-        if(capacity==0){
-            bx2.style.display="block";
-            bx3.style.display="block";
-            bx4.style.display="block";
-            bx5.style.display="block";
-            return false;
-        }
 
-        if(title==0){
+        if(title==0 && capacity==0){
             bx2.style.display="block";
             bx3.style.display="block";
             bx4.style.display="block";

src/main/webapp/WEB-INF/views/modules/newhome/announcementList.jsp

@@ -92,13 +92,12 @@
             <td>
                 <a href="${ctx}/newhome/Announcement/form?id=${cmop.id}">编辑</a>
                 <c:if test="${cmop.state==2}">
-                    <a href="${ctx}/newhome/Announcement/online?id=${cmop.id}">上线</a>
+                    <a href="javascript:void(0);" onclick="offline(${cmop.id})">上线</a>
                 </c:if>
                 <c:if test="${cmop.state==1}">
-                    <a href="${ctx}/newhome/Announcement/line?id=${cmop.id}">下线</a>
+                    <a href="javascript:void(0);" onclick="offlines(${cmop.id})">下线</a>
                 </c:if>
-
-                <a href="${ctx}/newhome/Announcement/detele?id=${cmop.id}">删除</a>
+                <a href="javascript:void(0);" onclick="offliney(${cmop.id})">删除</a>
             </td>
         </tr>
     </c:forEach>
@@ -107,6 +106,28 @@
 <div class="pagination">${page}</div>
 <script type="text/javascript" language="javascript">
 
+    function offline(userId) {
+        $.jBox.confirm("确定上线该供应商吗?","提示",function(v,h,f){
+            if(v === 1){
+                window.location.href="${ctx}/newhome/Announcement/online?id="+userId;
+            }
+        } ,{ buttons: {  '确定': 1,'取消':2}});
+    }
+
+    function offlines(userId) {
+        $.jBox.confirm("确定下线该供应商吗?","提示",function(v,h,f){
+            if(v === 1){
+                window.location.href="${ctx}/newhome/Announcement/line?id="+userId;
+            }
+        } ,{ buttons: {  '确定': 1,'取消':2}});
+    }
+    function offliney(userId) {
+        $.jBox.confirm("确定删除该供应商吗?","提示",function(v,h,f){
+            if(v === 1){
+                window.location.href="${ctx}/newhome/Announcement/detele?id="+userId;
+            }
+        } ,{ buttons: {  '确定': 1,'取消':2}});
+    }
 </script>
 </body>
 </html>

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

@@ -1,5 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
 	<title>未确认机构管理</title>
@@ -398,6 +398,7 @@
 <form:form id="inputForm" modelAttribute="clubTemporary" action="${ctx}/user/clubTemporary/save" method="post" class="form-horizontal">
 <form:hidden path="id"/>
 <form:hidden path="userId" id="userId"/>
+
 <div style="max-width:1200px;padding:15px;">
 	<table border="0" cellspacing="0" cellpadding="0" width="100%">
 		<tr height="28">
@@ -406,7 +407,7 @@
 		</tr>
 		<tr height="28">
 			<th width="12%">机构名称：</th>
-			<td width="13%"><form:input path="name" htmlEscape="false" maxlength="20" class="input-medium"/></td>
+			<td width="13%"><form:input id="name" path="name" htmlEscape="false" maxlength="20" class="input-medium"/></td>
 			<th width="12%">机构简称：</th>
 			<td width="13%"><form:input path="shortName" htmlEscape="false" maxlength="20" class="input-medium"/></td>
 			<th width="12%">注册邮箱：</th>

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

@@ -24,6 +24,7 @@
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/new/user/agency/">机构列表</a></li>
 		<li class="active"><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
+		<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 	</ul>
 	<form:form id="searchForm" modelAttribute="clubTemporary" action="${ctx}/user/clubTemporary/" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

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

@@ -0,0 +1,101 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>操作日志</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
+        }
+    </script>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/new/user/agency/">机构列表</a></li>
+    <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
+    <li class="active"><a href="${ctx}/user/cmOperational/">操作日志</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="operationalLogs" action="${ctx}/user/cmOperational/" method="post"
+           class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
+        <label>机构名称：</label>
+        <input name="institutionName" maxlength="50" class="input-medium"/>
+        <label>联系人：</label>
+        <input name="Contact" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <label>机构类别：</label>
+            <select name="operationtype" class="input-medium">
+                <option selected value="">全部</option>
+                <option value="编辑">编辑</option>
+                <option value="重置密码">重置密码</option>
+                <option value="更换协销">更换协销</option>
+                <option value="审核">审核</option>
+                <option value="设置机构类别">设置机构类别</option>
+                <option value="确认注册">确认注册</option>
+                <option value="更改状态">更改状态</option>
+            </select>
+
+        <label>操作时间：</label>
+        <input name="Operationtime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+               value="${clubTemporary.startTime}"
+               onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+        &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+        <div class="clearfix"></div>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>机构名称</th>
+        <th>联系人</th>
+        <th>操作类型</th>
+        <th>操作类容</th>
+        <th>操作人</th>
+        <th>操作时间</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="cmop">
+        <tr>
+            <td>
+                    ${empty cmop.institutionName ? "------" : cmop.institutionName}
+            </td>
+            <td>
+                    ${empty cmop.contact ? "________" : cmop.contact}
+            </td>
+            <td>
+                    ${empty cmop.operationtype ? "_______" : cmop.operationtype}
+            </td>
+            <td>
+                    ${empty cmop.actioncontent ? "------" : cmop.actioncontent}
+            </td>
+            <td>${empty cmop.operator ? "------" : cmop.operator}</td>
+            <td>
+                <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd"/>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+</body>
+</html>

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

@@ -0,0 +1,98 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<html>
+<head>
+    <title>操作日志</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
+        }
+    </script>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li class="active"><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
+    <li class="active"><a href="${ctx}/user/cmOperationalShop/">操作日志</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="cmoperationalLogs" action="${ctx}/user/cmOperationalLogsShop/" method="post"
+           class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
+        <label>机构名称：</label>
+        <input name="institutionName" maxlength="50" class="input-medium"/>
+        <label>联系人：</label>
+        <input name="Contact" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <label>机构类别：</label>
+            <select name="operationtype" class="input-medium">
+                <option selected value="">全部</option>
+                <option value="编辑">编辑</option>
+                <option value="重置密码">重置密码</option>
+                <option value="审核">审核</option>
+                <option value="更改状态">更改状态</option>
+            </select>
+
+        <label>操作时间：</label>
+        <input name="Operationtime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+               value="${clubTemporary.startTime}"
+               onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+        &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+        <div class="clearfix"></div>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>机构名称</th>
+        <th>联系人</th>
+        <th>操作类型</th>
+        <th>操作类容</th>
+        <th>操作人</th>
+        <th>操作时间</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="cmop">
+        <tr>
+            <td>
+                    ${empty cmop.institutionName ? "------" : cmop.institutionName}
+            </td>
+            <td>
+                    ${empty cmop.contact ? "________" : cmop.contact}
+            </td>
+            <td>
+                    ${empty cmop.operationtype ? "_______" : cmop.operationtype}
+            </td>
+            <td>
+                    ${empty cmop.actioncontent ? "------" : cmop.actioncontent}
+            </td>
+            <td>${empty cmop.operator ? "------" : cmop.operator}</td>
+            <td>
+                <fmt:formatDate value="${cmop.operationtime}" pattern="yyyy-MM-dd"/>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+</body>
+</html>

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

@@ -8,116 +8,116 @@
 		.table th{text-align: center;}
 		.table td{text-align: center;}
 	</style>
-    <style>
-        .modal{
-            width: 900px;
-            margin-left: -450px;
-        }
-        #medicalPracticeLicenseImg1Preview,#medicalPracticeLicenseImg2Preview,#medicalPracticeLicenseImg3Preview{
-            display: inline-block;
-        }
+	<style>
+		.modal{
+			width: 900px;
+			margin-left: -450px;
+		}
+		#medicalPracticeLicenseImg1Preview,#medicalPracticeLicenseImg2Preview,#medicalPracticeLicenseImg3Preview{
+			display: inline-block;
+		}
 
-        .reg-row .new-tag.active {
-            border: 1px solid #de5801;
-        }
-        .reg-row {
-            margin-bottom: 20px;
-        }
-        .reg-row .reg-label {
-            display: inline-block;
-            width: 120px;
-            text-align: right;
-            font-size: 13px;
-        }
-        .the-oradio {
-            display: inline-block;
-            vertical-align: top;
-        }
-        .the-oradio div {
-            width: 85px;
-            display: inline-block;
-            font-size: 12px;
-            color: #666;
-            /* margin-right: 25px; */
-        }
-        .the-oradio div input[type="radio"] {
-            width: 17px;
-            height: 17px;
-            margin-right: 5px;
-            vertical-align: text-top;
-        }
-        .med-option {
-            display: block;
-            margin: 10px 0 0 125px;
-        }
+		.reg-row .new-tag.active {
+			border: 1px solid #de5801;
+		}
+		.reg-row {
+			margin-bottom: 20px;
+		}
+		.reg-row .reg-label {
+			display: inline-block;
+			width: 120px;
+			text-align: right;
+			font-size: 13px;
+		}
+		.the-oradio {
+			display: inline-block;
+			vertical-align: top;
+		}
+		.the-oradio div {
+			width: 85px;
+			display: inline-block;
+			font-size: 12px;
+			color: #666;
+			/* margin-right: 25px; */
+		}
+		.the-oradio div input[type="radio"] {
+			width: 17px;
+			height: 17px;
+			margin-right: 5px;
+			vertical-align: text-top;
+		}
+		.med-option {
+			display: block;
+			margin: 10px 0 0 125px;
+		}
 		.smed-option{
 			margin: 20px 0 20px 123px;
 			display: block;
 		}
-        .reg-row .business-license {
-            position: relative;
-            display: inline-block;
-            width: 166px;
-            height: 123px;
-            border-radius: 6px;
-            margin: 18px 0 0 125px;
-        }
-        #medicalPracticeLicenseImgPreview{
-            display: inline-block;
-        }
-        .qualification{
-            margin-top: 20px;
-        }
-        .reg-row .tags-area {
-            display: inline-block;
-            width: 420px;
-        }
-        .reg-row .new-tag {
-            display: inline-block;
-            width: 70px;
-            /*height: 26px;*/
-            border: 1px solid #e5e5e5;
-            border-radius: 6px;
-            padding: 5px;
-            margin-right: 14px;
-            margin-bottom: 14px;
-            text-align: center;
-            font-size: 10px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            cursor: pointer;
-        }
-        .reg-row .tags-operate {
-            margin-left: 125px;
-        }
-        .reg-row .reg-input {
-            width: 336px;
-            height: 32px;
-            padding: 0 8px;
-            margin-right: 20px;
-            border: 1px solid #dcdcdc;
-            border-radius: 6px;
-        }
-        .reg-row .tags-operate .tag-input {
-            width: 159px;
-            margin-right: 13px;
-            display: none;
-            vertical-align: top;
-        }
-        .reg-row .tags-operate .tag-add {
-            /*height: 32px;*/
-            line-height: 20px;
-            vertical-align: middle;
-            margin-bottom: 0;
-            vertical-align: top;
-        }
-        .reg-row .tags-area{
-            vertical-align: top;
-        }
-        .tag-add {
-            display: none;
-        }
+		.reg-row .business-license {
+			position: relative;
+			display: inline-block;
+			width: 166px;
+			height: 123px;
+			border-radius: 6px;
+			margin: 18px 0 0 125px;
+		}
+		#medicalPracticeLicenseImgPreview{
+			display: inline-block;
+		}
+		.qualification{
+			margin-top: 20px;
+		}
+		.reg-row .tags-area {
+			display: inline-block;
+			width: 420px;
+		}
+		.reg-row .new-tag {
+			display: inline-block;
+			width: 70px;
+			/*height: 26px;*/
+			border: 1px solid #e5e5e5;
+			border-radius: 6px;
+			padding: 5px;
+			margin-right: 14px;
+			margin-bottom: 14px;
+			text-align: center;
+			font-size: 10px;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			cursor: pointer;
+		}
+		.reg-row .tags-operate {
+			margin-left: 125px;
+		}
+		.reg-row .reg-input {
+			width: 336px;
+			height: 32px;
+			padding: 0 8px;
+			margin-right: 20px;
+			border: 1px solid #dcdcdc;
+			border-radius: 6px;
+		}
+		.reg-row .tags-operate .tag-input {
+			width: 159px;
+			margin-right: 13px;
+			display: none;
+			vertical-align: top;
+		}
+		.reg-row .tags-operate .tag-add {
+			/*height: 32px;*/
+			line-height: 20px;
+			vertical-align: middle;
+			margin-bottom: 0;
+			vertical-align: top;
+		}
+		.reg-row .tags-area{
+			vertical-align: top;
+		}
+		.tag-add {
+			display: none;
+		}
 		#myModal2{display: none;}
 		.modal-body{
 			max-height: 300px !important;
@@ -126,34 +126,34 @@
 			top: 0 !important;
 		}
 		#auditBox .auditCheckBox {
-            width: 250px;
-            margin: 0 auto;
-        }
+			width: 250px;
+			margin: 0 auto;
+		}
 
-        #auditBox .auditCheckBox label {
-            margin: 0 5px 5px 0
-        }
+		#auditBox .auditCheckBox label {
+			margin: 0 5px 5px 0
+		}
 
-        #auditBox .auditCheckBox input {
-            display: none;
-        }
+		#auditBox .auditCheckBox input {
+			display: none;
+		}
 
-        #auditBox .auditCheckBox input + span {
-            display: inline-block;
-            line-height: 24px;
-            padding: 1px 6px;
-            border: 1px solid #666;
-            border-radius: 5px;
-        }
+		#auditBox .auditCheckBox input + span {
+			display: inline-block;
+			line-height: 24px;
+			padding: 1px 6px;
+			border: 1px solid #666;
+			border-radius: 5px;
+		}
 		.auditNote{
 			width: 250px;
 			height: 50px;
 			margin: 0 auto;
 		}
-        #auditBox .auditCheckBox input:checked + span {
-            background-color: #E6633A
-        }
-    </style>
+		#auditBox .auditCheckBox input:checked + span {
+			background-color: #E6633A
+		}
+	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
 
@@ -162,41 +162,42 @@
 			$("#pageNo").val(n);
 			$("#pageSize").val(s);
 			$("#searchForm").submit();
-        	return false;
-        }
+			return false;
+		}
 	</script>
 
 </head>
 <body>
 <ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
-<%--		<shiro:hasPermission name="user:newCmShop:edit"><li><a href="${ctx}/user/newCmShop/form">供应商信息添加</a></li></shiro:hasPermission>--%>
+	<li class="active"><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
+	<li class="active"><a href="${ctx}/user/cmOperationalLogsShop/">操作日志</a></li>
+	<%--		<shiro:hasPermission name="user:newCmShop:edit"><li><a href="${ctx}/user/newCmShop/form">供应商信息添加</a></li></shiro:hasPermission>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 	<div class="ul-form">
-        <div class="flex-wrap">
+		<div class="flex-wrap">
 			<div class="item">
-				 <label>公司名称：</label>
-					<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-            </div>
+				<label>公司名称：</label>
+				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
+			</div>
 			<div class="item">
-				 <label>  状态：</label>
+				<label>  状态：</label>
 				<form:select path="status" class="input-medium">
 					<form:option value="" label="请选择"/>
 					<form:options items="${fns:getDictList('shop_status')}" itemLabel="label" itemValue="value"
 								  htmlEscape="false"/>
 				</form:select>
-				 <label>手机号：</label>
-					<form:input path="contractMobile" htmlEscape="false" maxlength="100" class="input-medium"/>
-            </div>
+				<label>手机号：</label>
+				<form:input path="contractMobile" htmlEscape="false" maxlength="100" class="input-medium"/>
+			</div>
 			<div class="item">
-				 <label>联系人：</label>
+				<label>联系人：</label>
 				<form:input path="linkMan" htmlEscape="false" maxlength="100" class="input-medium"/>
 				<label>邮箱：</label>
 				<form:input path="email" htmlEscape="false" maxlength="100" class="input-medium"/>
-            </div>
+			</div>
 			<div class="item">
 				<label>注册来源：</label>
 				<form:select path="source" class="input-medium">
@@ -204,13 +205,13 @@
 					<form:option value="0" label="网站"/>
 					<form:option value="1" label="小程序"/>
 				</form:select>
-				 <label>注册时间：</label>
+				<label>注册时间：</label>
 				<form:input path="startTime" type="text" maxlength="20" class="input-mini Wdate" value="${startTime}"
 							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 				-
 				<form:input path="endTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
 							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-            </div>
+			</div>
 			<div class="item">
 				&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			</div>
@@ -219,618 +220,614 @@
 </form:form>
 <sys:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>公司名称</th>
-				<th>公司简称</th>
-				<th>联系人</th>
-				<th>手机号</th>
-				<th>邮箱</th>
-				<th>线上分帐号</th>
-				<th>注册来源</th>
-				<th>供应商状态</th>
-				<th>审核人</th>
-				<th>注册时间</th>
-				<th>审核时间</th>
-				<shiro:hasPermission name="user:newCmShop:edit"><th>操作</th></shiro:hasPermission>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="newCmShop">
-			<tr>
-				<td>
+	<thead>
+	<tr>
+		<th>公司名称</th>
+		<th>公司简称</th>
+		<th>联系人</th>
+		<th>手机号</th>
+		<th>邮箱</th>
+		<th>注册来源</th>
+		<th>供应商状态</th>
+		<th>审核人</th>
+		<th>注册时间</th>
+		<th>审核时间</th>
+		<shiro:hasPermission name="user:newCmShop:edit"><th>操作</th></shiro:hasPermission>
+	</tr>
+	</thead>
+	<tbody>
+	<c:forEach items="${page.list}" var="newCmShop">
+		<tr>
+			<td>
 					${newCmShop.name}
-				</td>
-				<td>
+			</td>
+			<td>
 					${newCmShop.sname}
-				</td>
-				<td>
+			</td>
+			<td>
 					${newCmShop.linkMan}
-				</td>
-				<td>
+			</td>
+			<td>
 					${newCmShop.contractMobile}
-				</td>
-				<td>
+			</td>
+			<td>
 					${newCmShop.email}
-				</td>
-				<td>
-					${newCmShop.splitCode}
-				</td>
-				<td>
-					<c:if test="${newCmShop.source eq 0}">
-						网站
-					</c:if>
-					<c:if test="${newCmShop.source eq 1}">
-						小程序
-					</c:if>
-				</td>
-				<td>
-							<c:if test="${newCmShop.status eq 3}">
-								<font color="black">待审核</font>
-							</c:if>
-							<c:if test="${newCmShop.status eq 90}">
-								<font color="green">已上线</font>
-							</c:if>
-							<c:if test="${newCmShop.status eq 91}">
-								<font color="red">已下线</font>
-							</c:if>
-							<c:if test="${newCmShop.status eq 92}">
-								<font color="red" <c:if test="${not empty newCmShop.auditNote}">onclick="alertx('审核未通过原因：'+'${newCmShop.auditNote}')"</c:if> style="cursor:pointer;text-decoration: underline" >审核未通过</font>
-							</c:if>
+			</td>
+			<td>
+				<c:if test="${newCmShop.source eq 0}">
+					网站
+				</c:if>
+				<c:if test="${newCmShop.source eq 1}">
+					小程序
+				</c:if>
+			</td>
+			<td>
+				<c:if test="${newCmShop.status eq 3}">
+					<font color="black">待审核</font>
+				</c:if>
+				<c:if test="${newCmShop.status eq 90}">
+					<font color="green">已上线</font>
+				</c:if>
+				<c:if test="${newCmShop.status eq 91}">
+					<font color="red">已下线</font>
+				</c:if>
+				<c:if test="${newCmShop.status eq 92}">
+					<font color="red" <c:if test="${not empty newCmShop.auditNote}">onclick="alertx('审核未通过原因：'+'${newCmShop.auditNote}')"</c:if> style="cursor:pointer;text-decoration: underline" >审核未通过</font>
+				</c:if>
 
-						<c:if test="${newCmShop.status eq 90}">
-							<a href="javascript:void(0);" onclick="offline(${newCmShop.userID})">下线</a>
-						</c:if>
-						<c:if test="${newCmShop.status eq 91}">
-							<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>
-				<td>
+				<c:if test="${newCmShop.status eq 90}">
+					<a href="javascript:void(0);" onclick="offline(${newCmShop.userID})">下线</a>
+				</c:if>
+				<c:if test="${newCmShop.status eq 91}">
+					<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>
+			<td>
 					${newCmShop.auditTime}
-				</td>
-				<shiro:hasPermission name="user:newCmShop:edit"><td>
-					<a href="${ctx}/user/newCmShop/form?id=${newCmShop.shopID}&editStatus=1">编辑</a>
-					<c:if test="${newCmShop.status eq 3 || newCmShop.status eq 92}">
-<%--						<a href="${ctx}/user/newCmShop/form?id=${newCmShop.shopID}&editStatus=2">审核</a>--%>
-						<a href="javascript:void(0)"  onclick="auditShop(${newCmShop.shopID},${newCmShop.userID},'${newCmShop.townID}','${newCmShop.address}','${newCmShop.name}','${newCmShop.linkMan}','${newCmShop.contractMobile}')"> 审核</a>
-					</c:if>
-					<c:if test="${newCmShop.status eq 90 || newCmShop.status eq 91 }">
-						<a href="javascript:void(0);" onclick="updatePwd(${newCmShop.userID})">重置密码</a>
-					</c:if>
-					<a href="${ctx}/user/newCmShop/viewOperationUser?shopID=${newCmShop.shopID}&userID=${newCmShop.userID}&name=${newCmShop.name}">查看运营人员</a>
-				</td></shiro:hasPermission>
-			</tr>
-		</c:forEach>
-		</tbody>
+			</td>
+			<shiro:hasPermission name="user:newCmShop:edit"><td>
+				<a href="${ctx}/user/newCmShop/form?id=${newCmShop.shopID}&editStatus=1">编辑</a>
+				<c:if test="${newCmShop.status eq 3 || newCmShop.status eq 92}">
+					<%--						<a href="${ctx}/user/newCmShop/form?id=${newCmShop.shopID}&editStatus=2">审核</a>--%>
+					<a href="javascript:void(0)"  onclick="auditShop(${newCmShop.shopID},${newCmShop.userID},'${newCmShop.townID}','${newCmShop.address}','${newCmShop.name}','${newCmShop.linkMan}','${newCmShop.contractMobile}')"> 审核</a>
+				</c:if>
+				<c:if test="${newCmShop.status eq 90 || newCmShop.status eq 91 }">
+					<a href="javascript:void(0);" onclick="updatePwd(${newCmShop.userID})">重置密码</a>
+				</c:if>
+				<a href="${ctx}/user/newCmShop/viewOperationUser?shopID=${newCmShop.shopID}&userID=${newCmShop.userID}&name=${newCmShop.name}">查看运营人员</a>
+			</td></shiro:hasPermission>
+		</tr>
+	</c:forEach>
+	</tbody>
 </table>
 <div class="pagination">${page}</div>
 <!-- 模态框（Modal）供应商暂存 -->
 <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="myModalLabel"></h4>
-            </div>
-            <div class="modal-body">
-                <div class="reg-row">
-                    <label class="reg-label" for=""><span class="require-xin">*</span>会所类型：</label>
-                    <div class="smedical-radio the-oradio">
-                        <div class="smed-beauty"><input  name="firstShopType" value="1" type="radio"/>医疗</div>
-                        <div class="sraw-beauty"><input  name="firstShopType" value="2" type="radio"/>非医疗</div>
-                    </div>
-                    <span class="err-tip"></span>
-                    <div class="smed-option the-oradio" style="display: none">
-                        <div class="smed-beauty"><input name="secondShopType" value="1" type="radio"/>一级器械</div>
-                        <div class="smed-beauty"><input name="secondShopType" value="2" type="radio"/>二级器械</div>
-                        <div class="smed-beauty"><input name="secondShopType" value="3" type="radio"/>三级器械</div>
-                        <div class="smed-beauty"><input name="secondShopType" value="4" type="radio"/>其他</div>
-                        <span class="err-tip"></span>
-                    </div>
-                    <div class="squalification reg-row" style="display: none">
-                        <label class="reg-label" for=""><span class="require-xin">*</span>资质：</label>
-                        <div style="display: inline-block;margin-right: 10px">
-                            <input id="medicalPracticeLicenseImg1" name="url" type="hidden" maxlength="255" class="input-xlarge ">
-                            <sys:ckfinder input="medicalPracticeLicenseImg1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-                        </div>
-                        <div class="two-up" style="display: none;margin-left: 123px;margin-right: 10px">
-                            <input id="medicalPracticeLicenseImg2" name="url" type="hidden" maxlength="255" class="input-xlarge ">
-                            <sys:ckfinder input="medicalPracticeLicenseImg2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-                        </div>
-                        <div class="there-up" style="display:none;margin-left: 123px;margin-right: 0">
-                            <input id="medicalPracticeLicenseImg3" name="url" type="hidden" maxlength="255" class="input-xlarge ">
-                            <sys:ckfinder input="medicalPracticeLicenseImg3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-                        </div>
-                        <button class="go-up">点击继续上传</button>
-                    </div>
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h4 class="modal-title" id="myModalLabel"></h4>
+			</div>
+			<div class="modal-body">
+				<div class="reg-row">
+					<label class="reg-label" for=""><span class="require-xin">*</span>会所类型：</label>
+					<div class="smedical-radio the-oradio">
+						<div class="smed-beauty"><input  name="firstShopType" value="1" type="radio"/>医疗</div>
+						<div class="sraw-beauty"><input  name="firstShopType" value="2" type="radio"/>非医疗</div>
+					</div>
+					<span class="err-tip"></span>
+					<div class="smed-option the-oradio" style="display: none">
+						<div class="smed-beauty"><input name="secondShopType" value="1" type="radio"/>一级器械</div>
+						<div class="smed-beauty"><input name="secondShopType" value="2" type="radio"/>二级器械</div>
+						<div class="smed-beauty"><input name="secondShopType" value="3" type="radio"/>三级器械</div>
+						<div class="smed-beauty"><input name="secondShopType" value="4" type="radio"/>其他</div>
+						<span class="err-tip"></span>
+					</div>
+					<div class="squalification reg-row" style="display: none">
+						<label class="reg-label" for=""><span class="require-xin">*</span>资质：</label>
+						<div style="display: inline-block;margin-right: 10px">
+							<input id="medicalPracticeLicenseImg1" name="url" type="hidden" maxlength="255" class="input-xlarge ">
+							<sys:ckfinder input="medicalPracticeLicenseImg1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+						</div>
+						<div class="two-up" style="display: none;margin-left: 123px;margin-right: 10px">
+							<input id="medicalPracticeLicenseImg2" name="url" type="hidden" maxlength="255" class="input-xlarge ">
+							<sys:ckfinder input="medicalPracticeLicenseImg2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+						</div>
+						<div class="there-up" style="display:none;margin-left: 123px;margin-right: 0">
+							<input id="medicalPracticeLicenseImg3" name="url" type="hidden" maxlength="255" class="input-xlarge ">
+							<sys:ckfinder input="medicalPracticeLicenseImg3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+						</div>
+						<button class="go-up">点击继续上传</button>
+					</div>
 
-                </div>
+				</div>
 
-                <div class="reg-row">
-                    <label class="reg-label top-label" for=""><span class="require-xin">*</span>主营内容：</label>
-                    <div class="tags-area" id="shopArea">
+				<div class="reg-row">
+					<label class="reg-label top-label" for=""><span class="require-xin">*</span>主营内容：</label>
+					<div class="tags-area" id="shopArea">
 
-                    </div>
-                    <span class="err-tip" style="display: inline-block;margin-left:-55px;"></span>
-                    <input type="hidden" name="mainpro" value="" id="sMainPro">
-                    <div class="tags-operate">
-                        <span class="new-tag tag-other" id="shopOther">其他</span>
-                        <input type="text" class="reg-input tag-input" id="shopInput" placeholder="请输入自定义品项目">
-                        <span class="new-tag tag-add" id="shopAdd">确认添加</span>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="confirm">确认</button>
-            </div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal -->
+					</div>
+					<span class="err-tip" style="display: inline-block;margin-left:-55px;"></span>
+					<input type="hidden" name="mainpro" value="" id="sMainPro">
+					<div class="tags-operate">
+						<span class="new-tag tag-other" id="shopOther">其他</span>
+						<input type="text" class="reg-input tag-input" id="shopInput" placeholder="请输入自定义品项目">
+						<span class="new-tag tag-add" id="shopAdd">确认添加</span>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+				<button type="button" class="btn btn-primary" id="confirm">确认</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal -->
 </div>
 <%--js--%>
 <script>
-    $(document).ready(function() {
+	$(document).ready(function() {
 
-        //供应商默认主营内容
-        var html='';
-        html+='<span class="new-tag up-club-tag" data-typeName="产品">产品</span>',
-		html+='<span class="new-tag up-club-tag" data-typeName="仪器">仪器</span>',
-		html+='<span class="new-tag up-club-tag" data-typeName="服务">服务</span>';
-        $('#shopArea').html(html);
-        //供应商
-        $('.smedical-radio div input[name="firstShopType"]').on('click',function () {
-            var nameval = $(this).val();
-            if(nameval == '1'){
-                $('.smed-option').show();
-            }else if(nameval == '2'){
-                $('.smed-option,.squalification,.epart').hide();
-                $('input[name="secondShopType"]').attr('checked',false);
-            }
-        });
-        //医疗二级选择
-        $('input[name="secondShopType"]').on('click',function () {
-            var nameVal = $(this).val();
-            if(nameVal == '1'){
-                $('.squalification').hide()
-            }else if(nameVal == '2'){
-                $('.squalification').hide()
-            }else if(nameVal == '3'){
-                $('.squalification').show()
-            }else if(nameVal == '4'){
-                $('.squalification').hide()
-            }
-        });
-        //点击继续上传
-        var record ='';
-        $('.go-up').on('click',function () {
-            if(record == 1){
-                if($('#medicalPracticeLicenseImg2').val() != ''){
-                    $('.there-up').css({'display':'inline-block'});
-                    record = 2
-                }else {
-                    alertx('请上传资质')
-                    _util.hideTip($('.err-tip'));
-                }
-            }else if(record == 2){
-                alertx('只需要上传三张资质');
+		//供应商默认主营内容
+		var html='';
+		html+='<span class="new-tag up-club-tag" data-typeName="产品">产品</span>',
+				html+='<span class="new-tag up-club-tag" data-typeName="仪器">仪器</span>',
+				html+='<span class="new-tag up-club-tag" data-typeName="服务">服务</span>';
+		$('#shopArea').html(html);
+		//供应商
+		$('.smedical-radio div input[name="firstShopType"]').on('click',function () {
+			var nameval = $(this).val();
+			if(nameval == '1'){
+				$('.smed-option').show();
+			}else if(nameval == '2'){
+				$('.smed-option,.squalification,.epart').hide();
+				$('input[name="secondShopType"]').attr('checked',false);
+			}
+		});
+		//医疗二级选择
+		$('input[name="secondShopType"]').on('click',function () {
+			var nameVal = $(this).val();
+			if(nameVal == '1'){
+				$('.squalification').hide()
+			}else if(nameVal == '2'){
+				$('.squalification').hide()
+			}else if(nameVal == '3'){
+				$('.squalification').show()
+			}else if(nameVal == '4'){
+				$('.squalification').hide()
+			}
+		});
+		//点击继续上传
+		var record ='';
+		$('.go-up').on('click',function () {
+			if(record == 1){
+				if($('#medicalPracticeLicenseImg2').val() != ''){
+					$('.there-up').css({'display':'inline-block'});
+					record = 2
+				}else {
+					alertx('请上传资质')
+					_util.hideTip($('.err-tip'));
+				}
+			}else if(record == 2){
+				alertx('只需要上传三张资质');
 //					$('.go-up').hide();
-            } else {
-                if($('#medicalPracticeLicenseImg1').val() != ''){
-                    $('.two-up').css({'display':'inline-block'});
-                    record = 1;
-                }else if($('#medicalPracticeLicenseImg2').val() != ''){
-                    $('.there-up').css({'display':'inline-block'});
-                    record = 2
-                }else {
-                    alertx('请上传资质')
-                    _util.hideTip($('.err-tip'));
-                    record = ''
-                }
-            }
-        });
-        //供应商品项选择
-        var opts = {
-            $tag:$('.up-shop-tag'),
-            $tagArea:$('#shopArea'),
-            $mainPro:$('#sMainPro'),
-            $other:$('#shopOther'),
-            $input:$('#shopInput'),
-            $add:$('#shopAdd'),
-            $type:'shop'
-        };
-        _util.getTags(opts);
-        $('#confirm').on('click',function () {
-            //公司类型
-            if(!$('input[name="firstShopType"]').is(':checked')){
-                $('input[name="firstShopType"]').parents('.smedical-radio').next().show().html('请选择公司类型');
-                _util.hideTip($('.err-tip'));
-                return false
-            }else if($('input[name="firstShopType"]:checked').val() == 1){
-                if(!$('input[name="secondShopType"]').is(':checked')){
-                    $('input[name="secondShopType"]').parents('.smed-option').find('.err-tip').show().html('请选择公司类型');
-                    _util.hideTip($('.err-tip'));
-                    return false
-                }
-            }
-            if($('input[name="secondShopType"]:checked').val() == 3){
-                // 会所资质
-                if($('#medicalPracticeLicenseImg1').val() == ''){
-                    alertx('请上传资质')
-                }
+			} else {
+				if($('#medicalPracticeLicenseImg1').val() != ''){
+					$('.two-up').css({'display':'inline-block'});
+					record = 1;
+				}else if($('#medicalPracticeLicenseImg2').val() != ''){
+					$('.there-up').css({'display':'inline-block'});
+					record = 2
+				}else {
+					alertx('请上传资质')
+					_util.hideTip($('.err-tip'));
+					record = ''
+				}
+			}
+		});
+		//供应商品项选择
+		var opts = {
+			$tag:$('.up-shop-tag'),
+			$tagArea:$('#shopArea'),
+			$mainPro:$('#sMainPro'),
+			$other:$('#shopOther'),
+			$input:$('#shopInput'),
+			$add:$('#shopAdd'),
+			$type:'shop'
+		};
+		_util.getTags(opts);
+		$('#confirm').on('click',function () {
+			//公司类型
+			if(!$('input[name="firstShopType"]').is(':checked')){
+				$('input[name="firstShopType"]').parents('.smedical-radio').next().show().html('请选择公司类型');
+				_util.hideTip($('.err-tip'));
+				return false
+			}else if($('input[name="firstShopType"]:checked').val() == 1){
+				if(!$('input[name="secondShopType"]').is(':checked')){
+					$('input[name="secondShopType"]').parents('.smed-option').find('.err-tip').show().html('请选择公司类型');
+					_util.hideTip($('.err-tip'));
+					return false
+				}
+			}
+			if($('input[name="secondShopType"]:checked').val() == 3){
+				// 会所资质
+				if($('#medicalPracticeLicenseImg1').val() == ''){
+					alertx('请上传资质')
+				}
 
-                if($('.two-up').css('display')!='none'){
-                    if($('#medicalPracticeLicenseImg2').val() == ''){
-                        alertx('请上传资质')
-                        return false
-                    }
-                }
-                if($('.there-up').css('display')!='none'){
-                    if($('#medicalPracticeLicenseImg3').val() == ''){
-                        alertx('请上传资质')
-                        return false
-                    }
-                }
-            }
-            if($('#sMainPro').val() == ''){
-                alertx('请选择主营内容')
-                return false
-            }
-            var params = {
-                mainpro:$('#sMainPro').val(),
-                shopID:$(this).attr('data-id'),
-                flagC:$(this).attr('data-flag')
+				if($('.two-up').css('display')!='none'){
+					if($('#medicalPracticeLicenseImg2').val() == ''){
+						alertx('请上传资质')
+						return false
+					}
+				}
+				if($('.there-up').css('display')!='none'){
+					if($('#medicalPracticeLicenseImg3').val() == ''){
+						alertx('请上传资质')
+						return false
+					}
+				}
+			}
+			if($('#sMainPro').val() == ''){
+				alertx('请选择主营内容')
+				return false
+			}
+			var params = {
+				mainpro:$('#sMainPro').val(),
+				shopID:$(this).attr('data-id'),
+				flagC:$(this).attr('data-flag')
 			};
-            if($('input[name="firstShopType"]:checked').val() == 1){
-                params.firstShopType = 1;//公司分类
-                params.secondShopType =$('input[name="secondShopType"]:checked').val();//二级分类
-                if($('input[name="secondShopType"]:checked').val() == 3){
-                    if($('#medicalPracticeLicenseImg1').val() != ''){
-                        params.medicalPracticeLicenseImg1 = $('#medicalPracticeLicenseImg1').val();//资质
-                        // if($('#medicalPracticeLicenseImg2').val() != ''){
-                        //     params.medicalPracticeLicenseImg2 = $('#qualification2').val();//资质
-                        //     if($('#medicalPracticeLicenseImg3').val() != ''){
-                        //         params.medicalPracticeLicenseImg3 = $('#qualification3').val();//资质
-                        //     }
-                        // }
-                    }
-                    if($('#medicalPracticeLicenseImg2').val() != '') {
-                        params.medicalPracticeLicenseImg2 = $('#medicalPracticeLicenseImg2').val();//资质
+			if($('input[name="firstShopType"]:checked').val() == 1){
+				params.firstShopType = 1;//公司分类
+				params.secondShopType =$('input[name="secondShopType"]:checked').val();//二级分类
+				if($('input[name="secondShopType"]:checked').val() == 3){
+					if($('#medicalPracticeLicenseImg1').val() != ''){
+						params.medicalPracticeLicenseImg1 = $('#medicalPracticeLicenseImg1').val();//资质
+						// if($('#medicalPracticeLicenseImg2').val() != ''){
+						//     params.medicalPracticeLicenseImg2 = $('#qualification2').val();//资质
+						//     if($('#medicalPracticeLicenseImg3').val() != ''){
+						//         params.medicalPracticeLicenseImg3 = $('#qualification3').val();//资质
+						//     }
+						// }
+					}
+					if($('#medicalPracticeLicenseImg2').val() != '') {
+						params.medicalPracticeLicenseImg2 = $('#medicalPracticeLicenseImg2').val();//资质
 					}
 					if($('#medicalPracticeLicenseImg3').val() != '') {
-                        params.medicalPracticeLicenseImg3 = $('#medicalPracticeLicenseImg3').val();//资质
+						params.medicalPracticeLicenseImg3 = $('#medicalPracticeLicenseImg3').val();//资质
 					}
 
-                }
-            }else {
-                params.firstShopType = 2;//公司分类
-            }
-            $.ajax({
-                type: "post",
-                url: "${ctx}/user/newCmShop/editShopType",
-                data: params,
-                success : function (res) {
-                    if(res.errcode == '1') {
-                        alertx(res.errmsg);
-                    }
-                    if(res.errcode == '0') {
-                        console.log(res.data);
-                        window.location.href = res.data;
-                    }
-                },
-                error : function (res) {
-                }
-            });
-        })
-    });
-    var _util = {
-        // 隐藏输入错误提示（参数为提示元素）
-        hideTip : function($ele){
-            setTimeout(function () {
-                $ele.hide();
-            }, 5000);
-        },
-        setTags:function (opts) {
-            var tagArr = [];
-            opts.$tagArea.find('.new-tag.active').each(function(i,v){
-                var _typeName = $(v).attr('data-typeName');
-                tagArr.push(_typeName);
-                opts.$mainPro.val(tagArr.join('/'));
-            })
-        },
-        getTags:function (opts) {
-            opts.$tagArea.on('click','.new-tag',function(){
-                var $this = $(this);
-                $this.toggleClass('active');
-                _util.setTags(opts);
-            })
-            opts.$other.on('click',function(){
-                opts.$input.css('display','inline-block');
-                opts.$add.css('display','inline-block');
-            })
-            opts.$add.on('click',function(){
-                var _tag = $.trim(opts.$input.val());
-                if(_tag){
-                    var flag = false;
-                    opts.$tagArea.find('.new-tag').each(function(i,v){
-                        var _name = $(v).attr('data-typeName');
-                        if(_tag == _name){
-                            flag=true;
-                            return false;
-                        }else{
-                            if(i==opts.$tagArea.find('.new-tag').length){
-                                flag=false;
-                            }
-                        }
+				}
+			}else {
+				params.firstShopType = 2;//公司分类
+			}
+			$.ajax({
+				type: "post",
+				url: "${ctx}/user/newCmShop/editShopType",
+				data: params,
+				success : function (res) {
+					if(res.errcode == '1') {
+						alertx(res.errmsg);
+					}
+					if(res.errcode == '0') {
+						console.log(res.data);
+						window.location.href = res.data;
+					}
+				},
+				error : function (res) {
+				}
+			});
+		})
+	});
+	var _util = {
+		// 隐藏输入错误提示（参数为提示元素）
+		hideTip : function($ele){
+			setTimeout(function () {
+				$ele.hide();
+			}, 5000);
+		},
+		setTags:function (opts) {
+			var tagArr = [];
+			opts.$tagArea.find('.new-tag.active').each(function(i,v){
+				var _typeName = $(v).attr('data-typeName');
+				tagArr.push(_typeName);
+				opts.$mainPro.val(tagArr.join('/'));
+			})
+		},
+		getTags:function (opts) {
+			opts.$tagArea.on('click','.new-tag',function(){
+				var $this = $(this);
+				$this.toggleClass('active');
+				_util.setTags(opts);
+			})
+			opts.$other.on('click',function(){
+				opts.$input.css('display','inline-block');
+				opts.$add.css('display','inline-block');
+			})
+			opts.$add.on('click',function(){
+				var _tag = $.trim(opts.$input.val());
+				if(_tag){
+					var flag = false;
+					opts.$tagArea.find('.new-tag').each(function(i,v){
+						var _name = $(v).attr('data-typeName');
+						if(_tag == _name){
+							flag=true;
+							return false;
+						}else{
+							if(i==opts.$tagArea.find('.new-tag').length){
+								flag=false;
+							}
+						}
 
-                    })
-                    if(flag){
-                        opts.$tagArea.find('.new-tag').each(function(i,v){
-                            var _name = $(v).attr('data-typeName');
-                            if(_tag == _name){
-                                $(v).addClass('active');
+					})
+					if(flag){
+						opts.$tagArea.find('.new-tag').each(function(i,v){
+							var _name = $(v).attr('data-typeName');
+							if(_tag == _name){
+								$(v).addClass('active');
 //                                layer.tips('该类型已存在',opts.$add);
-                                alertx('该类型已存在')
-                                flag=true;
-                                return false;
-                            }
+								alertx('该类型已存在')
+								flag=true;
+								return false;
+							}
 
-                        })
-                    }else{
-                        opts.$tagArea.append('<span class="new-tag up-'+opts.$type+'-tag active" data-typeName="'+_tag+'">'+_tag+'</span> ');
-                        _util.setTags(opts);
-                        opts.$input.val('');
-                        return;
-                    }
-                }
-            })
-        },
-    }
+						})
+					}else{
+						opts.$tagArea.append('<span class="new-tag up-'+opts.$type+'-tag active" data-typeName="'+_tag+'">'+_tag+'</span> ');
+						_util.setTags(opts);
+						opts.$input.val('');
+						return;
+					}
+				}
+			})
+		},
+	}
 </script>
 <script>
-    $(document).ready(function() {
-        $('.shopType').on('click',function () {
-            $('#confirm').attr('data-id',$(this).attr('data-shopID'))
-            $('#confirm').attr('data-flag',$(this).attr('data-flag'))
-            $('#myModal2').modal();
-             var that = $(this);
-            // var flag = that.attr("data-flag");
-            // $('#confirm').attr('data-flag',flag)
-            // var shopID = that.attr("data-shopID");
-            // var that = $(this);
-            var flag = that.attr("data-flag");
-            if ("0" == flag) {
-                $("#myModalLabel").html("设置分类");
-            }
-            if ("1" == flag) {
-                $("#myModalLabel").html("修改分类");
-                var json = JSON.parse($(this).attr('data-value'));
-                var firstShopType = json["firstShopType"];
-                var secondShopType = json["secondShopType"];
-                var medicalPracticeLicenseImg1 = json["medicalPracticeLicenseImg1"];
-                var medicalPracticeLicenseImg2 = json["medicalPracticeLicenseImg2"];
-                var medicalPracticeLicenseImg3 = json["medicalPracticeLicenseImg3"];
-                var mainpro = json["mainpro"];
-                if (firstShopType) {
-                    $('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').attr("checked","checked")
-                    $('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').click();
-                    if(secondShopType){
-                        $('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').attr("checked","checked")
-                        $('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').click();
-                    }
-                    if(medicalPracticeLicenseImg1){
-                        $('#medicalPracticeLicenseImg1').val(medicalPracticeLicenseImg1);
-                        $('#medicalPracticeLicenseImg1Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg1+'" />')
-                    }
-                    if(medicalPracticeLicenseImg2){
-                        $('.two-up').css({'display':'inline-block'});
-                        $('#medicalPracticeLicenseImg2').val(medicalPracticeLicenseImg2);
-                        $('#medicalPracticeLicenseImg2Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg2+'" />')
-                    }
-                    if(medicalPracticeLicenseImg3){
-                        $('.there-up').css({'display':'inline-block'});
-                        $('#medicalPracticeLicenseImg3').val(medicalPracticeLicenseImg3);
-                        $('#medicalPracticeLicenseImg3Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg3+'" />')
-                    }
+	$(document).ready(function() {
+		$('.shopType').on('click',function () {
+			$('#confirm').attr('data-id',$(this).attr('data-shopID'))
+			$('#confirm').attr('data-flag',$(this).attr('data-flag'))
+			$('#myModal2').modal();
+			var that = $(this);
+			// var flag = that.attr("data-flag");
+			// $('#confirm').attr('data-flag',flag)
+			// var shopID = that.attr("data-shopID");
+			// var that = $(this);
+			var flag = that.attr("data-flag");
+			if ("0" == flag) {
+				$("#myModalLabel").html("设置分类");
+			}
+			if ("1" == flag) {
+				$("#myModalLabel").html("修改分类");
+				var json = JSON.parse($(this).attr('data-value'));
+				var firstShopType = json["firstShopType"];
+				var secondShopType = json["secondShopType"];
+				var medicalPracticeLicenseImg1 = json["medicalPracticeLicenseImg1"];
+				var medicalPracticeLicenseImg2 = json["medicalPracticeLicenseImg2"];
+				var medicalPracticeLicenseImg3 = json["medicalPracticeLicenseImg3"];
+				var mainpro = json["mainpro"];
+				if (firstShopType) {
+					$('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').attr("checked","checked")
+					$('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').click();
+					if(secondShopType){
+						$('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').attr("checked","checked")
+						$('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').click();
+					}
+					if(medicalPracticeLicenseImg1){
+						$('#medicalPracticeLicenseImg1').val(medicalPracticeLicenseImg1);
+						$('#medicalPracticeLicenseImg1Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg1+'" />')
+					}
+					if(medicalPracticeLicenseImg2){
+						$('.two-up').css({'display':'inline-block'});
+						$('#medicalPracticeLicenseImg2').val(medicalPracticeLicenseImg2);
+						$('#medicalPracticeLicenseImg2Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg2+'" />')
+					}
+					if(medicalPracticeLicenseImg3){
+						$('.there-up').css({'display':'inline-block'});
+						$('#medicalPracticeLicenseImg3').val(medicalPracticeLicenseImg3);
+						$('#medicalPracticeLicenseImg3Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg3+'" />')
+					}
 
-                    if(mainpro){
-                        var span_ = $('#shopArea').find('span');
-                        var mainpro_ = mainpro.split('/');
-                        var html='';
-                        var defaultVal = [];
-                        var resArr = [];
-                        var html='';
-                        $('#shopArea').html('');
-                        for(var i=0; i<span_.length;i++) {
-                            defaultVal.push(span_[i].textContent);
-                        }
-                        var concatArr = defaultVal.concat(mainpro_);
-                        for(var i=0; i<concatArr.length; i++) {
-                            if(resArr.indexOf(concatArr[i]) == -1) {
-                                resArr.push(concatArr[i]);
-                                html += '<span class="new-tag up-club-tag '+concatArr[i]+'" data-typeName="'+concatArr[i]+'">'+concatArr[i]+'</span>';
-                            }
-                        }
-                        $('#shopArea').append(html);
-                        for(var i=0; i<mainpro_.length; i++) {
-                            $('.'+mainpro_[i]).addClass('active');
-                        }
-                    }
-                }
-                var spanSp = $('#shopArea').find('span');
-                console.log(spanSp)
-                spanSp.each(function (i,l) {
-                    if($(this).hasClass('active')){
-                        $('#sMainPro').val($(this).text())
-                    }
-                });
+					if(mainpro){
+						var span_ = $('#shopArea').find('span');
+						var mainpro_ = mainpro.split('/');
+						var html='';
+						var defaultVal = [];
+						var resArr = [];
+						var html='';
+						$('#shopArea').html('');
+						for(var i=0; i<span_.length;i++) {
+							defaultVal.push(span_[i].textContent);
+						}
+						var concatArr = defaultVal.concat(mainpro_);
+						for(var i=0; i<concatArr.length; i++) {
+							if(resArr.indexOf(concatArr[i]) == -1) {
+								resArr.push(concatArr[i]);
+								html += '<span class="new-tag up-club-tag '+concatArr[i]+'" data-typeName="'+concatArr[i]+'">'+concatArr[i]+'</span>';
+							}
+						}
+						$('#shopArea').append(html);
+						for(var i=0; i<mainpro_.length; i++) {
+							$('.'+mainpro_[i]).addClass('active');
+						}
+					}
+				}
+				var spanSp = $('#shopArea').find('span');
+				console.log(spanSp)
+				spanSp.each(function (i,l) {
+					if($(this).hasClass('active')){
+						$('#sMainPro').val($(this).text())
+					}
+				});
 
-            }
-        })
-    });
+			}
+		})
+	});
 
-    // 修改密码
-    function updatePwd(id) {
-        var regPwd = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/;
-        var html = "<div style='padding:20px;'><font color='red'>*</font> 新密码 ：" +
-            "<input type='password' id='newPwd' name='newPwd' rows='1' cols='12'/>" +
-            "</br><font color='red'>*</font>确认密码：" +
-            "<input type='password' id='surePwd' name='surePwd' rows='1' cols='12'/></div>";
-        var submit = function (v, h, f) {
-            // 密码
-            if (!regPwd.test(f.newPwd)) {
-                $.jBox.tip("密码需8-16位字母数字组合", 'error', {focusId: "newPwd"});
-                return false;
-            }
-            if (f.newPwd !== f.surePwd) {
-                $.jBox.tip("确认密码与登录密码不一致", 'error', {focusId: "surePwd"});
-                return false;
-            }
-            $.post("${ctx}/user/newCmShop/updatePwd", {'password': f.newPwd, 'id': id}, function (data) {
-                if (true == data.success) {
-                    $.jBox.tip(data.msg, 'info');
-                    $("#searchForm").submit();
-                } else {
-                    $.jBox.tip(data.msg, 'error');
-                }
-            }, "JSON");//这里返回的类型有：json,html,xml,text
-        };
-        $.jBox(html, {title: "确定修改密码？", submit: submit});
-    }
-    //修改手机号码
-    function updateMobile(id) {
-        var regMobile = /^1[3,4,5,6,7,8,9]\d{9}$/;
-        var html = "<div style='padding:20px;'><font color='red'>*</font> 手机号码 ：" +
-            "<input type='text' id='newMobile' name='newMobile' rows='1' cols='12'/>" +
-            "</div>";
-        var submit = function (v, h, f) {
-            // 密码
-            if (!regMobile.test(f.newMobile)) {
-                $.jBox.tip("请输入正确的手机号码", 'error', {focusId: "newMobile"});
-                return false;
-            }
-            $.post("${ctx}/user/newCmShop/updateMobile", {'mobile': f.newMobile, 'id': id}, function (data) {
-                if (true == data.success) {
-                    $.jBox.tip(data.msg, 'info');
-                    $("#searchForm").submit();
-                } else {
-                    $.jBox.tip(data.msg, 'error');
-                }
-            }, "JSON");//这里返回的类型有：json,html,xml,text
-        };
-        $.jBox(html, {title: "确定修改手机号码？", submit: submit});
-    }
+	// 修改密码
+	function updatePwd(id) {
+		var regPwd = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/;
+		var html = "<div style='padding:20px;'><font color='red'>*</font> 新密码 ：" +
+				"<input type='password' id='newPwd' name='newPwd' rows='1' cols='12'/>" +
+				"</br><font color='red'>*</font>确认密码：" +
+				"<input type='password' id='surePwd' name='surePwd' rows='1' cols='12'/></div>";
+		var submit = function (v, h, f) {
+			// 密码
+			if (!regPwd.test(f.newPwd)) {
+				$.jBox.tip("密码需8-16位字母数字组合", 'error', {focusId: "newPwd"});
+				return false;
+			}
+			if (f.newPwd !== f.surePwd) {
+				$.jBox.tip("确认密码与登录密码不一致", 'error', {focusId: "surePwd"});
+				return false;
+			}
+			$.post("${ctx}/user/newCmShop/updatePwd", {'password': f.newPwd, 'id': id}, function (data) {
+				if (true == data.success) {
+					$.jBox.tip(data.msg, 'info');
+					$("#searchForm").submit();
+				} else {
+					$.jBox.tip(data.msg, 'error');
+				}
+			}, "JSON");//这里返回的类型有：json,html,xml,text
+		};
+		$.jBox(html, {title: "确定修改密码？", submit: submit});
+	}
+	//修改手机号码
+	function updateMobile(id) {
+		var regMobile = /^1[3,4,5,6,7,8,9]\d{9}$/;
+		var html = "<div style='padding:20px;'><font color='red'>*</font> 手机号码 ：" +
+				"<input type='text' id='newMobile' name='newMobile' rows='1' cols='12'/>" +
+				"</div>";
+		var submit = function (v, h, f) {
+			// 密码
+			if (!regMobile.test(f.newMobile)) {
+				$.jBox.tip("请输入正确的手机号码", 'error', {focusId: "newMobile"});
+				return false;
+			}
+			$.post("${ctx}/user/newCmShop/updateMobile", {'mobile': f.newMobile, 'id': id}, function (data) {
+				if (true == data.success) {
+					$.jBox.tip(data.msg, 'info');
+					$("#searchForm").submit();
+				} else {
+					$.jBox.tip(data.msg, 'error');
+				}
+			}, "JSON");//这里返回的类型有：json,html,xml,text
+		};
+		$.jBox(html, {title: "确定修改手机号码？", submit: submit});
+	}
 
-    function offline(userId) {
-    	$.jBox.confirm("确定下线该供应商吗?","提示",function(v,h,f){
-    		if(v === 1){
-    			window.location.href="${ctx}/user/newCmShop/offline?userID="+userId;
-    		}
-    	} ,{ buttons: {  '确定': 1,'取消':2}});
+	function offline(userId) {
+		$.jBox.confirm("确定下线该供应商吗?","提示",function(v,h,f){
+			if(v === 1){
+				window.location.href="${ctx}/user/newCmShop/offline?userID="+userId;
+			}
+		} ,{ buttons: {  '确定': 1,'取消':2}});
 	}
 
 	function online(userId) {
 		$.jBox.confirm("确定上线该供应商吗？","提示",function(v,h,f){
-    		if(v === 1){
-    			window.location.href="${ctx}/user/newCmShop/online?userID="+userId;
-    		}
-    	} ,{ buttons: {  '确定': 1,'取消':2}});
+			if(v === 1){
+				window.location.href="${ctx}/user/newCmShop/online?userID="+userId;
+			}
+		} ,{ buttons: {  '确定': 1,'取消':2}});
 	}
 
 	/**
-* 供应商审核
-* */
-function auditShop(shopId,userId,townID,address,name,linkMan,contractMobile) {
-	if(null == townID || "" == townID || "" == address || null == address){
-		alertx("地址尚未填写，请先编辑地址再进行审核");
-		return;
-	}
-	if(null == name || "" == name){
-		alertx("公司名称尚未填写，请先编辑公司名称再进行审核");
-		return;
-	}
-	if(null == linkMan || "" == linkMan){
-		alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
-		return;
-	}
-	if(null == contractMobile || "" == contractMobile){
-		alertx("手机号尚未填写，请先编辑手机号再进行审核");
-		return;
-	}
-	var html = "<div id='auditBox'>"
-                        + "   <div class='bd-row'>"
-                        + "       <span><font color='red'>*</font>审核：</span>"
-                        + "       <select name='auditStatus' id='auditStatus'>"
-                        + "           <option value='1'>审核通过</option>"
-                        + "           <option value='2'>审核未通过</option>"
-                        + "       <select/>"
-                        + "   </div>"
-                        + "   <div id='auditNopass' style='display: none;'>"
-                        + "       <div class='bd-row'>"
-                        + "           <span><font color='red'>*</font>原因：</span>"
-                        + "           <div class='auditCheckBox'>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
-                        + "           </div>"
-                        + "       </div>"
-                        + "       <div class='bd-row'>"
-                        + "           <span></span>"
-                        + "           <div class='auditNote'>"
-                        + "               <textarea name='auditNote' placeholder='可以补充其它原因，最多50个字'></textarea>"
-                        + "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
-                        + "           </div>"
-                        + "       </div>"
-                        + "   </div>"
-                        + "</div>";
-                    var submit = function (v, h, f) {
-                        if (f.auditStatus == '') {
-                            $.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
-                            return false;
-                        } else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
-                            $.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
-                            return false;
-                        } else if (f.auditStatus == 2 && f.auditNote.length > 50) {
-                            $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
-                            return false;
-                        }
-                        var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
+	 * 供应商审核
+	 * */
+	function auditShop(shopId,userId,townID,address,name,linkMan,contractMobile) {
+		if(null == townID || "" == townID || "" == address || null == address){
+			alertx("地址尚未填写，请先编辑地址再进行审核");
+			return;
+		}
+		if(null == name || "" == name){
+			alertx("公司名称尚未填写，请先编辑公司名称再进行审核");
+			return;
+		}
+		if(null == linkMan || "" == linkMan){
+			alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
+			return;
+		}
+		if(null == contractMobile || "" == contractMobile){
+			alertx("手机号尚未填写，请先编辑手机号再进行审核");
+			return;
+		}
+		var html = "<div id='auditBox'>"
+				+ "   <div class='bd-row'>"
+				+ "       <span><font color='red'>*</font>审核：</span>"
+				+ "       <select name='auditStatus' id='auditStatus'>"
+				+ "           <option value='1'>审核通过</option>"
+				+ "           <option value='2'>审核未通过</option>"
+				+ "       <select/>"
+				+ "   </div>"
+				+ "   <div id='auditNopass' style='display: none;'>"
+				+ "       <div class='bd-row'>"
+				+ "           <span><font color='red'>*</font>原因：</span>"
+				+ "           <div class='auditCheckBox'>"
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
+				+ "           </div>"
+				+ "       </div>"
+				+ "       <div class='bd-row'>"
+				+ "           <span></span>"
+				+ "           <div class='auditNote'>"
+				+ "               <textarea name='auditNote' placeholder='可以补充其它原因，最多50个字'></textarea>"
+				+ "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
+				+ "           </div>"
+				+ "       </div>"
+				+ "   </div>"
+				+ "</div>";
+		var submit = function (v, h, f) {
+			if (f.auditStatus == '') {
+				$.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
+				return false;
+			} else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
+				$.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
+				return false;
+			} else if (f.auditStatus == 2 && f.auditNote.length > 50) {
+				$.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
+				return false;
+			}
+			var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
 
-                        $.post("${ctx}/user/newCmShop/auditShopInfo", {
-                            'auditStatus': f.auditStatus,
-                            'shopId': shopId,
-                            'userId': userId,
-                            'auditNote': auditText
-                        }, function (data) {
-                        console.log( data.success)
-                        console.log( true == data.success)
-                            if (true == data.success) {
-                                $.jBox.tip(data.msg, 'info');
-                                // $("#searchForm").submit();
-                                window.location.href = "${ctx}/user/newCmShop/";
-                            } else {
-                                $.jBox.tip(data.msg, 'error');
-                            }
-                        }, "JSON");//这里返回的类型有：json,html,xml,text
-                    };
-                    $.jBox(html, {title: "审核", submit: submit});
-}
+			$.post("${ctx}/user/newCmShop/auditShopInfo", {
+				'auditStatus': f.auditStatus,
+				'shopId': shopId,
+				'userId': userId,
+				'auditNote': auditText
+			}, function (data) {
+				console.log( data.success)
+				console.log( true == data.success)
+				if (true == data.success) {
+					$.jBox.tip(data.msg, 'info');
+					// $("#searchForm").submit();
+					window.location.href = "${ctx}/user/newCmShop/";
+				} else {
+					$.jBox.tip(data.msg, 'error');
+				}
+			}, "JSON");//这里返回的类型有：json,html,xml,text
+		};
+		$.jBox(html, {title: "审核", submit: submit});
+	}
 
-// 审核
-$(document).on("change", "#auditStatus", function () {
-			if ($("#auditStatus").val() == 2) {
-				$("#auditNopass").show();
-			} else {
-				$("#auditNopass").hide();
-			}
-});
+	// 审核
+	$(document).on("change", "#auditStatus", function () {
+		if ($("#auditStatus").val() == 2) {
+			$("#auditNopass").show();
+		} else {
+			$("#auditNopass").hide();
+		}
+	});
 
 </script>
 </body>

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

@@ -51,6 +51,7 @@
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/new/user/agency/">机构列表</a></li>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
+    <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="newCmClub" action="${ctx}/new/user/agency/" method="post"
            class="breadcrumb form-search">
@@ -128,30 +129,30 @@
     <c:forEach items="${page.list}" var="newCmClubList">
         <tr>
             <td>
-                    <c:if test="${newCmClubList.userIdentity eq 2}">
-                            ${newCmClubList.name}
+                <c:if test="${newCmClubList.userIdentity eq 2}">
+                    ${newCmClubList.name}
+                </c:if>
+                <c:if test="${newCmClubList.userIdentity eq 4}">
+                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">
+                        ${newCmClubList.name}
                     </c:if>
-                    <c:if test="${newCmClubList.userIdentity eq 4}">
-                           <c:if test="${newCmClubList.name ne newCmClubList.userName}">
-                                ${newCmClubList.name}
-                            </c:if>
-                            <c:if test="${newCmClubList.name eq newCmClubList.userName}">
-                                    --
-                            </c:if>
+                    <c:if test="${newCmClubList.name eq newCmClubList.userName}">
+                        --
                     </c:if>
+                </c:if>
             </td>
             <td>
-                    <c:if test="${newCmClubList.userIdentity eq 2}">
-                            ${newCmClubList.sname}
+                <c:if test="${newCmClubList.userIdentity eq 2}">
+                    ${newCmClubList.sname}
+                </c:if>
+                <c:if test="${newCmClubList.userIdentity eq 4}">
+                    <c:if test="${newCmClubList.sname ne newCmClubList.userName}">
+                        ${newCmClubList.sname}
                     </c:if>
-                    <c:if test="${newCmClubList.userIdentity eq 4}">
-                           <c:if test="${newCmClubList.sname ne newCmClubList.userName}">
-                                ${newCmClubList.sname}
-                            </c:if>
-                            <c:if test="${newCmClubList.sname eq newCmClubList.userName}">
-                                    --
-                            </c:if>
+                    <c:if test="${newCmClubList.sname eq newCmClubList.userName}">
+                        --
                     </c:if>
+                </c:if>
             </td>
             <td>
                     ${newCmClubList.userName}
@@ -169,15 +170,15 @@
                     <c:when test="${newCmClubList.status eq 90}">
                         <font color="green">已上线</font>
                         <%--不存在组织的用户为采美用户，只有采美用户才有上线下线功能--%>
-<%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">--%>
-                            &nbsp;&nbsp;<a href="${ctx}/new/user/agency/offline?id=${newCmClubList.clubID}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" onclick="return confirmx('确定下线该会所吗？', this.href)" style="text-decoration:underline;">下线</a>
-<%--                        </c:if>--%>
+                        <%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">--%>
+                        &nbsp;&nbsp;<a href="${ctx}/new/user/agency/offline?id=${newCmClubList.clubID}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" onclick="return confirmx('确定下线该会所吗？', this.href)" style="text-decoration:underline;">下线</a>
+                        <%--                        </c:if>--%>
                     </c:when>
                     <c:when test="${newCmClubList.status eq 91}">
                         <font color="red">已下线</font>
-<%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">--%>
-                            &nbsp;&nbsp;<a href="${ctx}/new/user/agency/online?id=${newCmClubList.clubID}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" onclick="return confirmx('确定上线该会所吗？', this.href)" style="text-decoration:underline;">上线</a>
-<%--                        </c:if>--%>
+                        <%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">--%>
+                        &nbsp;&nbsp;<a href="${ctx}/new/user/agency/online?id=${newCmClubList.clubID}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" onclick="return confirmx('确定上线该会所吗？', this.href)" style="text-decoration:underline;">上线</a>
+                        <%--                        </c:if>--%>
                     </c:when>
                     <c:when test="${newCmClubList.status eq 92}">
                         <a href="JavaScript:;" onclick="return alertx('不通过原因：${newCmClubList.auditNote}')"
@@ -747,63 +748,63 @@
             alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
             return;
         }
-       var html = "<div id='auditBox'>"
-                + "   <div class='bd-row'>"
-                + "       <span><font color='red'>*</font>审核：</span>"
-                + "       <select name='auditStatus' id='auditStatus'>"
-                + "           <option value='1'>审核通过</option>"
-                + "           <option value='2'>审核未通过</option>"
-                + "       <select/>"
-                + "   </div>"
-                + "   <div id='auditNopass' style='display: none;'>"
-                + "       <div class='bd-row'>"
-                + "           <span><font color='red'>*</font>原因：</span>"
-                + "           <div class='auditCheckBox'>"
-                + "               <label><input name='auditCheckBox' type='checkbox' value='图片模糊'><span>图片模糊</span></label>"
-                + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照错误'><span>营业执照错误</span></label>"
-                + "               <label><input name='auditCheckBox' type='checkbox' value='详细信息不全'><span>详细信息不全</span></label>"
-                + "               <label><input name='auditCheckBox' type='checkbox' value='机构名称敏感'><span>机构名称敏感</span></label>"
-                + "               <label><input name='auditCheckBox' type='checkbox' value='不符合平台要求'><span>不符合平台要求</span></label>"
-                + "           </div>"
-                + "       </div>"
-                + "       <div class='bd-row'>"
-                + "           <span></span>"
-                + "           <div>"
-                + "               <textarea name='auditNote'></textarea>"
-                + "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
-                + "           </div>"
-                + "       </div>"
-                + "   </div>"
-                + "</div>";
-            var submit = function (v, h, f) {
-                if (f.auditStatus == '') {
-                    $.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
-                    return false;
-                } else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
-                    $.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
-                    return false;
-                } else if (f.auditStatus == 2 && f.auditNote.length > 100) {
-                    $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
-                    return false;
-                }
-                var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
+        var html = "<div id='auditBox'>"
+            + "   <div class='bd-row'>"
+            + "       <span><font color='red'>*</font>审核：</span>"
+            + "       <select name='auditStatus' id='auditStatus'>"
+            + "           <option value='1'>审核通过</option>"
+            + "           <option value='2'>审核未通过</option>"
+            + "       <select/>"
+            + "   </div>"
+            + "   <div id='auditNopass' style='display: none;'>"
+            + "       <div class='bd-row'>"
+            + "           <span><font color='red'>*</font>原因：</span>"
+            + "           <div class='auditCheckBox'>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='图片模糊'><span>图片模糊</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='营业执照错误'><span>营业执照错误</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='详细信息不全'><span>详细信息不全</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='机构名称敏感'><span>机构名称敏感</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='不符合平台要求'><span>不符合平台要求</span></label>"
+            + "           </div>"
+            + "       </div>"
+            + "       <div class='bd-row'>"
+            + "           <span></span>"
+            + "           <div>"
+            + "               <textarea name='auditNote'></textarea>"
+            + "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
+            + "           </div>"
+            + "       </div>"
+            + "   </div>"
+            + "</div>";
+        var submit = function (v, h, f) {
+            if (f.auditStatus == '') {
+                $.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
+                return false;
+            } else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
+                $.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
+                return false;
+            } else if (f.auditStatus == 2 && f.auditNote.length > 100) {
+                $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
+                return false;
+            }
+            var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
 
-                $.post("${ctx}/new/user/agency/auditClub", {
-                    'auditStatus': f.auditStatus,
-                    'id': id,
-                    'auditNote': auditText
-                }, function (data) {
-                    if (true == data.success) {
-                        $.jBox.tip(data.msg, 'info');
-                        // $("#searchForm").submit();
-                        window.location.href = "${ctx}/new/user/agency/";
-                    } else {
-                        $.jBox.tip(data.msg, 'error');
-                    }
-                }, "JSON");//这里返回的类型有：json,html,xml,text
-            };
-            $.jBox(html, {title: "审核", submit: submit});
-        }
+            $.post("${ctx}/new/user/agency/auditClub", {
+                'auditStatus': f.auditStatus,
+                'id': id,
+                'auditNote': auditText
+            }, function (data) {
+                if (true == data.success) {
+                    $.jBox.tip(data.msg, 'info');
+                    // $("#searchForm").submit();
+                    window.location.href = "${ctx}/new/user/agency/";
+                } else {
+                    $.jBox.tip(data.msg, 'error');
+                }
+            }, "JSON");//这里返回的类型有：json,html,xml,text
+        };
+        $.jBox(html, {title: "审核", submit: submit});
+    }
 
 </script>
 </body>