bugfix

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

@@ -1,5 +1,6 @@
 package com.caimei.modules.user.dao;
 
+import com.caimei.modules.user.entity.CmClubRemarks;
 import com.caimei.modules.user.entity.CmSaleMan;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.NewCmSp;
@@ -32,4 +33,5 @@ public interface CmSpDao extends CrudDao<NewCmSp> {
     void choseManager(Integer serviceProviderID);
 
     void deleteManager();
+
 }

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

@@ -46,5 +46,15 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     String findClassName(String string);
 
+    List<CmRemaks> remakasList(CmRemaks cmRemaks);
 
+    String upremakasList(CmRemaks cmRemaks);
+
+    void addRemarks(CmRemaks cmRemaks);
+
+    void upremarks(CmRemaks cmRemaks);
+
+    void deleteRamarks(CmRemaks cmRemaks);
+
+    void ClubsIds(ClubChangeSp clubChangeSp);
 }

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

@@ -32,7 +32,7 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
     private Integer remarksId;
 
     /**
-     *  协销姓名
+     * 协销姓名
      */
     private String spName;
     /**
@@ -96,6 +96,8 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
      */
     private List<RemarksFileVo> fileList;
 
+
+
     public String getConsultType() {
         return consultType;
     }

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

@@ -1,6 +1,7 @@
 package com.caimei.modules.user.service;
 
 import com.caimei.modules.user.dao.CmSpDao;
+import com.caimei.modules.user.entity.CmClubRemarks;
 import com.caimei.modules.user.entity.CmSaleMan;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.NewCmSp;
@@ -27,11 +28,11 @@ public class CmSpService extends CrudService<CmSpDao, NewCmSp> {
 	public NewCmSp get(String id) {
 		return super.get(id);
 	}
-	
+
 	public List<NewCmSp> findList(NewCmSp newCmSp) {
 		return super.findList(newCmSp);
 	}
-	
+
 	public Page<NewCmSp> findPage(Page<NewCmSp> page, NewCmSp newCmSp) {
 		return super.findPage(page, newCmSp);
 	}
@@ -40,7 +41,7 @@ public class CmSpService extends CrudService<CmSpDao, NewCmSp> {
 	public void update(NewCmSp newCmSp) {
 		cmSpDao.update(newCmSp);
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void save(NewCmSp newCmSp) {
 		super.save(newCmSp);
@@ -68,4 +69,5 @@ public class CmSpService extends CrudService<CmSpDao, NewCmSp> {
 		cmSpDao.deleteManager();
 		cmSpDao.choseManager(serviceProviderID);
 	}
-}
+
+}

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

@@ -2,6 +2,7 @@ package com.caimei.modules.user.service;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import com.caimei.modules.consult.entity.type.CmConsulttype;
@@ -21,6 +22,7 @@ import com.caimei.modules.user.dao.NewCmClubDao;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
 
 /**
  * 用户模块重构--会所管理Service
@@ -161,4 +163,29 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
     public List<ServiceProviderModel> findGroup(Integer leaderId) {
         return newCmClubDao.findGroup(leaderId);
     }
+
+
+    @Transactional(readOnly = false)
+    public Page<CmRemaks> findRemaksPage(Page<CmRemaks> page, CmRemaks cmRemaks) {
+       List<CmRemaks> cmremakslist= newCmClubDao.remakasList(cmRemaks);
+       page.setList(cmremakslist);
+        return page;
+    }
+    @Transactional(readOnly = false)
+    public String upremakasList(CmRemaks cmRemaks){return newCmClubDao.upremakasList(cmRemaks);}
+
+    @Transactional(readOnly = false)
+    public void upremarks(CmRemaks cmRemaks){newCmClubDao.upremarks(cmRemaks);}
+
+    @Transactional(readOnly = false)
+    public void addRemarks(CmRemaks cmRemaks){
+         newCmClubDao.addRemarks(cmRemaks);
+     }
+
+    @Transactional(readOnly = false)
+     public void deleteRamarks(CmRemaks cmRemaks){newCmClubDao.deleteRamarks(cmRemaks);}
+
+    public void ClubsIds(ClubChangeSp clubChangeSp){
+          newCmClubDao.ClubsIds(clubChangeSp);
+    }
 }

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

@@ -20,7 +20,6 @@ public class CmOperationalLogsController extends BaseController {
     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);

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

@@ -79,12 +79,6 @@ public class AgencyController extends BaseController {
     @Autowired
     private SysLogService sysLogService;
 
-    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;
@@ -146,7 +140,6 @@ 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";
     }
@@ -756,8 +749,6 @@ 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 {
@@ -905,7 +896,6 @@ public class AgencyController extends BaseController {
             companyUser.setAuditTime(currTime);
             newCmClubService.update(newCmClub);
             cmUserService.update(companyUser);
-            cmUs=companyUser;
             //直接注册成为企业机构 或 升级成为机构
             if (CollectionUtils.isNotEmpty(cmUsers)) {
                 //个人用户升级成为企业机构
@@ -1050,8 +1040,6 @@ 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);
@@ -1128,12 +1116,37 @@ public class AgencyController extends BaseController {
     }
 
     @RequestMapping("cmrenaksList")
-    public String renaks() {
+    public String renaks(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CmRemaks> page = newCmClubService.findRemaksPage(new Page<CmRemaks>(request, response, 20), cmRemaks);
+        model.addAttribute("page",page);
         return "modules/userNew/cmRemaksList";
     }
 
     @RequestMapping("cmrenaksForm")
-    public String renaksForm() {
+    public String renaksForm(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(cmRemaks.getRemarksId()!=null){
+           String remaks= newCmClubService.upremakasList(cmRemaks);
+            model.addAttribute("list",cmRemaks);
+            model.addAttribute("remaks",remaks);
+        }
         return "modules/userNew/cmRemaksForm";
     }
+    @RequestMapping("addcmrenaksForm")
+    public String addrenaksForm(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
+       if(cmRemaks.getRemarksId()!=null){
+           System.out.println("》》》》进入修改方法");
+           newCmClubService.upremarks(cmRemaks);
+       }else {
+           System.out.println("》》》》进入新增方法");
+           cmRemaks.setAddtime(new Date());
+           newCmClubService.addRemarks(cmRemaks);
+       }
+        return "redirect:" + Global.getAdminPath() + "/userNew/cmRemaksList";
+    }
+    @RequestMapping("deleteRamarks")
+    public String deleteRamarks(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
+         newCmClubService.deleteRamarks(cmRemaks);
+        return "redirect:" + Global.getAdminPath() + "/userNew/cmRemaksList";
+    }
+
 }

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

@@ -68,6 +68,8 @@ public class SpController extends BaseController {
     private CmBindService cmBindService;
     @Autowired
     private SysLogService sysLogService;
+    @Autowired
+    private NewCmClubService newCmClubService;
 
     @ModelAttribute
     public NewCmSp get(@RequestParam(required = false) String id) {
@@ -116,13 +118,19 @@ public class SpController extends BaseController {
             if (StringUtils.equals("pass", reviewStatus)) {
                 ClubChangeSp cssp = clubChangeSpReviewService.getClubChangeSpById(clubChangeSpRecordID);
                 if (null != cssp) {
-                    String clubIDs = sysLogService.ClubsName(clubChangeSpRecordID);
+                    String ClubsNames = sysLogService.ClubsName(clubChangeSpRecordID);
+                    System.out.println("操作员" + ClubsNames);
+//                    Integer clubIds=newCmClubService.ClubsIds(ClubsNames);
+                    System.out.println("旧ID>>>>>>>>" + cssp.getOldSpID());
+                    System.out.println("ID>>>>>>>>" + cssp.getNewSpID());
+                    System.out.println("ID>>>>>>>>" + clubChangeSpRecordID);
                     // 查询serviceprovider协销表
                     List<ServiceProviderModel> serviceprovider = serviceProviderDao.getServiceproviderById(cssp.getNewSpID());
                     // 查询cm_bind表
                     if (CollectionUtils.isNotEmpty(serviceprovider)) {
                         ServiceProviderModel serviceProvider = serviceprovider.get(0);
                         Integer userID = serviceProvider.getUserID();
+                        System.out.println("ID>>>>>>>>" + userID);
                         List<CmBind> bind = cmBindService.findCmbindByUserId(userID);
 
                         //fixme gclub -- club 更换协销
@@ -136,6 +144,7 @@ public class SpController extends BaseController {
                             club.setFlag(cmBind.getBindID() + ",");
                             club.setInviterBindID(cmBind.getBindID());
                         }
+
                         club.setInviterName(serviceProvider.getName());
                         cmClubService.save(club);
                         // 更新通过状态
@@ -145,20 +154,23 @@ public class SpController extends BaseController {
                         clubChangeSpReviewService.updateCheckStatusById(clubChangeSp);
                         map.put("success", true);
                         map.put("msg", "操作成功");
-                        String clubID = sysLogService.ClubsName(clubChangeSpRecordID);
+                        String ClubsName = sysLogService.ClubsName(clubChangeSpRecordID);
+//                        Integer clubId=newCmClubService.ClubsIds(ClubsNames);
                         String jgName = sysLogService.JgName(clubChangeSpRecordID);
                         String linkMans = sysLogService.ClubName(clubChangeSpRecordID);
                         sysLog.setOperationtime(new Date());
-                       if(clubIDs==null){
-                           sysLog.setActioncontent("采美默认协销经理(官方账号)" + "更换为" + clubID);
+                       if(ClubsNames==null){
+                           sysLog.setActioncontent("采美默认协销经理(官方账号)" + "更换为" + ClubsName);
                        }else {
-                           sysLog.setActioncontent(clubIDs + "更换为" + clubID);
+                           sysLog.setActioncontent(ClubsNames + "更换为" + ClubsName);
                        }
                         sysLog.setOperationtype("更换协销");
                         sysLog.setContact(linkMans);
                         sysLog.setInstitutionName(jgName);
                         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
-                        System.out.println("操作员" + principal.getName());
+                        System.out.println("操作员" + ClubsName);
+//                        System.out.println("ID>>>>>>>>" +clubId);
+                        System.out.println("ID>>>>>>>>" + clubChangeSpRecordID);
                         String username = principal.getName();
                         sysLog.setOperator(username);
                         //调用service保存SysLog实体类到数据库

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

@@ -217,4 +217,6 @@
 		left join serviceprovider s on csr.leaderId = s.serviceProviderID
 		where csr.delflag = 0
 	</select>
+
+
 </mapper>

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

@@ -502,14 +502,42 @@
         where id = #{string}
     </select>
 
-<!--    <insert id="insert">-->
-<!--        INSERT INTO `cm_remarks`(remarks, `addtime`)-->
-<!--        VALUES (#{remarks}, #{addtime})-->
-<!--    </insert>-->
-<!--    <update id="updateByStatus">-->
-<!--        UPDATE `cm_remarks`-->
-<!--        SET remarks = #{remarks}-->
-<!--        WHERE remarksId = #{remarksId}-->
-<!--    </update>-->
+    <delete id="deleteRamarks">
+        DELETE FROM `cm_remarks` WHERE remarksId=#{remarksId}
+    </delete>
 
+    <insert id="addRemarks">
+        INSERT INTO `cm_remarks`(remarks, `addtime`)
+        VALUES (#{remarks}, #{addtime})
+    </insert>
+    <update id="upremarks">
+        UPDATE `cm_remarks`
+        SET remarks = #{remarks}
+        WHERE remarksId = #{remarksId}
+    </update>
+    <select id="remakasList" resultType="CmRemaks">
+        SELECT remarksId,remarks,addtime
+        FROM `cm_remarks`
+        <where>
+            <if test="remarks != null and remarks != ''">
+                AND remarks LIKE "%"#{remarks}"%"
+            </if>
+        </where>
+        order by addtime desc
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+        </choose>
+    </select>
+    <select id="upremakasList" resultType="java.lang.String">
+        SELECT remarks
+        FROM `cm_remarks`
+        WHERE remarksId=#{remarksId}
+    </select>
+
+    <update id="ClubsIds">
+        UPDATE `cm_club_remarks` SET serviceProviderId=#{newSpID}
+        WHERE serviceProviderId=#{oldSpID}
+    </update>
 </mapper>

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

@@ -66,7 +66,7 @@
     <li class="active"><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
     <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
     <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
-<%--    <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>--%>
+    <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/regist" method="post"